diff --git a/src/popup/app/accounts/views/accountsHint.html b/src/popup/app/accounts/views/accountsHint.html
index bcd508eaa29..37cc46626d2 100644
--- a/src/popup/app/accounts/views/accountsHint.html
+++ b/src/popup/app/accounts/views/accountsHint.html
@@ -4,10 +4,10 @@
             <a ui-sref="login({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i> Log In</a>
         </div>
         <div class="right">
-            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{ i18n.submit }}</button>
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{i18n.submit}}</button>
             <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
         </div>
-        <div class="title">{{ i18n.passwordHint }}</div>
+        <div class="title">{{i18n.passwordHint}}</div>
     </div>
     <div class="content">
         <div class="list">
@@ -15,12 +15,12 @@
                 <div class="list-section-items">
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-envelope fa-lg fa-fw"></i>
-                        <label for="email" class="sr-only">{{ i18n.emailAddress }}</label>
-                        <input id="email" type="text" name="Email" placeholder="{{ i18n.emailAddress }}" ng-model="model.email">
+                        <label for="email" class="sr-only">{{i18n.emailAddress}}</label>
+                        <input id="email" type="text" name="Email" placeholder="{{i18n.emailAddress}}" ng-model="model.email">
                     </div>
                 </div>
                 <div class="list-section-footer">
-                    {{ i18n.enterEmailToGetHint }}
+                    {{i18n.enterEmailToGetHint}}
                 </div>
             </div>
         </div>
diff --git a/src/popup/app/accounts/views/accountsLogin.html b/src/popup/app/accounts/views/accountsLogin.html
index a2176a5e0c0..964c0d2b42f 100644
--- a/src/popup/app/accounts/views/accountsLogin.html
+++ b/src/popup/app/accounts/views/accountsLogin.html
@@ -1,13 +1,13 @@
 <form name="theForm" ng-submit="login(model)" bit-form="loginPromise">
     <div class="header">
         <div class="left">
-            <a ui-sref="home({animation: 'out-slide-down'})">{{ i18n.cancel }}</a>
+            <a ui-sref="home({animation: 'out-slide-down'})">{{i18n.cancel}}</a>
         </div>
         <div class="right">
-            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{ i18n.login }}</button>
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{i18n.login}}</button>
             <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
         </div>
-        <div class="title">{{ i18n.bitwarden }}</div>
+        <div class="title">{{i18n.bitwarden}}</div>
     </div>
     <div class="content">
         <div class="list">
@@ -15,20 +15,20 @@
                 <div class="list-section-items">
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-envelope fa-lg fa-fw"></i>
-                        <label for="email" class="sr-only">{{ i18n.emailAddress }}</label>
-                        <input id="email" type="text" name="Email" placeholder="{{ i18n.emailAddress }}" ng-model="model.email">
+                        <label for="email" class="sr-only">{{i18n.emailAddress}}</label>
+                        <input id="email" type="text" name="Email" placeholder="{{i18n.emailAddress}}" ng-model="model.email">
                     </div>
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-lock fa-lg fa-fw"></i>
-                        <label for="master-password" class="sr-only">{{ i18n.masterPass }}</label>
-                        <input id="master-password" type="password" name="MasterPassword" placeholder="{{ i18n.masterPass }}"
+                        <label for="master-password" class="sr-only">{{i18n.masterPass}}</label>
+                        <input id="master-password" type="password" name="MasterPassword" placeholder="{{i18n.masterPass}}"
                                ng-model="model.masterPassword">
                     </div>
                 </div>
             </div>
         </div>
         <p class="text-center text-accent">
-            <a ui-sref="hint({animation: 'in-slide-left'})">{{ i18n.getMasterPasswordHint }}</a>
+            <a ui-sref="hint({animation: 'in-slide-left'})">{{i18n.getMasterPasswordHint}}</a>
         </p>
     </div>
 </form>
diff --git a/src/popup/app/accounts/views/accountsLoginTwoFactor.html b/src/popup/app/accounts/views/accountsLoginTwoFactor.html
index 28d55954adf..519c4734edd 100644
--- a/src/popup/app/accounts/views/accountsLoginTwoFactor.html
+++ b/src/popup/app/accounts/views/accountsLoginTwoFactor.html
@@ -4,10 +4,10 @@
             <a ui-sref="login({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i> Log In</a>
         </div>
         <div class="right">
-            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{ i18n.continue }}</button>
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{i18n.continue}}</button>
             <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
         </div>
-        <div class="title">{{ i18n.verificationCode }}</div>
+        <div class="title">{{i18n.verificationCode}}</div>
     </div>
     <div class="content">
         <div class="list">
@@ -15,12 +15,12 @@
                 <div class="list-section-items">
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-lock fa-lg fa-fw"></i>
-                        <label for="code" class="sr-only">{{ i18n.verificationCode }}</label>
-                        <input id="code" type="text" name="Code" placeholder="{{ i18n.verificationCode }}" ng-model="model.code">
+                        <label for="code" class="sr-only">{{i18n.verificationCode}}</label>
+                        <input id="code" type="text" name="Code" placeholder="{{i18n.verificationCode}}" ng-model="model.code">
                     </div>
                 </div>
                 <div class="list-section-footer">
-                    {{ i18n.enterTwoStepVerCode }}
+                    {{i18n.enterTwoStepVerCode}}
                 </div>
             </div>
         </div>
diff --git a/src/popup/app/accounts/views/accountsRegister.html b/src/popup/app/accounts/views/accountsRegister.html
index a7c0c9db837..9143e4a431b 100644
--- a/src/popup/app/accounts/views/accountsRegister.html
+++ b/src/popup/app/accounts/views/accountsRegister.html
@@ -1,13 +1,13 @@
 <form name="theForm" ng-submit="submit(model)" bit-form="submitPromise">
     <div class="header">
         <div class="left">
-            <a ui-sref="home({animation: 'out-slide-down'})">{{ i18n.cancel }}</a>
+            <a ui-sref="home({animation: 'out-slide-down'})">{{i18n.cancel}}</a>
         </div>
         <div class="right">
-            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{ i18n.submit }}</button>
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{i18n.submit}}</button>
             <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
         </div>
-        <div class="title">{{ i18n.createAccount }}</div>
+        <div class="title">{{i18n.createAccount}}</div>
     </div>
     <div class="content">
         <div class="list">
@@ -15,37 +15,37 @@
                 <div class="list-section-items">
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-envelope fa-lg fa-fw"></i>
-                        <label for="email" class="sr-only">{{ i18n.emailAddress }}</label>
-                        <input id="email" type="text" name="Email" placeholder="{{ i18n.emailAddress }}" ng-model="model.email">
+                        <label for="email" class="sr-only">{{i18n.emailAddress}}</label>
+                        <input id="email" type="text" name="Email" placeholder="{{i18n.emailAddress}}" ng-model="model.email">
                     </div>
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-lock fa-lg fa-fw"></i>
-                        <label for="master-password" class="sr-only">{{ i18n.masterPass }}</label>
+                        <label for="master-password" class="sr-only">{{i18n.masterPass}}</label>
                         <input id="master-password" type="password" name="MasterPassword"
-                               placeholder="{{ i18n.masterPass }}" ng-model="model.masterPassword">
+                               placeholder="{{i18n.masterPass}}" ng-model="model.masterPassword">
                     </div>
                 </div>
                 <div class="list-section-footer">
-                    {{ i18n.masterPassDesc }}
+                    {{i18n.masterPassDesc}}
                 </div>
             </div>
             <div class="list-section">
                 <div class="list-section-items">
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-lock fa-lg fa-fw"></i>
-                        <label for="master-password-retype" class="sr-only">{{ i18n.reTypeMasterPass }}</label>
+                        <label for="master-password-retype" class="sr-only">{{i18n.reTypeMasterPass}}</label>
                         <input id="master-password-retype" type="password" name="MasterPasswordRetype"
-                               placeholder="{{ i18n.reTypeMasterPass }}" ng-model="model.masterPasswordRetype">
+                               placeholder="{{i18n.reTypeMasterPass}}" ng-model="model.masterPasswordRetype">
                     </div>
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-lightbulb-o fa-lg fa-fw"></i>
-                        <label for="hint" class="sr-only">{{ i18n.masterPassHint }}</label>
-                        <input id="hint" type="text" name="Hint" placeholder="{{ i18n.masterPassHint }}"
+                        <label for="hint" class="sr-only">{{i18n.masterPassHint}}</label>
+                        <input id="hint" type="text" name="Hint" placeholder="{{i18n.masterPassHint}}"
                                ng-model="model.hint">
                     </div>
                 </div>
                 <div class="list-section-footer">
-                    {{ i18n.masterPassHintDesc }}
+                    {{i18n.masterPassHintDesc}}
                 </div>
             </div>
         </div>
diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index 2ddd4645b89..e24ad207ce9 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -2,7 +2,7 @@
     <div class="right">
         <a href="" ng-click="addSite()"><i class="fa fa-plus fa-lg"></i></a>
     </div>
-    <div class="title">{{ i18n.currentTab }}</div>
+    <div class="title">{{i18n.currentTab}}</div>
 </div>
 <div class="content content-tabs">
     <div ng-if="sites.length">
@@ -10,13 +10,13 @@
             <div class="list-grouped">
                 <a href="javascript:void(0)" ng-click="fillSite(site)" class="list-grouped-item condensed"
                    title="Auto-fill {{site.name}}" ng-repeat="site in theSites = (sites | orderBy: ['name', 'username'])">
-                    <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="{{ i18n.copyPassword }}"
+                    <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="{{i18n.copyPassword}}"
                           ngclipboard ngclipboard-error="clipboardError(e)"
                           ngclipboard-success="clipboardSuccess(e, 'Password')"
                           data-clipboard-text="{{site.password}}" ng-class="{'disabled': !site.password}">
                         <i class="fa fa-lg fa-key"></i>
                     </span>
-                    <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="{{ i18n.copyUsername }}"
+                    <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="{{i18n.copyUsername}}"
                           ngclipboard ngclipboard-error="clipboardError(e)"
                           ngclipboard-success="clipboardSuccess(e, 'Username')"
                           data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
@@ -30,8 +30,8 @@
     </div>
     <div class="centered-message" ng-if="loaded && !sites.length">
         <p>
-            {{ i18n.autoFillInfo }}
-            <button ng-click="addSite()" style="margin-top: 20px;" class="btn btn-link btn-block">{{ i18n.addSite }}</button>
+            {{i18n.autoFillInfo}}
+            <button ng-click="addSite()" style="margin-top: 20px;" class="btn btn-link btn-block">{{i18n.addSite}}</button>
         </p>
     </div>
     <div class="page-loading" ng-if="!loaded">
diff --git a/src/popup/app/global/home.html b/src/popup/app/global/home.html
index db19fa8a06e..644dbfc8c6b 100644
--- a/src/popup/app/global/home.html
+++ b/src/popup/app/global/home.html
@@ -1,15 +1,15 @@
 <div class="content">
     <div class="home-page">
         <img src="../../../../images/logo@3x.png" alt="bitwarden" />
-        <p>{{ i18n.loginOrCreateNewAccount }}</p>
+        <p>{{i18n.loginOrCreateNewAccount}}</p>
         <div class="buttons">
             <a class="btn btn-lg btn-primary btn-block" ui-sref="register({animation: 'in-slide-up'})"
                analytics-on="click" analytics-event="Clicked Create Account">
-                <b>{{ i18n.createAccount }}</b>
+                <b>{{i18n.createAccount}}</b>
             </a>
             <a class="btn btn-lg btn-link btn-block" ui-sref="login({animation: 'in-slide-up'})"
                analytics-on="click" analytics-event="Clicked Log In">
-                {{ i18n.login }}
+                {{i18n.login}}
             </a>
         </div>
     </div>
diff --git a/src/popup/app/global/tabs.html b/src/popup/app/global/tabs.html
index aa9e673f1d5..ee31618ea51 100644
--- a/src/popup/app/global/tabs.html
+++ b/src/popup/app/global/tabs.html
@@ -2,16 +2,16 @@
 <div class="tabs" ng-controller="tabsController">
     <ul>
         <li ng-class="{active: $state.includes('tabs.current')}">
-            <a ui-sref="tabs.current"><i class="fa fa-folder fa-2x"></i>{{ i18n.tab }}</a>
+            <a ui-sref="tabs.current"><i class="fa fa-folder fa-2x"></i>{{i18n.tab}}</a>
         </li>
         <li ng-class="{active: $state.includes('tabs.vault')}">
-            <a ui-sref="tabs.vault"><i class="fa fa-lock fa-2x"></i>{{ i18n.myVault }}</a>
+            <a ui-sref="tabs.vault"><i class="fa fa-lock fa-2x"></i>{{i18n.myVault}}</a>
         </li>
         <li ng-class="{active: $state.includes('tabs.tools')}">
-            <a ui-sref="tabs.tools"><i class="fa fa-wrench fa-2x"></i>{{ i18n.tools }}</a>
+            <a ui-sref="tabs.tools"><i class="fa fa-wrench fa-2x"></i>{{i18n.tools}}</a>
         </li>
         <li ng-class="{active: $state.includes('tabs.settings')}">
-            <a ui-sref="tabs.settings"><i class="fa fa-cogs fa-2x"></i>{{ i18n.settings }}</a>
+            <a ui-sref="tabs.settings"><i class="fa fa-cogs fa-2x"></i>{{i18n.settings}}</a>
         </li>
     </ul>
 </div>
diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html
index dfd068e1937..92e5f582861 100644
--- a/src/popup/app/settings/views/settings.html
+++ b/src/popup/app/settings/views/settings.html
@@ -1,60 +1,60 @@
 <div class="header">
-    <div class="title">{{ i18n.settings }}</div>
+    <div class="title">{{i18n.settings}}</div>
 </div>
 <div class="content content-tabs">
     <div class="list">
         <div class="list-section">
             <div class="list-section-header">
-                {{ i18n.account }}
+                {{i18n.account}}
             </div>
             <div class="list-section-items">
                 <a class="list-section-item" href="" ng-click="changePassword()">
-                    {{ i18n.changeMasterPassword }}
+                    {{i18n.changeMasterPassword}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
                 <a class="list-section-item" href="" ng-click="changeEmail()">
-                    {{ i18n.changeEmail }}
+                    {{i18n.changeEmail}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
                 <a class="list-section-item" href="" ng-click="twoStep()">
-                    {{ i18n.twoStepLogin }}
+                    {{i18n.twoStepLogin}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
                 <a class="list-section-item" href="" ng-click="logOut()">
-                    {{ i18n.logOut }}
+                    {{i18n.logOut}}
                 </a>
             </div>
         </div>
         <div class="list-section">
             <div class="list-section-header">
-                {{ i18n.manage }}
+                {{i18n.manage}}
             </div>
             <div class="list-section-items">
                 <a class="list-section-item" ui-sref="folders({animation: 'in-slide-left'})">
-                    {{ i18n.folders }}
+                    {{i18n.folders}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
                 <a class="list-section-item" ui-sref="sync({animation: 'in-slide-left'})">
-                    {{ i18n.sync }}
+                    {{i18n.sync}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
             </div>
         </div>
         <div class="list-section">
             <div class="list-section-header">
-                {{ i18n.other }}
+                {{i18n.other}}
             </div>
             <div class="list-section-items">
                 <a class="list-section-item" ui-sref="about({animation: 'in-slide-left'})">
-                    {{ i18n.about }}
+                    {{i18n.about}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
                 <a class="list-section-item" ui-sref="help({animation: 'in-slide-left'})">
-                    {{ i18n.helpFeedback }}
+                    {{i18n.helpFeedback}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
                 <a class="list-section-item" href="" ng-click="rate()">
-                    {{ i18n.rateExtension }}
+                    {{i18n.rateExtension}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
             </div>
diff --git a/src/popup/app/settings/views/settingsAbout.html b/src/popup/app/settings/views/settingsAbout.html
index 9534795c1b1..f1b58c2eb2e 100644
--- a/src/popup/app/settings/views/settingsAbout.html
+++ b/src/popup/app/settings/views/settingsAbout.html
@@ -1,13 +1,13 @@
 <div class="header">
     <div class="left">
-        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i>{{ i18n.settings }}</a>
+        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i>{{i18n.settings}}</a>
     </div>
-    <div class="title">{{ i18n.about }}</div>
+    <div class="title">{{i18n.about}}</div>
 </div>
 <div class="content">
     <div class="about-page">
         <img src="../../../../images/logo@3x.png" alt="bitwarden" />
-        {{ i18n.version }} {{version}}<br />
+        {{i18n.version}} {{version}}<br />
         &copy; 8bit Solutions LLC 2015-{{year}}
     </div>
 </div>
diff --git a/src/popup/app/settings/views/settingsAddFolder.html b/src/popup/app/settings/views/settingsAddFolder.html
index f13d98a94c4..91cc7839f1f 100644
--- a/src/popup/app/settings/views/settingsAddFolder.html
+++ b/src/popup/app/settings/views/settingsAddFolder.html
@@ -1,20 +1,20 @@
 <form name="theForm" ng-submit="save(folder)" bit-form="savePromise">
     <div class="header">
         <div class="left">
-            <a ui-sref="folders({animation: 'out-slide-down'})">{{ i18n.cancel }}</a>
+            <a ui-sref="folders({animation: 'out-slide-down'})">{{i18n.cancel}}</a>
         </div>
         <div class="right">
-            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{ i18n.save }}</button>
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{i18n.save}}</button>
             <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
         </div>
-        <div class="title">{{ i18n.addFolder }}</div>
+        <div class="title">{{i18n.addFolder}}</div>
     </div>
     <div class="content">
         <div class="list">
             <div class="list-section">
                 <div class="list-section-items">
                     <div class="list-section-item">
-                        <label for="name" class="item-label">{{ i18n.name }}</label>
+                        <label for="name" class="item-label">{{i18n.name}}</label>
                         <input id="name" type="text" name="Name" ng-model="folder.name">
                     </div>
                 </div>
diff --git a/src/popup/app/settings/views/settingsEditFolder.html b/src/popup/app/settings/views/settingsEditFolder.html
index fd791f53eaf..b4dba049f01 100644
--- a/src/popup/app/settings/views/settingsEditFolder.html
+++ b/src/popup/app/settings/views/settingsEditFolder.html
@@ -1,20 +1,20 @@
 <form name="theForm" ng-submit="save(folder)" bit-form="savePromise">
     <div class="header">
         <div class="left">
-            <a ui-sref="folders({animation: 'out-slide-down'})">{{ i18n.cancel }}</a>
+            <a ui-sref="folders({animation: 'out-slide-down'})">{{i18n.cancel}}</a>
         </div>
         <div class="right">
-            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{ i18n.save }}</button>
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{i18n.save}}</button>
             <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
         </div>
-        <div class="title">{{ i18n.editFolder }}</div>
+        <div class="title">{{i18n.editFolder}}</div>
     </div>
     <div class="content">
         <div class="list">
             <div class="list-section">
                 <div class="list-section-items">
                     <div class="list-section-item">
-                        <label for="name" class="item-label">{{ i18n.name }}</label>
+                        <label for="name" class="item-label">{{i18n.name}}</label>
                         <input id="name" type="text" name="Name" ng-model="folder.name">
                     </div>
                 </div>
@@ -22,7 +22,7 @@
             <div class="list-section">
                 <div class="list-section-items">
                     <a href="" ng-click="delete()" class="list-section-item text-danger">
-                        <i class="fa fa-trash fa-fw fa-lg"></i>{{ i18n.deleteFolder }}
+                        <i class="fa fa-trash fa-fw fa-lg"></i>{{i18n.deleteFolder}}
                     </a>
                 </div>
             </div>
diff --git a/src/popup/app/settings/views/settingsFolders.html b/src/popup/app/settings/views/settingsFolders.html
index dc628b3cb92..1375613d773 100644
--- a/src/popup/app/settings/views/settingsFolders.html
+++ b/src/popup/app/settings/views/settingsFolders.html
@@ -1,6 +1,6 @@
 <div class="header">
     <div class="left">
-        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i>{{ i18n.settings }}</a>
+        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i>{{i18n.settings}}</a>
     </div>
     <div class="right">
         <a ui-sref="addFolder({animation: 'in-slide-up'})"><i class="fa fa-plus fa-lg"></i></a>
@@ -20,9 +20,9 @@
     </div>
     <div class="centered-message" ng-if="loaded && !folders.length">
         <p>
-            {{ i18n.noFolders }}
+            {{i18n.noFolders}}
             <a ui-sref="addFolder({animation: 'in-slide-up'})" style="margin-top: 20px;"
-               class="btn btn-link btn-block">{{ i18n.addFolder }}</a>
+               class="btn btn-link btn-block">{{i18n.addFolder}}</a>
         </p>
     </div>
     <div class="page-loading" ng-if="!loaded">
diff --git a/src/popup/app/settings/views/settingsHelp.html b/src/popup/app/settings/views/settingsHelp.html
index 73e8eddc4a1..3c9d5a89e25 100644
--- a/src/popup/app/settings/views/settingsHelp.html
+++ b/src/popup/app/settings/views/settingsHelp.html
@@ -1,42 +1,42 @@
 <div class="header">
     <div class="left">
-        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i>{{ i18n.settings }}</a>
+        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i>{{i18n.settings}}</a>
     </div>
-    <div class="title">{{ i18n.helpFeedback }}</div>
+    <div class="title">{{i18n.helpFeedback}}</div>
 </div>
 <div class="content">
     <div class="list">
         <div class="list-section">
             <div class="list-section-items">
                 <a class="list-section-item" href="" ng-click="email()">
-                    {{ i18n.emailUs }}
+                    {{i18n.emailUs}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
             </div>
             <div class="list-section-footer">
-                {{ i18n.emailUsDirectly }}
+                {{i18n.emailUsDirectly}}
             </div>
         </div>
         <div class="list-section">
             <div class="list-section-items">
                 <a class="list-section-item" href="" ng-click="website()">
-                    {{ i18n.visitOurWebsite }}
+                    {{i18n.visitOurWebsite}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
             </div>
             <div class="list-section-footer">
-                {{ i18n.visitOurWebsiteDirectly }}
+                {{i18n.visitOurWebsiteDirectly}}
             </div>
         </div>
         <div class="list-section">
             <div class="list-section-items">
                 <a class="list-section-item" href="" ng-click="bug()">
-                    {{ i18n.fileBugReport }}
+                    {{i18n.fileBugReport}}
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
             </div>
             <div class="list-section-footer">
-                {{ i18n.gitHubIssue }}
+                {{i18n.gitHubIssue}}
             </div>
         </div>
     </div>
diff --git a/src/popup/app/settings/views/settingsSync.html b/src/popup/app/settings/views/settingsSync.html
index fa0f9815872..2d74920dcff 100644
--- a/src/popup/app/settings/views/settingsSync.html
+++ b/src/popup/app/settings/views/settingsSync.html
@@ -1,16 +1,16 @@
 <div class="header">
     <div class="left">
-        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i>{{ i18n.settings }}</a>
+        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i>{{i18n.settings}}</a>
     </div>
-    <div class="title">{{ i18n.sync }}</div>
+    <div class="title">{{i18n.sync}}</div>
 </div>
 <div class="content">
     <div class="centered-message">
         <p style="margin-top: -50px;">
             <a href="" class="btn btn-lg btn-link btn-block" ng-click="sync()">
-                {{ i18n.syncVaultNow }}
+                {{i18n.syncVaultNow}}
             </a>
-            <small class="text-muted">{{ i18n.lastSync }} {{lastSync}}</small>
+            <small class="text-muted">{{i18n.lastSync}} {{lastSync}}</small>
             <span ng-show="loading" style="display: block; margin-top: 20px;">
                 <i class="text-muted fa fa-lg fa-spinner fa-spin"></i>
             </span>
diff --git a/src/popup/app/tools/views/tools.html b/src/popup/app/tools/views/tools.html
index 377dfc40b62..d63768696bf 100644
--- a/src/popup/app/tools/views/tools.html
+++ b/src/popup/app/tools/views/tools.html
@@ -1,5 +1,5 @@
 <div class="header">
-    <div class="title">{{ i18n.tools }}</div>
+    <div class="title">{{i18n.tools}}</div>
 </div>
 <div class="content content-tabs">
     <div class="list">
@@ -7,28 +7,28 @@
             <div class="list-section-items">
                 <a class="list-section-item wrap" href="" ui-sref="passwordGenerator({animation: 'in-slide-up'})">
                     <span class="leading-icon" style="color: #eba776;"><i class="fa fa-refresh fa-fw"></i></span>
-                    <span class="text">{{ i18n.passGen }}</span>
-                    <span class="detail">{{ i18n.passGenInfo }}</span>
+                    <span class="text">{{i18n.passGen}}</span>
+                    <span class="detail">{{i18n.passGenInfo}}</span>
                 </a>
                 <a class="list-section-item wrap" href="" ng-click="launchWebVault()">
                     <span class="leading-icon" style="color: #5bb630;"><i class="fa fa-globe fa-fw"></i></span>
-                    <span class="text">{{ i18n.bitWebVault }}</span>
-                    <span class="detail">{{ i18n.bitWebVaultInfo }}</span>
+                    <span class="text">{{i18n.bitWebVault}}</span>
+                    <span class="detail">{{i18n.bitWebVaultInfo}}</span>
                 </a>
                 <a class="list-section-item wrap" href="" ng-click="launchiOS()">
                     <span class="leading-icon" style="color: #999999;"><i class="fa fa-apple fa-fw"></i></span>
-                    <span class="text">{{ i18n.bitIosVault }}</span>
-                    <span class="detail">{{ i18n.bitIosVaultInfo }}</span>
+                    <span class="text">{{i18n.bitIosVault}}</span>
+                    <span class="detail">{{i18n.bitIosVaultInfo}}</span>
                 </a>
                 <a class="list-section-item wrap" href="" ng-click="launchAndroid()">
                     <span class="leading-icon" style="color: #a4c639;"><i class="fa fa-android fa-fw"></i></span>
-                    <span class="text">{{ i18n.bitAndrVault }}</span>
-                    <span class="detail">{{ i18n.bitAndrVaultInfo }}</span>
+                    <span class="text">{{i18n.bitAndrVault}}</span>
+                    <span class="detail">{{i18n.bitAndrVaultInfo}}</span>
                 </a>
                 <a class="list-section-item wrap" href="" ng-click="launchImport()">
                     <span class="leading-icon" style="color: #6fc2ff;"><i class="fa fa-cloud-upload fa-fw"></i></span>
-                    <span class="text">{{ i18n.importLogins }}</span>
-                    <span class="detail">{{ i18n.importLoginsInfo }}</span>
+                    <span class="text">{{i18n.importLogins}}</span>
+                    <span class="detail">{{i18n.importLoginsInfo}}</span>
                 </a>
             </div>
         </div>
diff --git a/src/popup/app/tools/views/toolsPasswordGenerator.html b/src/popup/app/tools/views/toolsPasswordGenerator.html
index f4b52766032..db2d23ade2d 100644
--- a/src/popup/app/tools/views/toolsPasswordGenerator.html
+++ b/src/popup/app/tools/views/toolsPasswordGenerator.html
@@ -3,9 +3,9 @@
         <a ng-click="close()" href="">Close</a>
     </div>
     <div class="right">
-        <a ng-click="select()" ng-show="showSelect" href="">{{ i18n.select }}</a>
+        <a ng-click="select()" ng-show="showSelect" href="">{{i18n.select}}</a>
     </div>
-    <div class="title">{{ i18n.generatePassword }}</div>
+    <div class="title">{{i18n.generatePassword}}</div>
 </div>
 <div class="content">
     <div class="generate-password-block" id="generated-password">
@@ -15,21 +15,21 @@
         <div class="list-section" style="padding-top: 0;">
             <div class="list-section-items">
                 <a class="list-section-item text-primary" href="" ng-click="regenerate(true)">
-                    {{ i18n.regeneratePassword }}
+                    {{i18n.regeneratePassword}}
                 </a>
                 <a class="list-section-item text-primary" href="" ngclipboard ngclipboard-error="clipboardError(e)"
                    ngclipboard-success="clipboardSuccess(e)" data-clipboard-target="#generated-password">
-                    {{ i18n.copyPassword }}
+                    {{i18n.copyPassword}}
                 </a>
             </div>
         </div>
         <div class="list-section">
             <div class="list-section-header">
-                {{ i18n.options }}
+                {{i18n.options}}
             </div>
             <div class="list-section-items">
                 <div class="list-section-item list-section-item-slider">
-                    <label for="length">{{ i18n.length }}</label>
+                    <label for="length">{{i18n.length}}</label>
                     <span class="slider-value">{{slider.value}}</span>
                     <rzslider rz-slider-model="slider.value"
                               rz-slider-options="slider.options"></rzslider>
@@ -55,12 +55,12 @@
         <div class="list-section">
             <div class="list-section-items">
                 <div class="list-section-item list-section-item-input">
-                    <label for="min-numbers">{{ i18n.minNumbers }}</label>
+                    <label for="min-numbers">{{i18n.minNumbers}}</label>
                     <input id="min-numbers" type="number" min="0" max="5" ng-model="options.minNumber"
                            ng-change="saveOptions(options)">
                 </div>
                 <div class="list-section-item list-section-item-input">
-                    <label for="min-special">{{ i18n.minSpecial</label>
+                    <label for="min-special">{{i18n.minSpecial</label>
                     <input id="min-special" type="number" min="0" max="5" ng-model="options.minSpecial"
                            ng-change="saveOptions(options)">
                 </div>
@@ -69,7 +69,7 @@
         <div class="list-section">
             <div class="list-section-items">
                 <div class="list-section-item list-section-item-checkbox">
-                    <label for="ambiguous">{{ i18n.avoidAmbChar }}</label>
+                    <label for="ambiguous">{{i18n.avoidAmbChar}}</label>
                     <input id="ambiguous" type="checkbox" ng-model="options.ambiguous" ng-change="saveOptions(options)">
                 </div>
             </div>
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index d523c712a06..b76ad5f12f2 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -3,7 +3,7 @@
         <a href="" ng-click="addSite()"><i class="fa fa-plus fa-lg"></i></a>
     </div>
     <div class="search">
-        <input type="search" placeholder="{{ i18n.searchVault }}" ng-model="searchText" id="search" />
+        <input type="search" placeholder="{{i18n.searchVault}}" ng-model="searchText" id="search" />
         <i class="fa fa-search"></i>
     </div>
 </div>
@@ -16,7 +16,7 @@
                         <i class="fa fa-folder-open"></i> {{folder.name}}
                     </div>
                     <a href="javascript:void(0)" ng-click="viewSite(site)"
-                       class="list-grouped-item condensed" title="{{ i18n.edit }} {{site.name}}"
+                       class="list-grouped-item condensed" title="{{i18n.edit}} {{site.name}}"
                        ng-repeat="site in folderSites = (vaultSites | filter: { folderId: folder.id }
                             | filter: searchSites() | orderBy: ['name', 'username'])">
                         <span class="btn-list" ng-click="$event.stopPropagation()" title="Copy Password" ngclipboard
@@ -24,7 +24,7 @@
                               data-clipboard-text="{{site.password}}" ng-class="{'disabled': !site.password}">
                             <i class="fa fa-lg fa-key"></i>
                         </span>
-                        <span class="btn-list" ng-click="$event.stopPropagation()" title="{{ i18n.copyUsername }}" ngclipboard
+                        <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyUsername}}" ngclipboard
                               ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, 'Username')"
                               data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
                             <i class="fa fa-lg fa-user"></i>
@@ -38,8 +38,8 @@
     </div>
     <div class="centered-message" ng-if="loaded && !vaultSites.length">
         <p>
-            {{ i18n.noSitesInList }}
-            <button ng-click="addSite()" style="margin-top: 20px;" class="btn btn-link btn-block">{{ i18n.addSite }}</button>
+            {{i18n.noSitesInList}}
+            <button ng-click="addSite()" style="margin-top: 20px;" class="btn btn-link btn-block">{{i18n.addSite}}</button>
         </p>
     </div>
     <div class="page-loading" ng-if="!loaded">
diff --git a/src/popup/app/vault/views/vaultAddSite.html b/src/popup/app/vault/views/vaultAddSite.html
index 3f6cc1111a7..5029b86b350 100644
--- a/src/popup/app/vault/views/vaultAddSite.html
+++ b/src/popup/app/vault/views/vaultAddSite.html
@@ -1,23 +1,23 @@
 <form name="theForm" ng-submit="save(site)" bit-form="savePromise">
     <div class="header">
         <div class="left">
-            <a ng-click="close()" href="">{{ i18n.cancel }}</a>
+            <a ng-click="close()" href="">{{i18n.cancel}}</a>
         </div>
         <div class="right">
-            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{ i18n.save }}</button>
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{i18n.save}}</button>
             <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
         </div>
-        <div class="title">{{ i18n.addSite }}</div>
+        <div class="title">{{i18n.addSite}}</div>
     </div>
     <div class="content">
         <div class="list">
             <div class="list-section">
                 <div class="list-section-header">
-                    {{ i18n.siteInformation }}
+                    {{i18n.siteInformation}}
                 </div>
                 <div class="list-section-items">
                     <div class="list-section-item">
-                        <label for="name" class="item-label">{{ i18n.name }}</label>
+                        <label for="name" class="item-label">{{i18n.name}}</label>
                         <input id="name" type="text" name="Name" ng-model="site.name">
                     </div>
                     <div class="list-section-item">
@@ -25,15 +25,15 @@
                         <input id="uri" type="text" name="Uri" ng-model="site.uri">
                     </div>
                     <div class="list-section-item">
-                        <label for="username" class="item-label">{{ i18n.username }}</label>
+                        <label for="username" class="item-label">{{i18n.username}}</label>
                         <input id="username" type="text" name="Username" ng-model="site.username">
                     </div>
                     <div class="list-section-item">
-                        <label for="password" class="item-label">{{ i18n.password }}</label>
+                        <label for="password" class="item-label">{{i18n.password}}</label>
                         <input id="password" type="password" name="Password" ng-model="site.password">
                     </div>
                     <a class="list-section-item" href="" ng-click="generatePassword()">
-                        {{ i18n.generatePassword }}
+                        {{i18n.generatePassword}}
                         <i class="fa fa-chevron-right"></i>
                     </a>
                 </div>
@@ -49,14 +49,14 @@
                         </select>
                     </div>
                     <div class="list-section-item list-section-item-checkbox">
-                        <label for="favorite">{{ i18n.favorite }}</label>
+                        <label for="favorite">{{i18n.favorite}}</label>
                         <input id="favorite" name="Favorite" type="checkbox" ng-model="site.favorite">
                     </div>
                 </div>
             </div>
             <div class="list-section">
                 <div class="list-section-header">
-                    <label for="notes">{{ i18n.notes }}</label>
+                    <label for="notes">{{i18n.notes}}</label>
                 </div>
                 <div class="list-section-items">
                     <div class="list-section-item">
diff --git a/src/popup/app/vault/views/vaultEditSite.html b/src/popup/app/vault/views/vaultEditSite.html
index 8c4647765bd..626f9cc6c08 100644
--- a/src/popup/app/vault/views/vaultEditSite.html
+++ b/src/popup/app/vault/views/vaultEditSite.html
@@ -1,23 +1,23 @@
 <form name="theForm" ng-submit="save(site)" bit-form="savePromise">
     <div class="header">
         <div class="left">
-            <a ng-click="close()" href="">{{ i18n.cancel }}</a>
+            <a ng-click="close()" href="">{{i18n.cancel}}</a>
         </div>
         <div class="right">
-            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{ i18n.save }}</button>
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">{{i18n.save}}</button>
             <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
         </div>
-        <div class="title">{{ i18n.editSite }}</div>
+        <div class="title">{{i18n.editSite}}</div>
     </div>
     <div class="content">
         <div class="list">
             <div class="list-section">
                 <div class="list-section-header">
-                    {{ i18n.siteInformation }}
+                    {{i18n.siteInformation}}
                 </div>
                 <div class="list-section-items">
                     <div class="list-section-item">
-                        <label for="name" class="item-label">{{ i18n.name }}</label>
+                        <label for="name" class="item-label">{{i18n.name}}</label>
                         <input id="name" type="text" name="Name" ng-model="site.name">
                     </div>
                     <div class="list-section-item">
@@ -25,15 +25,15 @@
                         <input id="uri" type="text" name="Uri" ng-model="site.uri">
                     </div>
                     <div class="list-section-item">
-                        <label for="username" class="item-label">{{ i18n.username }}</label>
+                        <label for="username" class="item-label">{{i18n.username}}</label>
                         <input id="username" type="text" name="Username" ng-model="site.username">
                     </div>
                     <div class="list-section-item">
-                        <label for="password" class="item-label">{{ i18n.password }}</label>
+                        <label for="password" class="item-label">{{i18n.password}}</label>
                         <input id="password" type="password" name="Password" ng-model="site.password">
                     </div>
                     <a class="list-section-item" href="" ng-click="generatePassword()">
-                        {{ i18n.generatePassword }}
+                        {{i18n.generatePassword}}
                         <i class="fa fa-chevron-right"></i>
                     </a>
                 </div>
@@ -41,7 +41,7 @@
             <div class="list-section">
                 <div class="list-section-items">
                     <div class="list-section-item">
-                        <label for="folder" class="item-label">{{ i18n.folder }}</label>
+                        <label for="folder" class="item-label">{{i18n.folder}}</label>
                         <select id="folder" name="FolderId" ng-model="site.folderId">
                             <option ng-repeat="folder in folders | orderBy: ['name']" value="{{folder.id}}">
                                 {{folder.name}}
@@ -49,14 +49,14 @@
                         </select>
                     </div>
                     <div class="list-section-item list-section-item-checkbox">
-                        <label for="favorite">{{ i18n.favorite }}</label>
+                        <label for="favorite">{{i18n.favorite}}</label>
                         <input id="favorite" name="Favorite" type="checkbox" ng-model="site.favorite">
                     </div>
                 </div>
             </div>
             <div class="list-section">
                 <div class="list-section-header">
-                    <label for="notes">{{ i18n.notes }}</label>
+                    <label for="notes">{{i18n.notes}}</label>
                 </div>
                 <div class="list-section-items">
                     <div class="list-section-item">
@@ -67,7 +67,7 @@
             <div class="list-section">
                 <div class="list-section-items">
                     <a href="" ng-click="delete()" class="list-section-item text-danger">
-                        <i class="fa fa-trash fa-fw fa-lg"></i> {{ i18n.deleteSite }}
+                        <i class="fa fa-trash fa-fw fa-lg"></i> {{i18n.deleteSite}}
                     </a>
                 </div>
             </div>
diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html
index e846873e37f..4bbc88921ba 100644
--- a/src/popup/app/vault/views/vaultViewSite.html
+++ b/src/popup/app/vault/views/vaultViewSite.html
@@ -1,48 +1,48 @@
 <div class="header">
     <div class="left">
-        <a href="" ng-click="close()">{{ i18n.close }}</a>
+        <a href="" ng-click="close()">{{i18n.close}}</a>
     </div>
     <div class="right">
-        <a href="" ng-click="edit(site)">{{ i18n.edit }}</a>
+        <a href="" ng-click="edit(site)">{{i18n.edit}}</a>
     </div>
-    <div class="title">{{ i18n.viewSite }}</div>
+    <div class="title">{{i18n.viewSite}}</div>
 </div>
 <div class="content">
     <div class="list list-no-selection">
         <div class="list-section">
             <div class="list-section-header">
-                {{ i18n.siteInformation }}
+                {{i18n.siteInformation}}
             </div>
             <div class="list-section-items">
                 <div class="list-section-item">
-                    <span class="item-label">{{ i18n.name }}</span>
+                    <span class="item-label">{{i18n.name}}</span>
                     {{site.name}}
                 </div>
                 <div class="list-section-item" ng-if="site.uri">
-                    <a class="btn-list" href="" title="{{ i18n.launchWebsite }}" ng-click="launchWebsite(site)"
+                    <a class="btn-list" href="" title="{{i18n.launchWebsite}}" ng-click="launchWebsite(site)"
                        ng-show="site.showLaunch">
                         <i class="fa fa-lg fa-share-square-o"></i>
                     </a>
-                    <span class="item-label">{{ i18n.website }}</span>
+                    <span class="item-label">{{i18n.website}}</span>
                     {{site.website}}
                 </div>
                 <div class="list-section-item" ng-if="site.username">
-                    <a class="btn-list" href="" title="{{ i18n.copyUsername }}" ngclipboard ngclipboard-error="clipboardError(e)"
+                    <a class="btn-list" href="" title="{{i18n.copyUsername}}" ngclipboard ngclipboard-error="clipboardError(e)"
                        ngclipboard-success="clipboardSuccess(e, 'Username')" data-clipboard-target="#username">
                         <i class="fa fa-lg fa-clipboard"></i>
                     </a>
-                    <span class="item-label">{{ i18n.username }}</span>
+                    <span class="item-label">{{i18n.username}}</span>
                     <span id="username" class="monospaced">{{site.username}}</span>
                 </div>
                 <div class="list-section-item" ng-if="site.password">
-                    <a class="btn-list" href="" title="{{ i18n.copyPassword }}" ngclipboard ngclipboard-error="clipboardError(e)"
+                    <a class="btn-list" href="" title="{{i18n.copyPassword}}" ngclipboard ngclipboard-error="clipboardError(e)"
                        ngclipboard-success="clipboardSuccess(e, 'Password')" data-clipboard-target="#password">
                         <i class="fa fa-lg fa-clipboard"></i>
                     </a>
-                    <a class="btn-list" href="" title="{{ i18n.togglePassword }}" ng-click="togglePassword()">
+                    <a class="btn-list" href="" title="{{i18n.togglePassword}}" ng-click="togglePassword()">
                         <i class="fa fa-lg" ng-class="[{'fa-eye': !showPassword}, {'fa-eye-slash': showPassword}]"></i>
                     </a>
-                    <span class="item-label">{{ i18n.password }}</span>
+                    <span class="item-label">{{i18n.password}}</span>
                     <span ng-show="!showPassword">{{site.maskedPassword}}</span>
                     <span id="password" ng-show="showPassword" class="monospaced">{{site.password}}</span>
                 </div>
@@ -50,7 +50,7 @@
         </div>
         <div class="list-section" ng-if="site.notes">
             <div class="list-section-header">
-                {{ i18n.notes }}
+                {{i18n.notes}}
             </div>
             <div class="list-section-items">
                 <div class="list-section-item">