From 1eb6af011905a7fe72ea389bbc9eb640bc9ce053 Mon Sep 17 00:00:00 2001
From: Gunther Brunner <gunta85@gmail.com>
Date: Fri, 5 Aug 2016 18:24:30 +0900
Subject: [PATCH] Replaced old `jade` with new `pug`.

Using temporarily npm-shrinkwrap since `template-html-loader` uses an old `consolidate.js` version which doesn't support `pug`.
Follow here: https://github.com/jtangelder/template-html-loader/issues/8
---
 gulpfile.js                                    | 12 ++++++------
 lib/units/app/index.js                         |  2 +-
 lib/units/auth/ldap.js                         |  2 +-
 lib/units/auth/mock.js                         |  2 +-
 npm-shrinkwrap.json                            | 18 ++++++++++++++++++
 package.json                                   | 18 +++++++++---------
 .../badge-icon/badge-icon-directive.js         |  2 +-
 .../{badge-icon.jade => badge-icon.pug}        |  0
 .../clear-button/clear-button-directive.js     |  2 +-
 .../{clear-button.jade => clear-button.pug}    |  0
 .../error-message/error-message-directive.js   |  2 +-
 .../{error-message.jade => error-message.pug}  |  0
 .../filter-button/filter-button-directive.js   |  2 +-
 .../{filter-button.jade => filter-button.pug}  |  0
 .../common-ui/help-icon/help-icon-directive.js |  2 +-
 .../{help-icon.jade => help-icon.pug}          |  0
 .../add-adb-key-modal-service.js               |  2 +-
 ...db-key-modal.jade => add-adb-key-modal.pug} |  0
 .../external-url-modal-service.js              |  2 +-
 ...l-url-modal.jade => external-url-modal.pug} |  0
 .../fatal-message/fatal-message-service.js     |  2 +-
 .../{fatal-message.jade => fatal-message.pug}  |  0
 .../lightbox-image/lightbox-image-service.js   |  2 +-
 ...{lightbox-image.jade => lightbox-image.pug} |  0
 .../socket-disconnected-service.js             |  2 +-
 ...sconnected.jade => socket-disconnected.pug} |  0
 .../version-update/version-update-service.js   |  2 +-
 ...{version-update.jade => version-update.pug} |  0
 .../common-ui/nice-tabs/nice-tab-directive.js  |  2 +-
 .../nice-tabs/{nice-tab.jade => nice-tab.pug}  |  0
 .../common-ui/nice-tabs/nice-tabs-directive.js |  2 +-
 .../{nice-tabs.jade => nice-tabs.pug}          |  0
 .../refresh-page/refresh-page-directive.js     |  2 +-
 .../{refresh-page.jade => refresh-page.pug}    |  0
 .../stacked-icon/stacked-icon-directive.js     |  2 +-
 .../{stacked-icon.jade => stacked-icon.pug}    |  0
 .../device-context-menu-directive.js           |  2 +-
 ...ntext-menu.jade => device-context-menu.pug} |  0
 .../keys/add-adb-key/add-adb-key-directive.js  |  2 +-
 .../{add-adb-key.jade => add-adb-key.pug}      |  0
 .../stf/language/language-service.js           | 10 ++++++++--
 .../stf/logcat-table/logcat-table-directive.js |  2 +-
 .../{logcat-table.jade => logcat-table.pug}    |  0
 .../components/stf/screen/screen-directive.js  |  2 +-
 .../screen-keyboard-directive.js               |  2 +-
 ...creen-keyboard.jade => screen-keyboard.pug} |  0
 .../stf/screen/{screen.jade => screen.pug}     |  0
 .../socket-state/socket-state-directive.js     |  2 +-
 .../{socket-state.jade => socket-state.pug}    |  0
 res/app/components/stf/standalone/index.js     |  4 ++--
 .../{standalone.jade => standalone.pug}        |  0
 .../stf/timelines/timelines-directive.js       |  2 +-
 .../{timelines.jade => timelines.pug}          |  0
 .../generate-access-token-directive.js         |  2 +-
 ...ss-token.jade => generate-access-token.pug} |  0
 .../activity/{activity.jade => activity.pug}   |  0
 res/app/control-panes/activity/index.js        |  4 ++--
 res/app/control-panes/advanced/advanced.jade   | 13 -------------
 res/app/control-panes/advanced/advanced.pug    | 13 +++++++++++++
 res/app/control-panes/advanced/index.js        |  4 ++--
 res/app/control-panes/advanced/input/index.js  |  4 ++--
 .../advanced/input/{input.jade => input.pug}   |  0
 .../advanced/maintenance/index.js              |  4 ++--
 .../{maintenance.jade => maintenance.pug}      |  0
 .../advanced/port-forwarding/index.js          |  4 ++--
 ...ort-forwarding.jade => port-forwarding.pug} |  0
 res/app/control-panes/advanced/run-js/index.js |  4 ++--
 .../run-js/{run-js.jade => run-js.pug}         |  0
 res/app/control-panes/advanced/usb/index.js    |  4 ++--
 .../advanced/usb/{usb.jade => usb.pug}         |  0
 res/app/control-panes/advanced/vnc/index.js    |  4 ++--
 .../advanced/vnc/{vnc.jade => vnc.pug}         |  0
 .../{automation.jade => automation.pug}        |  4 ++--
 ...evice-settings.jade => device-settings.pug} |  0
 .../automation/device-settings/index.js        |  4 ++--
 res/app/control-panes/automation/index.js      |  4 ++--
 .../automation/store-account/index.js          |  4 ++--
 .../{store-account.jade => store-account.pug}  |  0
 .../control-panes/control-panes-controller.js  | 14 +++++++-------
 .../{control-panes.jade => control-panes.pug}  |  4 ++--
 .../control-panes/cpu/{cpu.jade => cpu.pug}    |  0
 res/app/control-panes/cpu/index.js             |  4 ++--
 .../dashboard/apps/{apps.jade => apps.pug}     |  0
 res/app/control-panes/dashboard/apps/index.js  |  4 ++--
 .../{clipboard.jade => clipboard.pug}          |  0
 .../control-panes/dashboard/clipboard/index.js |  4 ++--
 .../{dashboard.jade => dashboard.pug}          | 12 ++++++------
 res/app/control-panes/dashboard/index.js       |  4 ++--
 .../{activities.jade => activities.pug}        |  0
 .../dashboard/install/activities/index.js      |  4 ++--
 .../control-panes/dashboard/install/index.js   |  4 ++--
 .../install/{install.jade => install.pug}      |  2 +-
 .../dashboard/navigation/index.js              |  4 ++--
 .../{navigation.jade => navigation.pug}        |  0
 .../dashboard/remote-debug/index.js            |  4 ++--
 .../{remote-debug.jade => remote-debug.pug}    |  0
 res/app/control-panes/dashboard/shell/index.js |  4 ++--
 .../dashboard/shell/{shell.jade => shell.pug}  |  0
 ...lone.jade => device-control-standalone.pug} |  0
 ...{device-control.jade => device-control.pug} |  0
 res/app/control-panes/device-control/index.js  |  8 ++++----
 .../explorer/{explorer.jade => explorer.pug}   |  0
 res/app/control-panes/explorer/index.js        |  4 ++--
 res/app/control-panes/index.js                 |  4 ++--
 res/app/control-panes/info/index.js            |  4 ++--
 .../control-panes/info/{info.jade => info.pug} |  0
 res/app/control-panes/inspect/index.js         |  4 ++--
 .../inspect/{inspect.jade => inspect.pug}      |  0
 res/app/control-panes/logs/index.js            |  4 ++--
 .../control-panes/logs/{logs.jade => logs.pug} |  0
 .../performance/cpu/{cpu.jade => cpu.pug}      |  0
 res/app/control-panes/performance/cpu/index.js |  4 ++--
 res/app/control-panes/performance/index.js     |  4 ++--
 .../control-panes/performance/performance.jade |  3 ---
 .../control-panes/performance/performance.pug  |  3 +++
 res/app/control-panes/resources/index.js       |  4 ++--
 .../{resources.jade => resources.pug}          |  0
 res/app/control-panes/screenshots/index.js     |  4 ++--
 .../{screenshots.jade => screenshots.pug}      |  0
 .../details/device-list-details-directive.js   |  2 +-
 ...st-details.jade => device-list-details.pug} |  0
 .../{device-list.jade => device-list.pug}      |  0
 .../empty/device-list-empty-directive.js       |  2 +-
 ...e-list-empty.jade => device-list-empty.pug} |  0
 .../icons/device-list-icons-directive.js       |  2 +-
 ...e-list-icons.jade => device-list-icons.pug} |  0
 res/app/device-list/index.js                   |  2 +-
 .../stats/device-list-stats-directive.js       |  2 +-
 ...e-list-stats.jade => device-list-stats.pug} |  0
 res/app/menu/index.js                          |  2 +-
 res/app/menu/{menu.jade => menu.pug}           |  0
 res/app/settings/general/general.jade          |  5 -----
 res/app/settings/general/general.pug           |  5 +++++
 res/app/settings/general/index.js              |  4 ++--
 res/app/settings/general/language/index.js     |  2 +-
 .../language/{language.jade => language.pug}   |  0
 res/app/settings/general/local/index.js        |  4 ++--
 ...{local-settings.jade => local-settings.pug} |  0
 res/app/settings/index.js                      |  2 +-
 .../{access-tokens.jade => access-tokens.pug}  |  0
 res/app/settings/keys/access-tokens/index.js   |  2 +-
 .../adb-keys/{adb-keys.jade => adb-keys.pug}   |  0
 res/app/settings/keys/adb-keys/index.js        |  2 +-
 res/app/settings/keys/index.js                 |  2 +-
 res/app/settings/keys/keys.jade                |  5 -----
 res/app/settings/keys/keys.pug                 |  5 +++++
 res/app/settings/notifications/index.js        |  4 ++--
 .../{notifications.jade => notifications.pug}  |  0
 res/app/settings/settings-controller.js        |  4 ++--
 .../settings/{settings.jade => settings.pug}   |  0
 res/app/user/index.js                          |  2 +-
 res/app/user/{user.jade => user.pug}           |  0
 res/app/views/{docs.jade => docs.pug}          |  0
 res/app/views/{index.jade => index.pug}        |  2 +-
 res/auth/ldap/scripts/signin/index.js          |  2 +-
 .../scripts/signin/{signin.jade => signin.pug} |  0
 res/auth/ldap/views/{index.jade => index.pug}  |  0
 res/auth/mock/scripts/signin/index.js          |  2 +-
 .../scripts/signin/{signin.jade => signin.pug} |  0
 res/auth/mock/views/{index.jade => index.pug}  |  0
 res/common/status/views/{404.jade => 404.pug}  |  0
 .../{maintenance.jade => maintenance.pug}      |  0
 .../views/partials/{styles.jade => styles.pug} |  0
 webpack.config.js                              |  2 +-
 164 files changed, 199 insertions(+), 175 deletions(-)
 create mode 100644 npm-shrinkwrap.json
 rename res/app/components/stf/common-ui/badge-icon/{badge-icon.jade => badge-icon.pug} (100%)
 rename res/app/components/stf/common-ui/clear-button/{clear-button.jade => clear-button.pug} (100%)
 rename res/app/components/stf/common-ui/error-message/{error-message.jade => error-message.pug} (100%)
 rename res/app/components/stf/common-ui/filter-button/{filter-button.jade => filter-button.pug} (100%)
 rename res/app/components/stf/common-ui/help-icon/{help-icon.jade => help-icon.pug} (100%)
 rename res/app/components/stf/common-ui/modals/add-adb-key-modal/{add-adb-key-modal.jade => add-adb-key-modal.pug} (100%)
 rename res/app/components/stf/common-ui/modals/external-url-modal/{external-url-modal.jade => external-url-modal.pug} (100%)
 rename res/app/components/stf/common-ui/modals/fatal-message/{fatal-message.jade => fatal-message.pug} (100%)
 rename res/app/components/stf/common-ui/modals/lightbox-image/{lightbox-image.jade => lightbox-image.pug} (100%)
 rename res/app/components/stf/common-ui/modals/socket-disconnected/{socket-disconnected.jade => socket-disconnected.pug} (100%)
 rename res/app/components/stf/common-ui/modals/version-update/{version-update.jade => version-update.pug} (100%)
 rename res/app/components/stf/common-ui/nice-tabs/{nice-tab.jade => nice-tab.pug} (100%)
 rename res/app/components/stf/common-ui/nice-tabs/{nice-tabs.jade => nice-tabs.pug} (100%)
 rename res/app/components/stf/common-ui/refresh-page/{refresh-page.jade => refresh-page.pug} (100%)
 rename res/app/components/stf/common-ui/stacked-icon/{stacked-icon.jade => stacked-icon.pug} (100%)
 rename res/app/components/stf/device-context-menu/{device-context-menu.jade => device-context-menu.pug} (100%)
 rename res/app/components/stf/keys/add-adb-key/{add-adb-key.jade => add-adb-key.pug} (100%)
 rename res/app/components/stf/logcat-table/{logcat-table.jade => logcat-table.pug} (100%)
 rename res/app/components/stf/screen/screen-keyboard/{screen-keyboard.jade => screen-keyboard.pug} (100%)
 rename res/app/components/stf/screen/{screen.jade => screen.pug} (100%)
 rename res/app/components/stf/socket/socket-state/{socket-state.jade => socket-state.pug} (100%)
 rename res/app/components/stf/standalone/{standalone.jade => standalone.pug} (100%)
 rename res/app/components/stf/timelines/{timelines.jade => timelines.pug} (100%)
 rename res/app/components/stf/tokens/generate-access-token/{generate-access-token.jade => generate-access-token.pug} (100%)
 rename res/app/control-panes/activity/{activity.jade => activity.pug} (100%)
 delete mode 100644 res/app/control-panes/advanced/advanced.jade
 create mode 100644 res/app/control-panes/advanced/advanced.pug
 rename res/app/control-panes/advanced/input/{input.jade => input.pug} (100%)
 rename res/app/control-panes/advanced/maintenance/{maintenance.jade => maintenance.pug} (100%)
 rename res/app/control-panes/advanced/port-forwarding/{port-forwarding.jade => port-forwarding.pug} (100%)
 rename res/app/control-panes/advanced/run-js/{run-js.jade => run-js.pug} (100%)
 rename res/app/control-panes/advanced/usb/{usb.jade => usb.pug} (100%)
 rename res/app/control-panes/advanced/vnc/{vnc.jade => vnc.pug} (100%)
 rename res/app/control-panes/automation/{automation.jade => automation.pug} (79%)
 rename res/app/control-panes/automation/device-settings/{device-settings.jade => device-settings.pug} (100%)
 rename res/app/control-panes/automation/store-account/{store-account.jade => store-account.pug} (100%)
 rename res/app/control-panes/{control-panes.jade => control-panes.pug} (94%)
 rename res/app/control-panes/cpu/{cpu.jade => cpu.pug} (100%)
 rename res/app/control-panes/dashboard/apps/{apps.jade => apps.pug} (100%)
 rename res/app/control-panes/dashboard/clipboard/{clipboard.jade => clipboard.pug} (100%)
 rename res/app/control-panes/dashboard/{dashboard.jade => dashboard.pug} (57%)
 rename res/app/control-panes/dashboard/install/activities/{activities.jade => activities.pug} (100%)
 rename res/app/control-panes/dashboard/install/{install.jade => install.pug} (99%)
 rename res/app/control-panes/dashboard/navigation/{navigation.jade => navigation.pug} (100%)
 rename res/app/control-panes/dashboard/remote-debug/{remote-debug.jade => remote-debug.pug} (100%)
 rename res/app/control-panes/dashboard/shell/{shell.jade => shell.pug} (100%)
 rename res/app/control-panes/device-control/{device-control-standalone.jade => device-control-standalone.pug} (100%)
 rename res/app/control-panes/device-control/{device-control.jade => device-control.pug} (100%)
 rename res/app/control-panes/explorer/{explorer.jade => explorer.pug} (100%)
 rename res/app/control-panes/info/{info.jade => info.pug} (100%)
 rename res/app/control-panes/inspect/{inspect.jade => inspect.pug} (100%)
 rename res/app/control-panes/logs/{logs.jade => logs.pug} (100%)
 rename res/app/control-panes/performance/cpu/{cpu.jade => cpu.pug} (100%)
 delete mode 100644 res/app/control-panes/performance/performance.jade
 create mode 100644 res/app/control-panes/performance/performance.pug
 rename res/app/control-panes/resources/{resources.jade => resources.pug} (100%)
 rename res/app/control-panes/screenshots/{screenshots.jade => screenshots.pug} (100%)
 rename res/app/device-list/details/{device-list-details.jade => device-list-details.pug} (100%)
 rename res/app/device-list/{device-list.jade => device-list.pug} (100%)
 rename res/app/device-list/empty/{device-list-empty.jade => device-list-empty.pug} (100%)
 rename res/app/device-list/icons/{device-list-icons.jade => device-list-icons.pug} (100%)
 rename res/app/device-list/stats/{device-list-stats.jade => device-list-stats.pug} (100%)
 rename res/app/menu/{menu.jade => menu.pug} (100%)
 delete mode 100644 res/app/settings/general/general.jade
 create mode 100644 res/app/settings/general/general.pug
 rename res/app/settings/general/language/{language.jade => language.pug} (100%)
 rename res/app/settings/general/local/{local-settings.jade => local-settings.pug} (100%)
 rename res/app/settings/keys/access-tokens/{access-tokens.jade => access-tokens.pug} (100%)
 rename res/app/settings/keys/adb-keys/{adb-keys.jade => adb-keys.pug} (100%)
 delete mode 100644 res/app/settings/keys/keys.jade
 create mode 100644 res/app/settings/keys/keys.pug
 rename res/app/settings/notifications/{notifications.jade => notifications.pug} (100%)
 rename res/app/settings/{settings.jade => settings.pug} (100%)
 rename res/app/user/{user.jade => user.pug} (100%)
 rename res/app/views/{docs.jade => docs.pug} (100%)
 rename res/app/views/{index.jade => index.pug} (97%)
 rename res/auth/ldap/scripts/signin/{signin.jade => signin.pug} (100%)
 rename res/auth/ldap/views/{index.jade => index.pug} (100%)
 rename res/auth/mock/scripts/signin/{signin.jade => signin.pug} (100%)
 rename res/auth/mock/views/{index.jade => index.pug} (100%)
 rename res/common/status/views/{404.jade => 404.pug} (100%)
 rename res/common/status/views/{maintenance.jade => maintenance.pug} (100%)
 rename res/common/status/views/partials/{styles.jade => styles.pug} (100%)

diff --git a/gulpfile.js b/gulpfile.js
index 31524956..0c503f26 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -9,7 +9,7 @@ var webpack = require('webpack')
 var webpackConfig = require('./webpack.config').webpack
 var webpackStatusConfig = require('./res/common/status/webpack.config')
 var gettext = require('gulp-angular-gettext')
-var jade = require('gulp-jade')
+var pug = require('gulp-pug')
 var del = require('del')
 // var protractor = require('gulp-protractor')
 var protractor = require('./res/test/e2e/helpers/gulp-protractor-adv')
@@ -204,14 +204,14 @@ gulp.task('translate', [
 , 'translate:compile'
 ])
 
-gulp.task('jade', function() {
+gulp.task('pug', function() {
   return gulp.src([
-      './res/**/*.jade'
+    , './res/**/*.pug'
     , '!./res/bower_components/**'
     ])
-    .pipe(jade({
+    .pipe(pug({
       locals: {
-        // So res/views/docs.jade doesn't complain
+        // So res/views/docs.pug doesn't complain
         markdownFile: {
           parseContent: function() {
           }
@@ -221,7 +221,7 @@ gulp.task('jade', function() {
     .pipe(gulp.dest('./tmp/html/'))
 })
 
-gulp.task('translate:extract', ['jade'], function() {
+gulp.task('translate:extract', ['pug'], function() {
   return gulp.src([
       './tmp/html/**/*.html'
     , './res/**/*.js'
diff --git a/lib/units/app/index.js b/lib/units/app/index.js
index 9f19dd4b..981b6ff0 100644
--- a/lib/units/app/index.js
+++ b/lib/units/app/index.js
@@ -31,7 +31,7 @@ module.exports = function(options) {
   , view: 'docs'
   }))
 
-  app.set('view engine', 'jade')
+  app.set('view engine', 'pug')
   app.set('views', pathutil.resource('app/views'))
   app.set('strict routing', true)
   app.set('case sensitive routing', true)
diff --git a/lib/units/auth/ldap.js b/lib/units/auth/ldap.js
index e39b9946..5388407e 100644
--- a/lib/units/auth/ldap.js
+++ b/lib/units/auth/ldap.js
@@ -29,7 +29,7 @@ module.exports = function(options) {
       })
   })
 
-  app.set('view engine', 'jade')
+  app.set('view engine', 'pug')
   app.set('views', pathutil.resource('auth/ldap/views'))
   app.set('strict routing', true)
   app.set('case sensitive routing', true)
diff --git a/lib/units/auth/mock.js b/lib/units/auth/mock.js
index 21ff14b8..dc65b770 100644
--- a/lib/units/auth/mock.js
+++ b/lib/units/auth/mock.js
@@ -51,7 +51,7 @@ module.exports = function(options) {
     }
   }
 
-  app.set('view engine', 'jade')
+  app.set('view engine', 'pug')
   app.set('views', pathutil.resource('auth/mock/views'))
   app.set('strict routing', true)
   app.set('case sensitive routing', true)
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
new file mode 100644
index 00000000..7cda09f3
--- /dev/null
+++ b/npm-shrinkwrap.json
@@ -0,0 +1,18 @@
+{
+  "name": "stf",
+  "version": "2.0.1",
+  "dependencies": {
+    "template-html-loader": {
+      "version": "0.0.3",
+      "from": "template-html-loader@>=0.0.3 <0.0.4",
+      "resolved": "http://registry.npmjs.org/template-html-loader/-/template-html-loader-0.0.3.tgz",
+      "dependencies": {
+        "consolidate": {
+          "version": "0.14.1",
+          "from": "consolidate@>=0.14.0 <0.14.1",
+          "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.1.tgz"
+        }
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index f794734a..40a403cf 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "adbkit": "^2.4.1",
     "adbkit-apkreader": "^1.0.0",
     "adbkit-monkey": "^1.0.1",
-    "aws-sdk": "^2.4.12",
+    "aws-sdk": "^2.4.13",
     "basic-auth": "^1.0.3",
     "bluebird": "^2.10.1",
     "body-parser": "^1.13.3",
@@ -45,14 +45,13 @@
     "csurf": "^1.7.0",
     "debug": "^2.2.0",
     "eventemitter3": "^1.2.0",
-    "express": "^4.13.3",
-    "express-validator": "^2.18.0",
+    "express": "^4.14.0",
+    "express-validator": "^2.20.8",
     "formidable": "^1.0.17",
-    "gm": "^1.21.1",
+    "gm": "^1.23.0",
     "hipchatter": "^0.3.1",
     "http-proxy": "^1.11.2",
     "in-publish": "^2.0.0",
-    "jade": "^1.9.2",
     "jpeg-turbo": "^0.4.0",
     "jws": "^3.1.0",
     "ldapjs": "^1.0.0",
@@ -62,12 +61,13 @@
     "minimatch": "^3.0.0",
     "my-local-ip": "^1.0.0",
     "node-uuid": "^1.4.3",
-    "passport": "^0.3.2",
     "openid": "^2.0.1",
+    "passport": "^0.3.2",
     "passport-oauth2": "^1.1.2",
     "passport-saml": "^0.15.0",
     "protobufjs": "^3.8.2",
     "proxy-addr": "^1.0.10",
+    "pug": "^2.0.0-beta4",
     "request": "^2.67.0",
     "request-progress": "^2.0.1",
     "rethinkdb": "^2.0.2",
@@ -85,9 +85,9 @@
     "swagger-express-mw": "^0.6.0",
     "temp": "^0.8.1",
     "transliteration": "^1.1.6",
+    "url-join": "1.1.0",
     "utf-8-validate": "^1.2.1",
     "ws": "^1.0.1",
-    "url-join": "1.1.0",
     "zmq": "^2.14.0"
   },
   "devDependencies": {
@@ -104,9 +104,9 @@
     "gulp": "^3.8.11",
     "gulp-angular-gettext": "^2.1.0",
     "gulp-eslint": "^3.0.1",
-    "gulp-jade": "^1.0.0",
     "gulp-jsonlint": "^1.0.2",
     "gulp-protractor": "^3.0.0",
+    "gulp-pug": "^3.0.4",
     "gulp-run": "^1.6.12",
     "gulp-util": "^3.0.7",
     "html-loader": "^0.4.0",
@@ -129,7 +129,7 @@
     "memory-fs": "^0.3.0",
     "node-libs-browser": "^1.0.0",
     "node-sass": "^3.4.2",
-    "phantomjs-prebuilt": "^2.1.3",
+    "phantomjs-prebuilt": "^2.1.10",
     "protractor": "^4.0.2",
     "protractor-html-screenshot-reporter": "0.0.21",
     "raw-loader": "^0.5.1",
diff --git a/res/app/components/stf/common-ui/badge-icon/badge-icon-directive.js b/res/app/components/stf/common-ui/badge-icon/badge-icon-directive.js
index 58ba96ce..919f3beb 100644
--- a/res/app/components/stf/common-ui/badge-icon/badge-icon-directive.js
+++ b/res/app/components/stf/common-ui/badge-icon/badge-icon-directive.js
@@ -4,7 +4,7 @@ module.exports = function badgeIconDirective() {
     replace: true,
     scope: {
     },
-    template: require('./badge-icon.jade'),
+    template: require('./badge-icon.pug'),
     link: function() {
     }
   }
diff --git a/res/app/components/stf/common-ui/badge-icon/badge-icon.jade b/res/app/components/stf/common-ui/badge-icon/badge-icon.pug
similarity index 100%
rename from res/app/components/stf/common-ui/badge-icon/badge-icon.jade
rename to res/app/components/stf/common-ui/badge-icon/badge-icon.pug
diff --git a/res/app/components/stf/common-ui/clear-button/clear-button-directive.js b/res/app/components/stf/common-ui/clear-button/clear-button-directive.js
index 1b8aea65..e35f74ec 100644
--- a/res/app/components/stf/common-ui/clear-button/clear-button-directive.js
+++ b/res/app/components/stf/common-ui/clear-button/clear-button-directive.js
@@ -3,6 +3,6 @@ module.exports = function clearButtonDirective() {
     restrict: 'EA',
     replace: true,
     scope: {},
-    template: require('./clear-button.jade')
+    template: require('./clear-button.pug')
   }
 }
diff --git a/res/app/components/stf/common-ui/clear-button/clear-button.jade b/res/app/components/stf/common-ui/clear-button/clear-button.pug
similarity index 100%
rename from res/app/components/stf/common-ui/clear-button/clear-button.jade
rename to res/app/components/stf/common-ui/clear-button/clear-button.pug
diff --git a/res/app/components/stf/common-ui/error-message/error-message-directive.js b/res/app/components/stf/common-ui/error-message/error-message-directive.js
index f7ccaac9..86be7533 100644
--- a/res/app/components/stf/common-ui/error-message/error-message-directive.js
+++ b/res/app/components/stf/common-ui/error-message/error-message-directive.js
@@ -5,7 +5,7 @@ module.exports = function errorMessageDirective() {
     scope: {
       message: '@'
     },
-    template: require('./error-message.jade'),
+    template: require('./error-message.pug'),
     link: function(scope) {
       scope.closeMessage = function() {
         scope.message = ''
diff --git a/res/app/components/stf/common-ui/error-message/error-message.jade b/res/app/components/stf/common-ui/error-message/error-message.pug
similarity index 100%
rename from res/app/components/stf/common-ui/error-message/error-message.jade
rename to res/app/components/stf/common-ui/error-message/error-message.pug
diff --git a/res/app/components/stf/common-ui/filter-button/filter-button-directive.js b/res/app/components/stf/common-ui/filter-button/filter-button-directive.js
index e7a4b63b..25ec15a0 100644
--- a/res/app/components/stf/common-ui/filter-button/filter-button-directive.js
+++ b/res/app/components/stf/common-ui/filter-button/filter-button-directive.js
@@ -4,6 +4,6 @@ module.exports = function filterButtonDirective() {
     restrict: 'EA',
     replace: true,
     scope: {},
-    template: require('./filter-button.jade')
+    template: require('./filter-button.pug')
   }
 }
diff --git a/res/app/components/stf/common-ui/filter-button/filter-button.jade b/res/app/components/stf/common-ui/filter-button/filter-button.pug
similarity index 100%
rename from res/app/components/stf/common-ui/filter-button/filter-button.jade
rename to res/app/components/stf/common-ui/filter-button/filter-button.pug
diff --git a/res/app/components/stf/common-ui/help-icon/help-icon-directive.js b/res/app/components/stf/common-ui/help-icon/help-icon-directive.js
index 00f52e27..7f161da1 100644
--- a/res/app/components/stf/common-ui/help-icon/help-icon-directive.js
+++ b/res/app/components/stf/common-ui/help-icon/help-icon-directive.js
@@ -6,6 +6,6 @@ module.exports = function clearButtonDirective() {
       topic: '@',
       tooltip: '@'
     },
-    template: require('./help-icon.jade')
+    template: require('./help-icon.pug')
   }
 }
diff --git a/res/app/components/stf/common-ui/help-icon/help-icon.jade b/res/app/components/stf/common-ui/help-icon/help-icon.pug
similarity index 100%
rename from res/app/components/stf/common-ui/help-icon/help-icon.jade
rename to res/app/components/stf/common-ui/help-icon/help-icon.pug
diff --git a/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js b/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js
index 9e4d3ac3..0800330f 100644
--- a/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js
+++ b/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js
@@ -25,7 +25,7 @@ module.exports =
 
     service.open = function(data) {
       var modalInstance = $uibModal.open({
-        template: require('./add-adb-key-modal.jade'),
+        template: require('./add-adb-key-modal.pug'),
         controller: ModalInstanceCtrl,
         resolve: {
           data: function() {
diff --git a/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal.jade b/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal.pug
similarity index 100%
rename from res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal.jade
rename to res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal.pug
diff --git a/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js b/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js
index 50b97e2e..443bfa6d 100644
--- a/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js
+++ b/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js
@@ -17,7 +17,7 @@ module.exports = function ServiceFactory($uibModal, $sce) {
 
   service.open = function(url, title, icon) {
     var modalInstance = $uibModal.open({
-      template: require('./external-url-modal.jade'),
+      template: require('./external-url-modal.pug'),
       controller: ModalInstanceCtrl,
       windowClass: 'modal-size-80p',
       resolve: {
diff --git a/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal.jade b/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal.pug
similarity index 100%
rename from res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal.jade
rename to res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal.pug
diff --git a/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js b/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
index aa552397..22ae3d22 100644
--- a/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
+++ b/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
@@ -57,7 +57,7 @@ module.exports =
 
     FatalMessageService.open = function(device, tryToReconnect) {
       var modalInstance = $uibModal.open({
-        template: require('./fatal-message.jade'),
+        template: require('./fatal-message.pug'),
         controller: ModalInstanceCtrl,
         resolve: {
           device: function() {
diff --git a/res/app/components/stf/common-ui/modals/fatal-message/fatal-message.jade b/res/app/components/stf/common-ui/modals/fatal-message/fatal-message.pug
similarity index 100%
rename from res/app/components/stf/common-ui/modals/fatal-message/fatal-message.jade
rename to res/app/components/stf/common-ui/modals/fatal-message/fatal-message.pug
diff --git a/res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js b/res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js
index dc81fdc2..cf57f224 100644
--- a/res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js
+++ b/res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js
@@ -16,7 +16,7 @@ module.exports = function ServiceFactory($uibModal) {
 
   service.open = function(title, imageUrl) {
     var modalInstance = $uibModal.open({
-      template: require('./lightbox-image.jade'),
+      template: require('./lightbox-image.pug'),
       controller: ModalInstanceCtrl,
       windowClass: 'modal-size-xl',
       resolve: {
diff --git a/res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image.jade b/res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image.pug
similarity index 100%
rename from res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image.jade
rename to res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image.pug
diff --git a/res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js b/res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js
index 3f6ee617..0835fded 100644
--- a/res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js
+++ b/res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js
@@ -18,7 +18,7 @@ module.exports =
 
     service.open = function(message) {
       var modalInstance = $uibModal.open({
-        template: require('./socket-disconnected.jade'),
+        template: require('./socket-disconnected.pug'),
         controller: ModalInstanceCtrl,
         resolve: {
           message: function() {
diff --git a/res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected.jade b/res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected.pug
similarity index 100%
rename from res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected.jade
rename to res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected.pug
diff --git a/res/app/components/stf/common-ui/modals/version-update/version-update-service.js b/res/app/components/stf/common-ui/modals/version-update/version-update-service.js
index ae3a9a9d..50cf85ad 100644
--- a/res/app/components/stf/common-ui/modals/version-update/version-update-service.js
+++ b/res/app/components/stf/common-ui/modals/version-update/version-update-service.js
@@ -14,7 +14,7 @@ module.exports = function ServiceFactory($uibModal, $location) {
 
   service.open = function() {
     var modalInstance = $uibModal.open({
-      template: require('./version-update.jade'),
+      template: require('./version-update.pug'),
       controller: ModalInstanceCtrl
     })
 
diff --git a/res/app/components/stf/common-ui/modals/version-update/version-update.jade b/res/app/components/stf/common-ui/modals/version-update/version-update.pug
similarity index 100%
rename from res/app/components/stf/common-ui/modals/version-update/version-update.jade
rename to res/app/components/stf/common-ui/modals/version-update/version-update.pug
diff --git a/res/app/components/stf/common-ui/nice-tabs/nice-tab-directive.js b/res/app/components/stf/common-ui/nice-tabs/nice-tab-directive.js
index 3406c29f..2cea620a 100644
--- a/res/app/components/stf/common-ui/nice-tabs/nice-tab-directive.js
+++ b/res/app/components/stf/common-ui/nice-tabs/nice-tab-directive.js
@@ -5,7 +5,7 @@ module.exports = function niceTabDirective() {
     replace: true,
     scope: {
     },
-    template: require('./nice-tab.jade'),
+    template: require('./nice-tab.pug'),
     link: function() {
     }
   }
diff --git a/res/app/components/stf/common-ui/nice-tabs/nice-tab.jade b/res/app/components/stf/common-ui/nice-tabs/nice-tab.pug
similarity index 100%
rename from res/app/components/stf/common-ui/nice-tabs/nice-tab.jade
rename to res/app/components/stf/common-ui/nice-tabs/nice-tab.pug
diff --git a/res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js b/res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js
index a666080e..435db1d4 100644
--- a/res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js
+++ b/res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js
@@ -2,7 +2,7 @@ module.exports = function niceTabsDirective() {
   return {
     restrict: 'EA',
     replace: true,
-    template: require('./nice-tabs.jade'),
+    template: require('./nice-tabs.pug'),
     link: function(scope, element, attrs) {
       // TODO: add support for 'key' for saving in Settings
       // TODO: add support for 'direction=below' for below tabs
diff --git a/res/app/components/stf/common-ui/nice-tabs/nice-tabs.jade b/res/app/components/stf/common-ui/nice-tabs/nice-tabs.pug
similarity index 100%
rename from res/app/components/stf/common-ui/nice-tabs/nice-tabs.jade
rename to res/app/components/stf/common-ui/nice-tabs/nice-tabs.pug
diff --git a/res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js b/res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js
index 8a8f05e2..10b409f4 100644
--- a/res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js
+++ b/res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js
@@ -4,7 +4,7 @@ module.exports = function refreshPageDirective($window) {
     replace: true,
     scope: {
     },
-    template: require('./refresh-page.jade'),
+    template: require('./refresh-page.pug'),
     link: function(scope) {
       scope.reloadWindow = function() {
         $window.location.reload()
diff --git a/res/app/components/stf/common-ui/refresh-page/refresh-page.jade b/res/app/components/stf/common-ui/refresh-page/refresh-page.pug
similarity index 100%
rename from res/app/components/stf/common-ui/refresh-page/refresh-page.jade
rename to res/app/components/stf/common-ui/refresh-page/refresh-page.pug
diff --git a/res/app/components/stf/common-ui/stacked-icon/stacked-icon-directive.js b/res/app/components/stf/common-ui/stacked-icon/stacked-icon-directive.js
index 4bd87bae..7560241b 100644
--- a/res/app/components/stf/common-ui/stacked-icon/stacked-icon-directive.js
+++ b/res/app/components/stf/common-ui/stacked-icon/stacked-icon-directive.js
@@ -8,6 +8,6 @@ module.exports = function clearButtonDirective() {
       icon: '@',
       color: '@'
     },
-    template: require('./stacked-icon.jade')
+    template: require('./stacked-icon.pug')
   }
 }
diff --git a/res/app/components/stf/common-ui/stacked-icon/stacked-icon.jade b/res/app/components/stf/common-ui/stacked-icon/stacked-icon.pug
similarity index 100%
rename from res/app/components/stf/common-ui/stacked-icon/stacked-icon.jade
rename to res/app/components/stf/common-ui/stacked-icon/stacked-icon.pug
diff --git a/res/app/components/stf/device-context-menu/device-context-menu-directive.js b/res/app/components/stf/device-context-menu/device-context-menu-directive.js
index 33839df6..7cfd6453 100644
--- a/res/app/components/stf/device-context-menu/device-context-menu-directive.js
+++ b/res/app/components/stf/device-context-menu/device-context-menu-directive.js
@@ -7,7 +7,7 @@ module.exports = function deviceContextMenuDirective($window) {
     //  device: '&'
     //},
     transclude: true,
-    template: require('./device-context-menu.jade'),
+    template: require('./device-context-menu.pug'),
     link: function(scope) {
       //var device = scope.device()
       //var control = scope.control()
diff --git a/res/app/components/stf/device-context-menu/device-context-menu.jade b/res/app/components/stf/device-context-menu/device-context-menu.pug
similarity index 100%
rename from res/app/components/stf/device-context-menu/device-context-menu.jade
rename to res/app/components/stf/device-context-menu/device-context-menu.pug
diff --git a/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js b/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js
index 8f968790..8d039663 100644
--- a/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js
+++ b/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js
@@ -6,7 +6,7 @@ module.exports = function addAdbKeyDirective(AdbKeysService) {
       showAdd: '=',
       showClipboard: '='
     },
-    template: require('./add-adb-key.jade'),
+    template: require('./add-adb-key.pug'),
     controller: function($scope, UserService) {
       $scope.addForm = {
         title: ''
diff --git a/res/app/components/stf/keys/add-adb-key/add-adb-key.jade b/res/app/components/stf/keys/add-adb-key/add-adb-key.pug
similarity index 100%
rename from res/app/components/stf/keys/add-adb-key/add-adb-key.jade
rename to res/app/components/stf/keys/add-adb-key/add-adb-key.pug
diff --git a/res/app/components/stf/language/language-service.js b/res/app/components/stf/language/language-service.js
index 096a5cea..76a79f34 100644
--- a/res/app/components/stf/language/language-service.js
+++ b/res/app/components/stf/language/language-service.js
@@ -1,4 +1,5 @@
 var supportedLanguages = require('./../../../../common/lang/langs.json')
+var _ = require('lodash')
 
 module.exports =
   function LanguageServiceFactory(SettingsService, gettextCatalog) {
@@ -7,8 +8,13 @@ module.exports =
     var LanguageService = {}
 
     function detectLanguage() {
-      return (navigator.language || navigator.userLanguage || 'en-US')
-        .substring(0, 2)
+      return navigator.language || navigator.userLanguage
+    }
+
+    function browserToSupportedLang(lang) {
+      //supportedLanguages.
+
+      //return lang.replace(/([A-Za-z]{2})(-|_)?([A-Za-z]{0,4})/gm, '$1')
     }
 
     function isSupported(lang) {
diff --git a/res/app/components/stf/logcat-table/logcat-table-directive.js b/res/app/components/stf/logcat-table/logcat-table-directive.js
index 16751975..fb285eae 100644
--- a/res/app/components/stf/logcat-table/logcat-table-directive.js
+++ b/res/app/components/stf/logcat-table/logcat-table-directive.js
@@ -5,7 +5,7 @@ module.exports =
     return {
       restrict: 'E',
       replace: true,
-      template: require('./logcat-table.jade'),
+      template: require('./logcat-table.pug'),
       link: function(scope, element) {
         var autoScroll = true
         var autoScrollDependingOnScrollPosition = true
diff --git a/res/app/components/stf/logcat-table/logcat-table.jade b/res/app/components/stf/logcat-table/logcat-table.pug
similarity index 100%
rename from res/app/components/stf/logcat-table/logcat-table.jade
rename to res/app/components/stf/logcat-table/logcat-table.pug
diff --git a/res/app/components/stf/screen/screen-directive.js b/res/app/components/stf/screen/screen-directive.js
index ec4e56d0..9378ccfc 100644
--- a/res/app/components/stf/screen/screen-directive.js
+++ b/res/app/components/stf/screen/screen-directive.js
@@ -12,7 +12,7 @@ module.exports = function DeviceScreenDirective(
 ) {
   return {
     restrict: 'E'
-  , template: require('./screen.jade')
+  , template: require('./screen.pug')
   , scope: {
       control: '&'
     , device: '&'
diff --git a/res/app/components/stf/screen/screen-keyboard/screen-keyboard-directive.js b/res/app/components/stf/screen/screen-keyboard/screen-keyboard-directive.js
index 62789b60..36c64410 100644
--- a/res/app/components/stf/screen/screen-keyboard/screen-keyboard-directive.js
+++ b/res/app/components/stf/screen/screen-keyboard/screen-keyboard-directive.js
@@ -1,7 +1,7 @@
 module.exports = function screenKeyboardDirective() {
   return {
     restrict: 'E',
-    template: require('./screen-keyboard.jade'),
+    template: require('./screen-keyboard.pug'),
     link: function(scope, element) {
       element.find('input')
 
diff --git a/res/app/components/stf/screen/screen-keyboard/screen-keyboard.jade b/res/app/components/stf/screen/screen-keyboard/screen-keyboard.pug
similarity index 100%
rename from res/app/components/stf/screen/screen-keyboard/screen-keyboard.jade
rename to res/app/components/stf/screen/screen-keyboard/screen-keyboard.pug
diff --git a/res/app/components/stf/screen/screen.jade b/res/app/components/stf/screen/screen.pug
similarity index 100%
rename from res/app/components/stf/screen/screen.jade
rename to res/app/components/stf/screen/screen.pug
diff --git a/res/app/components/stf/socket/socket-state/socket-state-directive.js b/res/app/components/stf/socket/socket-state/socket-state-directive.js
index 2e7930e5..7128d327 100644
--- a/res/app/components/stf/socket/socket-state/socket-state-directive.js
+++ b/res/app/components/stf/socket/socket-state/socket-state-directive.js
@@ -8,7 +8,7 @@ module.exports = function SocketStateDirectiveFactory(
 ) {
   return {
     restrict: 'EA',
-    template: require('./socket-state.jade'),
+    template: require('./socket-state.pug'),
     link: function(scope) {
       var hasFailedOnce = false
 
diff --git a/res/app/components/stf/socket/socket-state/socket-state.jade b/res/app/components/stf/socket/socket-state/socket-state.pug
similarity index 100%
rename from res/app/components/stf/socket/socket-state/socket-state.jade
rename to res/app/components/stf/socket/socket-state/socket-state.pug
diff --git a/res/app/components/stf/standalone/index.js b/res/app/components/stf/standalone/index.js
index a785be2b..674beb08 100644
--- a/res/app/components/stf/standalone/index.js
+++ b/res/app/components/stf/standalone/index.js
@@ -8,8 +8,8 @@ module.exports = angular.module('device-control.standalone', [
   require('stf/screen/scaling').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/device-control/standalone/standalone.jade',
-      require('./standalone.jade')
+    $templateCache.put('control-panes/device-control/standalone/standalone.pug',
+      require('./standalone.pug')
     )
   }])
   .controller('StandaloneCtrl', require('./standalone-controller'))
diff --git a/res/app/components/stf/standalone/standalone.jade b/res/app/components/stf/standalone/standalone.pug
similarity index 100%
rename from res/app/components/stf/standalone/standalone.jade
rename to res/app/components/stf/standalone/standalone.pug
diff --git a/res/app/components/stf/timelines/timelines-directive.js b/res/app/components/stf/timelines/timelines-directive.js
index e010cb36..9e6de266 100644
--- a/res/app/components/stf/timelines/timelines-directive.js
+++ b/res/app/components/stf/timelines/timelines-directive.js
@@ -3,7 +3,7 @@ module.exports = function timelinesDirective(Timelines) {
     restrict: 'AE',
     replace: false,
     scope: {},
-    template: require('./timelines.jade'),
+    template: require('./timelines.pug'),
     link: function(scope) {
       scope.cssPrefix = Timelines.options.cssPrefix
       scope.notifications = Timelines.notifications
diff --git a/res/app/components/stf/timelines/timelines.jade b/res/app/components/stf/timelines/timelines.pug
similarity index 100%
rename from res/app/components/stf/timelines/timelines.jade
rename to res/app/components/stf/timelines/timelines.pug
diff --git a/res/app/components/stf/tokens/generate-access-token/generate-access-token-directive.js b/res/app/components/stf/tokens/generate-access-token/generate-access-token-directive.js
index 1e12024e..e895cdea 100644
--- a/res/app/components/stf/tokens/generate-access-token/generate-access-token-directive.js
+++ b/res/app/components/stf/tokens/generate-access-token/generate-access-token-directive.js
@@ -5,7 +5,7 @@ module.exports = function generateAccessTokenDirective() {
     scope: {
       showGenerate: '='
     },
-    template: require('./generate-access-token.jade'),
+    template: require('./generate-access-token.pug'),
     controller: function($scope, AccessTokenService) {
       $scope.generateForm = {
         title: ''
diff --git a/res/app/components/stf/tokens/generate-access-token/generate-access-token.jade b/res/app/components/stf/tokens/generate-access-token/generate-access-token.pug
similarity index 100%
rename from res/app/components/stf/tokens/generate-access-token/generate-access-token.jade
rename to res/app/components/stf/tokens/generate-access-token/generate-access-token.pug
diff --git a/res/app/control-panes/activity/activity.jade b/res/app/control-panes/activity/activity.pug
similarity index 100%
rename from res/app/control-panes/activity/activity.jade
rename to res/app/control-panes/activity/activity.pug
diff --git a/res/app/control-panes/activity/index.js b/res/app/control-panes/activity/index.js
index 965c1b82..19b681bd 100644
--- a/res/app/control-panes/activity/index.js
+++ b/res/app/control-panes/activity/index.js
@@ -6,8 +6,8 @@ module.exports = angular.module('stf.activity', [
   require('stf/timeline').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/activity/activity.jade',
-      require('./activity.jade')
+    $templateCache.put('control-panes/activity/activity.pug',
+      require('./activity.pug')
     )
   }])
   .controller('ActivityCtrl', require('./activity-controller'))
diff --git a/res/app/control-panes/advanced/advanced.jade b/res/app/control-panes/advanced/advanced.jade
deleted file mode 100644
index 809e40c4..00000000
--- a/res/app/control-panes/advanced/advanced.jade
+++ /dev/null
@@ -1,13 +0,0 @@
-.row
-  //.col-md-12
-    div(ng-include='"control-panes/advanced/run-js/run-js.jade"')
-  .col-md-6
-    div(ng-include='"control-panes/advanced/input/input.jade"')
-  .col-md-6
-    div(ng-include='"control-panes/advanced/port-forwarding/port-forwarding.jade"')
-.row
-  //.col-md-6
-  //  div(ng-include='"control-panes/advanced/vnc/vnc.jade"')
-
-  .col-md-6
-    div(ng-include='"control-panes/advanced/maintenance/maintenance.jade"')
diff --git a/res/app/control-panes/advanced/advanced.pug b/res/app/control-panes/advanced/advanced.pug
new file mode 100644
index 00000000..b277b7b3
--- /dev/null
+++ b/res/app/control-panes/advanced/advanced.pug
@@ -0,0 +1,13 @@
+.row
+  //.col-md-12
+    div(ng-include='"control-panes/advanced/run-js/run-js.pug"')
+  .col-md-6
+    div(ng-include='"control-panes/advanced/input/input.pug"')
+  .col-md-6
+    div(ng-include='"control-panes/advanced/port-forwarding/port-forwarding.pug"')
+.row
+  //.col-md-6
+  //  div(ng-include='"control-panes/advanced/vnc/vnc.pug"')
+
+  .col-md-6
+    div(ng-include='"control-panes/advanced/maintenance/maintenance.pug"')
diff --git a/res/app/control-panes/advanced/index.js b/res/app/control-panes/advanced/index.js
index ebcd7247..78dc569a 100644
--- a/res/app/control-panes/advanced/index.js
+++ b/res/app/control-panes/advanced/index.js
@@ -9,8 +9,8 @@ module.exports = angular.module('stf.advanced', [
   require('./maintenance').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/advanced.jade',
-      require('./advanced.jade')
+    $templateCache.put('control-panes/advanced/advanced.pug',
+      require('./advanced.pug')
     )
   }])
   .controller('AdvancedCtrl', require('./advanced-controller'))
diff --git a/res/app/control-panes/advanced/input/index.js b/res/app/control-panes/advanced/input/index.js
index f6d13768..e6ecd193 100644
--- a/res/app/control-panes/advanced/input/index.js
+++ b/res/app/control-panes/advanced/input/index.js
@@ -3,8 +3,8 @@ require('./input.css')
 module.exports = angular.module('stf.advanced.input', [
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/input/input.jade',
-      require('./input.jade')
+    $templateCache.put('control-panes/advanced/input/input.pug',
+      require('./input.pug')
     )
   }])
   .controller('InputAdvancedCtrl', require('./input-controller'))
diff --git a/res/app/control-panes/advanced/input/input.jade b/res/app/control-panes/advanced/input/input.pug
similarity index 100%
rename from res/app/control-panes/advanced/input/input.jade
rename to res/app/control-panes/advanced/input/input.pug
diff --git a/res/app/control-panes/advanced/maintenance/index.js b/res/app/control-panes/advanced/maintenance/index.js
index 37dc8485..a2aa24b8 100644
--- a/res/app/control-panes/advanced/maintenance/index.js
+++ b/res/app/control-panes/advanced/maintenance/index.js
@@ -2,8 +2,8 @@ module.exports = angular.module('stf.advanced.maintenance', [
   require('gettext').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/maintenance/maintenance.jade',
-      require('./maintenance.jade')
+    $templateCache.put('control-panes/advanced/maintenance/maintenance.pug',
+      require('./maintenance.pug')
     )
   }])
   .controller('MaintenanceCtrl', require('./maintenance-controller'))
diff --git a/res/app/control-panes/advanced/maintenance/maintenance.jade b/res/app/control-panes/advanced/maintenance/maintenance.pug
similarity index 100%
rename from res/app/control-panes/advanced/maintenance/maintenance.jade
rename to res/app/control-panes/advanced/maintenance/maintenance.pug
diff --git a/res/app/control-panes/advanced/port-forwarding/index.js b/res/app/control-panes/advanced/port-forwarding/index.js
index 0b9421b3..7898ec01 100644
--- a/res/app/control-panes/advanced/port-forwarding/index.js
+++ b/res/app/control-panes/advanced/port-forwarding/index.js
@@ -7,8 +7,8 @@ module.exports = angular.module('stf.port-forwarding', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/advanced/port-forwarding/port-forwarding.jade',
-      require('./port-forwarding.jade')
+      'control-panes/advanced/port-forwarding/port-forwarding.pug',
+      require('./port-forwarding.pug')
     )
   }])
   .controller('PortForwardingCtrl', require('./port-forwarding-controller'))
diff --git a/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade b/res/app/control-panes/advanced/port-forwarding/port-forwarding.pug
similarity index 100%
rename from res/app/control-panes/advanced/port-forwarding/port-forwarding.jade
rename to res/app/control-panes/advanced/port-forwarding/port-forwarding.pug
diff --git a/res/app/control-panes/advanced/run-js/index.js b/res/app/control-panes/advanced/run-js/index.js
index e833d2d8..029a01e2 100644
--- a/res/app/control-panes/advanced/run-js/index.js
+++ b/res/app/control-panes/advanced/run-js/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.run-js', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/run-js/run-js.jade',
-      require('./run-js.jade')
+    $templateCache.put('control-panes/advanced/run-js/run-js.pug',
+      require('./run-js.pug')
     )
   }])
   .controller('RunJsCtrl', require('./run-js-controller'))
diff --git a/res/app/control-panes/advanced/run-js/run-js.jade b/res/app/control-panes/advanced/run-js/run-js.pug
similarity index 100%
rename from res/app/control-panes/advanced/run-js/run-js.jade
rename to res/app/control-panes/advanced/run-js/run-js.pug
diff --git a/res/app/control-panes/advanced/usb/index.js b/res/app/control-panes/advanced/usb/index.js
index 845ccc9c..2a67cd9f 100644
--- a/res/app/control-panes/advanced/usb/index.js
+++ b/res/app/control-panes/advanced/usb/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.usb', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/usb/usb.jade',
-      require('./usb.jade')
+    $templateCache.put('control-panes/advanced/usb/usb.pug',
+      require('./usb.pug')
     )
   }])
   .controller('UsbCtrl', require('./usb-controller'))
diff --git a/res/app/control-panes/advanced/usb/usb.jade b/res/app/control-panes/advanced/usb/usb.pug
similarity index 100%
rename from res/app/control-panes/advanced/usb/usb.jade
rename to res/app/control-panes/advanced/usb/usb.pug
diff --git a/res/app/control-panes/advanced/vnc/index.js b/res/app/control-panes/advanced/vnc/index.js
index 0532ecec..bece6ef6 100644
--- a/res/app/control-panes/advanced/vnc/index.js
+++ b/res/app/control-panes/advanced/vnc/index.js
@@ -5,8 +5,8 @@ module.exports = angular.module('stf.vnc', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/advanced/vnc/vnc.jade',
-      require('./vnc.jade')
+      'control-panes/advanced/vnc/vnc.pug',
+      require('./vnc.pug')
     )
   }])
   .controller('VNCCtrl', require('./vnc-controller'))
diff --git a/res/app/control-panes/advanced/vnc/vnc.jade b/res/app/control-panes/advanced/vnc/vnc.pug
similarity index 100%
rename from res/app/control-panes/advanced/vnc/vnc.jade
rename to res/app/control-panes/advanced/vnc/vnc.pug
diff --git a/res/app/control-panes/automation/automation.jade b/res/app/control-panes/automation/automation.pug
similarity index 79%
rename from res/app/control-panes/automation/automation.jade
rename to res/app/control-panes/automation/automation.pug
index ada06d2d..45765447 100644
--- a/res/app/control-panes/automation/automation.jade
+++ b/res/app/control-panes/automation/automation.pug
@@ -1,5 +1,5 @@
 .row
   .col-md-6
-    div(ng-include='"control-panes/automation/store-account/store-account.jade"')
+    div(ng-include='"control-panes/automation/store-account/store-account.pug"')
   .col-md-6
-    div(ng-include='"control-panes/automation/device-settings/device-settings.jade"')
+    div(ng-include='"control-panes/automation/device-settings/device-settings.pug"')
diff --git a/res/app/control-panes/automation/device-settings/device-settings.jade b/res/app/control-panes/automation/device-settings/device-settings.pug
similarity index 100%
rename from res/app/control-panes/automation/device-settings/device-settings.jade
rename to res/app/control-panes/automation/device-settings/device-settings.pug
diff --git a/res/app/control-panes/automation/device-settings/index.js b/res/app/control-panes/automation/device-settings/index.js
index a3602cc4..cc50fe1c 100644
--- a/res/app/control-panes/automation/device-settings/index.js
+++ b/res/app/control-panes/automation/device-settings/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.device-settings', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/automation/device-settings/device-settings.jade',
-      require('./device-settings.jade')
+    $templateCache.put('control-panes/automation/device-settings/device-settings.pug',
+      require('./device-settings.pug')
     )
   }])
   .controller('DeviceSettingsCtrl', require('./device-settings-controller'))
diff --git a/res/app/control-panes/automation/index.js b/res/app/control-panes/automation/index.js
index 3ba2e852..02d19c25 100644
--- a/res/app/control-panes/automation/index.js
+++ b/res/app/control-panes/automation/index.js
@@ -4,7 +4,7 @@ module.exports = angular.module('stf.automation', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/automation/automation.jade'
-      , require('./automation.jade')
+      'control-panes/automation/automation.pug'
+      , require('./automation.pug')
     )
   }])
diff --git a/res/app/control-panes/automation/store-account/index.js b/res/app/control-panes/automation/store-account/index.js
index 28dfc41f..a5fbb99b 100644
--- a/res/app/control-panes/automation/store-account/index.js
+++ b/res/app/control-panes/automation/store-account/index.js
@@ -6,8 +6,8 @@ module.exports = angular.module('stf.store-account', [
   require('stf/common-ui/table').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/automation/store-account/store-account.jade',
-      require('./store-account.jade')
+    $templateCache.put('control-panes/automation/store-account/store-account.pug',
+      require('./store-account.pug')
     )
   }])
   .controller('StoreAccountCtrl', require('./store-account-controller'))
diff --git a/res/app/control-panes/automation/store-account/store-account.jade b/res/app/control-panes/automation/store-account/store-account.pug
similarity index 100%
rename from res/app/control-panes/automation/store-account/store-account.jade
rename to res/app/control-panes/automation/store-account/store-account.pug
diff --git a/res/app/control-panes/control-panes-controller.js b/res/app/control-panes/control-panes-controller.js
index f026d397..5a5db164 100644
--- a/res/app/control-panes/control-panes-controller.js
+++ b/res/app/control-panes/control-panes-controller.js
@@ -7,31 +7,31 @@ module.exports =
       {
         title: gettext('Screenshots'),
         icon: 'fa-camera color-skyblue',
-        templateUrl: 'control-panes/screenshots/screenshots.jade',
+        templateUrl: 'control-panes/screenshots/screenshots.pug',
         filters: ['native', 'web']
       },
       {
         title: gettext('Automation'),
         icon: 'fa-road color-lila',
-        templateUrl: 'control-panes/automation/automation.jade',
+        templateUrl: 'control-panes/automation/automation.pug',
         filters: ['native', 'web']
       },
       {
         title: gettext('Advanced'),
         icon: 'fa-bolt color-brown',
-        templateUrl: 'control-panes/advanced/advanced.jade',
+        templateUrl: 'control-panes/advanced/advanced.pug',
         filters: ['native', 'web']
       },
       {
         title: gettext('File Explorer'),
         icon: 'fa-folder-open color-blue',
-        templateUrl: 'control-panes/explorer/explorer.jade',
+        templateUrl: 'control-panes/explorer/explorer.pug',
         filters: ['native', 'web']
       },
       {
         title: gettext('Info'),
         icon: 'fa-info color-orange',
-        templateUrl: 'control-panes/info/info.jade',
+        templateUrl: 'control-panes/info/info.pug',
         filters: ['native', 'web']
       }
     ]
@@ -40,7 +40,7 @@ module.exports =
       {
         title: gettext('Dashboard'),
         icon: 'fa-dashboard fa-fw color-pink',
-        templateUrl: 'control-panes/dashboard/dashboard.jade',
+        templateUrl: 'control-panes/dashboard/dashboard.pug',
         filters: ['native', 'web']
       }
     ].concat(angular.copy(sharedTabs))
@@ -49,7 +49,7 @@ module.exports =
       {
         title: gettext('Logs'),
         icon: 'fa-list-alt color-red',
-        templateUrl: 'control-panes/logs/logs.jade',
+        templateUrl: 'control-panes/logs/logs.pug',
         filters: ['native', 'web']
       }
     ].concat(angular.copy(sharedTabs))
diff --git a/res/app/control-panes/control-panes.jade b/res/app/control-panes/control-panes.pug
similarity index 94%
rename from res/app/control-panes/control-panes.jade
rename to res/app/control-panes/control-panes.pug
index 45ee602d..a815aa66 100644
--- a/res/app/control-panes/control-panes.jade
+++ b/res/app/control-panes/control-panes.pug
@@ -2,13 +2,13 @@ div(ng-controller='ControlPanesHotKeysCtrl').fill-height
   div(ng-if='$root.basicMode || $root.standalone').fill-height
     div.fill-height.basic-remote-control
       .remote-control
-        div(ng-include='"control-panes/device-control/device-control-standalone.jade"').fill-height
+        div(ng-include='"control-panes/device-control/device-control-standalone.pug"').fill-height
 
   div(ng-if='!$root.basicMode && !$root.standalone')
     div(fa-pane, pane-id='control-device', pane-anchor='west', pane-size='{{remotePaneSize}}', pane-min='200px', pane-max='100% + 2px', pane-handle='4', pane-no-toggle='false')
 
       .remote-control
-        div(ng-include='"control-panes/device-control/device-control.jade"').fill-height
+        div(ng-include='"control-panes/device-control/device-control.pug"').fill-height
 
     div(fa-pane, pane-id='control-bottom-tabs', pane-anchor='south', pane-size='30% + 2px', pane-handle='4').pane-bottom-p
       .widget-container.fluid-height
diff --git a/res/app/control-panes/cpu/cpu.jade b/res/app/control-panes/cpu/cpu.pug
similarity index 100%
rename from res/app/control-panes/cpu/cpu.jade
rename to res/app/control-panes/cpu/cpu.pug
diff --git a/res/app/control-panes/cpu/index.js b/res/app/control-panes/cpu/index.js
index 49ce5b40..87721c3b 100644
--- a/res/app/control-panes/cpu/index.js
+++ b/res/app/control-panes/cpu/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.cpu', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/cpu/cpu.jade',
-      require('./cpu.jade')
+    $templateCache.put('control-panes/cpu/cpu.pug',
+      require('./cpu.pug')
     )
   }])
   .controller('CpuCtrl', require('./cpu-controller'))
diff --git a/res/app/control-panes/dashboard/apps/apps.jade b/res/app/control-panes/dashboard/apps/apps.pug
similarity index 100%
rename from res/app/control-panes/dashboard/apps/apps.jade
rename to res/app/control-panes/dashboard/apps/apps.pug
diff --git a/res/app/control-panes/dashboard/apps/index.js b/res/app/control-panes/dashboard/apps/index.js
index 9ecb204f..99a49608 100644
--- a/res/app/control-panes/dashboard/apps/index.js
+++ b/res/app/control-panes/dashboard/apps/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.apps', [
   require('stf/common-ui').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/apps/apps.jade',
-      require('./apps.jade')
+    $templateCache.put('control-panes/dashboard/apps/apps.pug',
+      require('./apps.pug')
     )
   }])
   .controller('AppsCtrl', require('./apps-controller'))
diff --git a/res/app/control-panes/dashboard/clipboard/clipboard.jade b/res/app/control-panes/dashboard/clipboard/clipboard.pug
similarity index 100%
rename from res/app/control-panes/dashboard/clipboard/clipboard.jade
rename to res/app/control-panes/dashboard/clipboard/clipboard.pug
diff --git a/res/app/control-panes/dashboard/clipboard/index.js b/res/app/control-panes/dashboard/clipboard/index.js
index d51c363b..ce6fa3d8 100644
--- a/res/app/control-panes/dashboard/clipboard/index.js
+++ b/res/app/control-panes/dashboard/clipboard/index.js
@@ -7,8 +7,8 @@ module.exports = angular.module('stf.clipboard', [
   require('gettext').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/clipboard/clipboard.jade',
-      require('./clipboard.jade')
+    $templateCache.put('control-panes/dashboard/clipboard/clipboard.pug',
+      require('./clipboard.pug')
     )
   }])
   .controller('ClipboardCtrl', require('./clipboard-controller'))
diff --git a/res/app/control-panes/dashboard/dashboard.jade b/res/app/control-panes/dashboard/dashboard.pug
similarity index 57%
rename from res/app/control-panes/dashboard/dashboard.jade
rename to res/app/control-panes/dashboard/dashboard.pug
index ae38fd2f..a28bea7d 100644
--- a/res/app/control-panes/dashboard/dashboard.jade
+++ b/res/app/control-panes/dashboard/dashboard.pug
@@ -1,16 +1,16 @@
 .row
   .col-md-6
-    div(ng-include='"control-panes/dashboard/navigation/navigation.jade"')
+    div(ng-include='"control-panes/dashboard/navigation/navigation.pug"')
   .col-md-6
-    div(ng-include='"control-panes/dashboard/clipboard/clipboard.jade"')
+    div(ng-include='"control-panes/dashboard/clipboard/clipboard.pug"')
 
 .row
   .col-md-6
-    div(ng-include='"control-panes/dashboard/install/install.jade"')
+    div(ng-include='"control-panes/dashboard/install/install.pug"')
   .col-md-6(ng-if='$root.platform == "native"')
-    div(ng-include='"control-panes/dashboard/shell/shell.jade"')
+    div(ng-include='"control-panes/dashboard/shell/shell.pug"')
 .row
   .col-md-6
-    div(ng-include='"control-panes/dashboard/apps/apps.jade"')
+    div(ng-include='"control-panes/dashboard/apps/apps.pug"')
   .col-md-6
-    div(ng-include='"control-panes/advanced/remote-debug/remote-debug.jade"')
+    div(ng-include='"control-panes/advanced/remote-debug/remote-debug.pug"')
diff --git a/res/app/control-panes/dashboard/index.js b/res/app/control-panes/dashboard/index.js
index 4ee62e6f..c6a71413 100644
--- a/res/app/control-panes/dashboard/index.js
+++ b/res/app/control-panes/dashboard/index.js
@@ -8,8 +8,8 @@ module.exports = angular.module('stf.dashboard', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/dashboard/dashboard.jade'
-      , require('./dashboard.jade')
+      'control-panes/dashboard/dashboard.pug'
+      , require('./dashboard.pug')
     )
   }])
   .controller('DashboardCtrl', require('./dashboard-controller'))
diff --git a/res/app/control-panes/dashboard/install/activities/activities.jade b/res/app/control-panes/dashboard/install/activities/activities.pug
similarity index 100%
rename from res/app/control-panes/dashboard/install/activities/activities.jade
rename to res/app/control-panes/dashboard/install/activities/activities.pug
diff --git a/res/app/control-panes/dashboard/install/activities/index.js b/res/app/control-panes/dashboard/install/activities/index.js
index 490414a2..f04f7d9a 100644
--- a/res/app/control-panes/dashboard/install/activities/index.js
+++ b/res/app/control-panes/dashboard/install/activities/index.js
@@ -5,8 +5,8 @@ module.exports = angular.module('stf.activities', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/dashboard/install/activities/activities.jade',
-      require('./activities.jade')
+      'control-panes/dashboard/install/activities/activities.pug',
+      require('./activities.pug')
     )
   }])
   .controller('ActivitiesCtrl', require('./activities-controller'))
diff --git a/res/app/control-panes/dashboard/install/index.js b/res/app/control-panes/dashboard/install/index.js
index b5ebb85a..4ebc2609 100644
--- a/res/app/control-panes/dashboard/install/index.js
+++ b/res/app/control-panes/dashboard/install/index.js
@@ -11,8 +11,8 @@ module.exports = angular.module('stf.install', [
   require('stf/upload').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/install/install.jade',
-      require('./install.jade')
+    $templateCache.put('control-panes/dashboard/install/install.pug',
+      require('./install.pug')
     )
   }])
   .controller('InstallCtrl', require('./install-controller'))
diff --git a/res/app/control-panes/dashboard/install/install.jade b/res/app/control-panes/dashboard/install/install.pug
similarity index 99%
rename from res/app/control-panes/dashboard/install/install.jade
rename to res/app/control-panes/dashboard/install/install.pug
index d724f0c9..6eb0ff76 100644
--- a/res/app/control-panes/dashboard/install/install.jade
+++ b/res/app/control-panes/dashboard/install/install.pug
@@ -51,7 +51,7 @@
                   ng-click='uninstall(installation.manifest.package)', ng-show='installation.success')
                     i.fa.fa-trash-o
                     span(translate) Uninstall
-                div(ng-include='"control-panes/dashboard/install/activities/activities.jade"')
+                div(ng-include='"control-panes/dashboard/install/activities/activities.pug"')
                 button.btn.btn-sm.btn-primary-outline(uib-btn-checkbox, ng-model='showManifest')
                   i.fa.fa-list
                   span(ng-if='showManifest') Hide Manifest
diff --git a/res/app/control-panes/dashboard/navigation/index.js b/res/app/control-panes/dashboard/navigation/index.js
index db2068b1..c96546af 100644
--- a/res/app/control-panes/dashboard/navigation/index.js
+++ b/res/app/control-panes/dashboard/navigation/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.navigation', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/navigation/navigation.jade',
-      require('./navigation.jade')
+    $templateCache.put('control-panes/dashboard/navigation/navigation.pug',
+      require('./navigation.pug')
     )
   }])
   .controller('NavigationCtrl', require('./navigation-controller'))
diff --git a/res/app/control-panes/dashboard/navigation/navigation.jade b/res/app/control-panes/dashboard/navigation/navigation.pug
similarity index 100%
rename from res/app/control-panes/dashboard/navigation/navigation.jade
rename to res/app/control-panes/dashboard/navigation/navigation.pug
diff --git a/res/app/control-panes/dashboard/remote-debug/index.js b/res/app/control-panes/dashboard/remote-debug/index.js
index 907ea5d7..cf189eed 100644
--- a/res/app/control-panes/dashboard/remote-debug/index.js
+++ b/res/app/control-panes/dashboard/remote-debug/index.js
@@ -5,8 +5,8 @@ module.exports = angular.module('stf.remote-debug', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/advanced/remote-debug/remote-debug.jade',
-      require('./remote-debug.jade')
+      'control-panes/advanced/remote-debug/remote-debug.pug',
+      require('./remote-debug.pug')
     )
   }])
   .controller('RemoteDebugCtrl', require('./remote-debug-controller'))
diff --git a/res/app/control-panes/dashboard/remote-debug/remote-debug.jade b/res/app/control-panes/dashboard/remote-debug/remote-debug.pug
similarity index 100%
rename from res/app/control-panes/dashboard/remote-debug/remote-debug.jade
rename to res/app/control-panes/dashboard/remote-debug/remote-debug.pug
diff --git a/res/app/control-panes/dashboard/shell/index.js b/res/app/control-panes/dashboard/shell/index.js
index 6570c3ac..a25039ed 100644
--- a/res/app/control-panes/dashboard/shell/index.js
+++ b/res/app/control-panes/dashboard/shell/index.js
@@ -5,8 +5,8 @@ module.exports = angular.module('stf.shell', [
   require('gettext').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/shell/shell.jade',
-      require('./shell.jade')
+    $templateCache.put('control-panes/dashboard/shell/shell.pug',
+      require('./shell.pug')
     )
   }])
   .controller('ShellCtrl', require('./shell-controller'))
diff --git a/res/app/control-panes/dashboard/shell/shell.jade b/res/app/control-panes/dashboard/shell/shell.pug
similarity index 100%
rename from res/app/control-panes/dashboard/shell/shell.jade
rename to res/app/control-panes/dashboard/shell/shell.pug
diff --git a/res/app/control-panes/device-control/device-control-standalone.jade b/res/app/control-panes/device-control/device-control-standalone.pug
similarity index 100%
rename from res/app/control-panes/device-control/device-control-standalone.jade
rename to res/app/control-panes/device-control/device-control-standalone.pug
diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.pug
similarity index 100%
rename from res/app/control-panes/device-control/device-control.jade
rename to res/app/control-panes/device-control/device-control.pug
diff --git a/res/app/control-panes/device-control/index.js b/res/app/control-panes/device-control/index.js
index 6fb3e3ec..b69dee9b 100644
--- a/res/app/control-panes/device-control/index.js
+++ b/res/app/control-panes/device-control/index.js
@@ -8,11 +8,11 @@ module.exports = angular.module('device-control', [
   require('stf/device-context-menu').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/device-control/device-control.jade',
-      require('./device-control.jade')
+    $templateCache.put('control-panes/device-control/device-control.pug',
+      require('./device-control.pug')
     )
-    $templateCache.put('control-panes/device-control/device-control-standalone.jade',
-      require('./device-control-standalone.jade')
+    $templateCache.put('control-panes/device-control/device-control-standalone.pug',
+      require('./device-control-standalone.pug')
     )
   }])
   .controller('DeviceControlCtrl', require('./device-control-controller'))
diff --git a/res/app/control-panes/explorer/explorer.jade b/res/app/control-panes/explorer/explorer.pug
similarity index 100%
rename from res/app/control-panes/explorer/explorer.jade
rename to res/app/control-panes/explorer/explorer.pug
diff --git a/res/app/control-panes/explorer/index.js b/res/app/control-panes/explorer/index.js
index 4a275cd7..4d1525fe 100644
--- a/res/app/control-panes/explorer/index.js
+++ b/res/app/control-panes/explorer/index.js
@@ -2,8 +2,8 @@ require('./explorer.css')
 
 module.exports = angular.module('stf.explorer', [])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/explorer/explorer.jade',
-      require('./explorer.jade')
+    $templateCache.put('control-panes/explorer/explorer.pug',
+      require('./explorer.pug')
     )
   }])
   .filter('formatPermissionMode', function() {
diff --git a/res/app/control-panes/index.js b/res/app/control-panes/index.js
index 70fa134c..bf181513 100644
--- a/res/app/control-panes/index.js
+++ b/res/app/control-panes/index.js
@@ -24,7 +24,7 @@ module.exports = angular.module('control-panes', [
         controller: 'ControlPanesNoDeviceController'
       })
       .when('/control/:serial', {
-        template: require('./control-panes.jade'),
+        template: require('./control-panes.pug'),
         controller: 'ControlPanesCtrl'
         // TODO: Move device inviting to resolve
         //resolve: {
@@ -34,7 +34,7 @@ module.exports = angular.module('control-panes', [
       })
       // TODO: add standalone
       .when('/c/:serial', {
-        template: require('./control-panes.jade'),
+        template: require('./control-panes.pug'),
         controller: 'ControlPanesCtrl'
       })
   }])
diff --git a/res/app/control-panes/info/index.js b/res/app/control-panes/info/index.js
index 26c9a5a2..8608c689 100644
--- a/res/app/control-panes/info/index.js
+++ b/res/app/control-panes/info/index.js
@@ -5,8 +5,8 @@ module.exports = angular.module('stf.info', [
   require('stf/common-ui/modals/lightbox-image').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/info/info.jade',
-      require('./info.jade')
+    $templateCache.put('control-panes/info/info.pug',
+      require('./info.pug')
     )
   }])
   .controller('InfoCtrl', require('./info-controller'))
diff --git a/res/app/control-panes/info/info.jade b/res/app/control-panes/info/info.pug
similarity index 100%
rename from res/app/control-panes/info/info.jade
rename to res/app/control-panes/info/info.pug
diff --git a/res/app/control-panes/inspect/index.js b/res/app/control-panes/inspect/index.js
index e604b0e0..6495fb85 100644
--- a/res/app/control-panes/inspect/index.js
+++ b/res/app/control-panes/inspect/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.inspect', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/inspect/inspect.jade',
-      require('./inspect.jade')
+    $templateCache.put('control-panes/inspect/inspect.pug',
+      require('./inspect.pug')
     )
   }])
   .controller('InspectCtrl', require('./inspect-controller'))
diff --git a/res/app/control-panes/inspect/inspect.jade b/res/app/control-panes/inspect/inspect.pug
similarity index 100%
rename from res/app/control-panes/inspect/inspect.jade
rename to res/app/control-panes/inspect/inspect.pug
diff --git a/res/app/control-panes/logs/index.js b/res/app/control-panes/logs/index.js
index e8cc0d70..853f296e 100644
--- a/res/app/control-panes/logs/index.js
+++ b/res/app/control-panes/logs/index.js
@@ -5,8 +5,8 @@ module.exports = angular.module('stf.logs', [
   require('stf/logcat-table').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/logs/logs.jade',
-      require('./logs.jade')
+    $templateCache.put('control-panes/logs/logs.pug',
+      require('./logs.pug')
     )
   }])
   .controller('LogsCtrl', require('./logs-controller'))
diff --git a/res/app/control-panes/logs/logs.jade b/res/app/control-panes/logs/logs.pug
similarity index 100%
rename from res/app/control-panes/logs/logs.jade
rename to res/app/control-panes/logs/logs.pug
diff --git a/res/app/control-panes/performance/cpu/cpu.jade b/res/app/control-panes/performance/cpu/cpu.pug
similarity index 100%
rename from res/app/control-panes/performance/cpu/cpu.jade
rename to res/app/control-panes/performance/cpu/cpu.pug
diff --git a/res/app/control-panes/performance/cpu/index.js b/res/app/control-panes/performance/cpu/index.js
index 2751bbf5..f68c3ec1 100644
--- a/res/app/control-panes/performance/cpu/index.js
+++ b/res/app/control-panes/performance/cpu/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.cpu', [
   require('epoch').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/performance/cpu/cpu.jade',
-      require('./cpu.jade')
+    $templateCache.put('control-panes/performance/cpu/cpu.pug',
+      require('./cpu.pug')
     )
   }])
   .controller('CpuCtrl', require('./cpu-controller'))
diff --git a/res/app/control-panes/performance/index.js b/res/app/control-panes/performance/index.js
index ffb58295..4e4f2df7 100644
--- a/res/app/control-panes/performance/index.js
+++ b/res/app/control-panes/performance/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.performance', [
   require('./cpu').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/performance/performance.jade',
-      require('./performance.jade')
+    $templateCache.put('control-panes/performance/performance.pug',
+      require('./performance.pug')
     )
   }])
   .controller('PerformanceCtrl', require('./performance-controller'))
diff --git a/res/app/control-panes/performance/performance.jade b/res/app/control-panes/performance/performance.jade
deleted file mode 100644
index 31e58bc1..00000000
--- a/res/app/control-panes/performance/performance.jade
+++ /dev/null
@@ -1,3 +0,0 @@
-.row
-  .col-md-12
-    div(ng-include='"control-panes/performance/cpu/cpu.jade"')
diff --git a/res/app/control-panes/performance/performance.pug b/res/app/control-panes/performance/performance.pug
new file mode 100644
index 00000000..6e001cdf
--- /dev/null
+++ b/res/app/control-panes/performance/performance.pug
@@ -0,0 +1,3 @@
+.row
+  .col-md-12
+    div(ng-include='"control-panes/performance/cpu/cpu.pug"')
diff --git a/res/app/control-panes/resources/index.js b/res/app/control-panes/resources/index.js
index b28c3491..165348d1 100644
--- a/res/app/control-panes/resources/index.js
+++ b/res/app/control-panes/resources/index.js
@@ -4,8 +4,8 @@ module.exports = angular.module('stf.resources', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/resources/resources.jade',
-      require('./resources.jade')
+    $templateCache.put('control-panes/resources/resources.pug',
+      require('./resources.pug')
     )
   }])
   .controller('ResourcesCtrl', require('./resources-controller'))
diff --git a/res/app/control-panes/resources/resources.jade b/res/app/control-panes/resources/resources.pug
similarity index 100%
rename from res/app/control-panes/resources/resources.jade
rename to res/app/control-panes/resources/resources.pug
diff --git a/res/app/control-panes/screenshots/index.js b/res/app/control-panes/screenshots/index.js
index 6c4d9864..a2367fd7 100644
--- a/res/app/control-panes/screenshots/index.js
+++ b/res/app/control-panes/screenshots/index.js
@@ -5,8 +5,8 @@ module.exports = angular.module('stf.screenshots', [
   require('stf/settings').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/screenshots/screenshots.jade',
-      require('./screenshots.jade')
+    $templateCache.put('control-panes/screenshots/screenshots.pug',
+      require('./screenshots.pug')
     )
   }])
   .controller('ScreenshotsCtrl', require('./screenshots-controller'))
diff --git a/res/app/control-panes/screenshots/screenshots.jade b/res/app/control-panes/screenshots/screenshots.pug
similarity index 100%
rename from res/app/control-panes/screenshots/screenshots.jade
rename to res/app/control-panes/screenshots/screenshots.pug
diff --git a/res/app/device-list/details/device-list-details-directive.js b/res/app/device-list/details/device-list-details-directive.js
index 4a6c8c34..2c77b9ca 100644
--- a/res/app/device-list/details/device-list-details-directive.js
+++ b/res/app/device-list/details/device-list-details-directive.js
@@ -13,7 +13,7 @@ module.exports = function DeviceListDetailsDirective(
 ) {
   return {
     restrict: 'E'
-  , template: require('./device-list-details.jade')
+  , template: require('./device-list-details.pug')
   , scope: {
       tracker: '&tracker'
     , columns: '&columns'
diff --git a/res/app/device-list/details/device-list-details.jade b/res/app/device-list/details/device-list-details.pug
similarity index 100%
rename from res/app/device-list/details/device-list-details.jade
rename to res/app/device-list/details/device-list-details.pug
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.pug
similarity index 100%
rename from res/app/device-list/device-list.jade
rename to res/app/device-list/device-list.pug
diff --git a/res/app/device-list/empty/device-list-empty-directive.js b/res/app/device-list/empty/device-list-empty-directive.js
index 3cd40dd9..21fd7bb9 100644
--- a/res/app/device-list/empty/device-list-empty-directive.js
+++ b/res/app/device-list/empty/device-list-empty-directive.js
@@ -1,7 +1,7 @@
 module.exports = function DeviceListEmptyDirective() {
   return {
     restrict: 'E'
-  , template: require('./device-list-empty.jade')
+  , template: require('./device-list-empty.pug')
   , scope: {
       tracker: '&tracker'
     }
diff --git a/res/app/device-list/empty/device-list-empty.jade b/res/app/device-list/empty/device-list-empty.pug
similarity index 100%
rename from res/app/device-list/empty/device-list-empty.jade
rename to res/app/device-list/empty/device-list-empty.pug
diff --git a/res/app/device-list/icons/device-list-icons-directive.js b/res/app/device-list/icons/device-list-icons-directive.js
index 1e3d50eb..f77bc16c 100644
--- a/res/app/device-list/icons/device-list-icons-directive.js
+++ b/res/app/device-list/icons/device-list-icons-directive.js
@@ -98,7 +98,7 @@ module.exports = function DeviceListIconsDirective(
 
   return {
     restrict: 'E'
-  , template: require('./device-list-icons.jade')
+  , template: require('./device-list-icons.pug')
   , scope: {
       tracker: '&tracker'
     , columns: '&columns'
diff --git a/res/app/device-list/icons/device-list-icons.jade b/res/app/device-list/icons/device-list-icons.pug
similarity index 100%
rename from res/app/device-list/icons/device-list-icons.jade
rename to res/app/device-list/icons/device-list-icons.pug
diff --git a/res/app/device-list/index.js b/res/app/device-list/index.js
index 6aa53155..78ffa354 100644
--- a/res/app/device-list/index.js
+++ b/res/app/device-list/index.js
@@ -18,7 +18,7 @@ module.exports = angular.module('device-list', [
   .config(['$routeProvider', function($routeProvider) {
     $routeProvider
       .when('/devices', {
-        template: require('./device-list.jade'),
+        template: require('./device-list.pug'),
         controller: 'DeviceListCtrl'
       })
   }])
diff --git a/res/app/device-list/stats/device-list-stats-directive.js b/res/app/device-list/stats/device-list-stats-directive.js
index 94ac6c63..bd8c6f6c 100644
--- a/res/app/device-list/stats/device-list-stats-directive.js
+++ b/res/app/device-list/stats/device-list-stats-directive.js
@@ -3,7 +3,7 @@ module.exports = function DeviceListStatsDirective(
 ) {
   return {
     restrict: 'E'
-  , template: require('./device-list-stats.jade')
+  , template: require('./device-list-stats.pug')
   , scope: {
       tracker: '&tracker'
     }
diff --git a/res/app/device-list/stats/device-list-stats.jade b/res/app/device-list/stats/device-list-stats.pug
similarity index 100%
rename from res/app/device-list/stats/device-list-stats.jade
rename to res/app/device-list/stats/device-list-stats.pug
diff --git a/res/app/menu/index.js b/res/app/menu/index.js
index f7667b49..89f72ea5 100644
--- a/res/app/menu/index.js
+++ b/res/app/menu/index.js
@@ -8,5 +8,5 @@ module.exports = angular.module('stf.menu', [
 ])
   .controller('MenuCtrl', require('./menu-controller'))
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('menu.jade', require('./menu.jade'))
+    $templateCache.put('menu.pug', require('./menu.pug'))
   }])
diff --git a/res/app/menu/menu.jade b/res/app/menu/menu.pug
similarity index 100%
rename from res/app/menu/menu.jade
rename to res/app/menu/menu.pug
diff --git a/res/app/settings/general/general.jade b/res/app/settings/general/general.jade
deleted file mode 100644
index d2f5fc5c..00000000
--- a/res/app/settings/general/general.jade
+++ /dev/null
@@ -1,5 +0,0 @@
-.row
-  .col-md-6
-    div(ng-include='"settings/general/local/local-settings.jade"')
-  .col-md-6
-    div(ng-include='"settings/general/language/language.jade"')
diff --git a/res/app/settings/general/general.pug b/res/app/settings/general/general.pug
new file mode 100644
index 00000000..26a26a96
--- /dev/null
+++ b/res/app/settings/general/general.pug
@@ -0,0 +1,5 @@
+.row
+  .col-md-6
+    div(ng-include='"settings/general/local/local-settings.pug"')
+  .col-md-6
+    div(ng-include='"settings/general/language/language.pug"')
diff --git a/res/app/settings/general/index.js b/res/app/settings/general/index.js
index 5f27cf2d..f2df94da 100644
--- a/res/app/settings/general/index.js
+++ b/res/app/settings/general/index.js
@@ -6,8 +6,8 @@ module.exports = angular.module('stf.settings.general', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'settings/general/general.jade'
-      , require('./general.jade')
+      'settings/general/general.pug'
+      , require('./general.pug')
     )
   }])
   .controller('GeneralCtrl', require('./general-controller'))
diff --git a/res/app/settings/general/language/index.js b/res/app/settings/general/language/index.js
index eb3d9f6d..e35505cb 100644
--- a/res/app/settings/general/language/index.js
+++ b/res/app/settings/general/language/index.js
@@ -4,7 +4,7 @@ module.exports = angular.module('stf-ui-language', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'settings/general/language/language.jade', require('./language.jade')
+      'settings/general/language/language.pug', require('./language.pug')
     )
   }])
   .controller('LanguageCtrl', require('./language-controller'))
diff --git a/res/app/settings/general/language/language.jade b/res/app/settings/general/language/language.pug
similarity index 100%
rename from res/app/settings/general/language/language.jade
rename to res/app/settings/general/language/language.pug
diff --git a/res/app/settings/general/local/index.js b/res/app/settings/general/local/index.js
index c6b1b784..037dba54 100644
--- a/res/app/settings/general/local/index.js
+++ b/res/app/settings/general/local/index.js
@@ -7,8 +7,8 @@ module.exports = angular.module('ui-local-settings', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'settings/general/local/local-settings.jade'
-    , require('./local-settings.jade')
+      'settings/general/local/local-settings.pug'
+    , require('./local-settings.pug')
     )
   }])
   .controller('LocalSettingsCtrl', require('./local-settings-controller'))
diff --git a/res/app/settings/general/local/local-settings.jade b/res/app/settings/general/local/local-settings.pug
similarity index 100%
rename from res/app/settings/general/local/local-settings.jade
rename to res/app/settings/general/local/local-settings.pug
diff --git a/res/app/settings/index.js b/res/app/settings/index.js
index a0f48275..8fc74525 100644
--- a/res/app/settings/index.js
+++ b/res/app/settings/index.js
@@ -6,7 +6,7 @@ module.exports = angular.module('ui-settings', [
 ])
   .config(['$routeProvider', function($routeProvider) {
     $routeProvider.when('/settings', {
-      template: require('./settings.jade')
+      template: require('./settings.pug')
     })
   }])
   .controller('SettingsCtrl', require('./settings-controller'))
diff --git a/res/app/settings/keys/access-tokens/access-tokens.jade b/res/app/settings/keys/access-tokens/access-tokens.pug
similarity index 100%
rename from res/app/settings/keys/access-tokens/access-tokens.jade
rename to res/app/settings/keys/access-tokens/access-tokens.pug
diff --git a/res/app/settings/keys/access-tokens/index.js b/res/app/settings/keys/access-tokens/index.js
index 4b82a46a..5e5b7a65 100644
--- a/res/app/settings/keys/access-tokens/index.js
+++ b/res/app/settings/keys/access-tokens/index.js
@@ -7,7 +7,7 @@ module.exports = angular.module('stf.settings.keys.access-tokens', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'settings/keys/access-tokens/access-tokens.jade', require('./access-tokens.jade')
+      'settings/keys/access-tokens/access-tokens.pug', require('./access-tokens.pug')
     )
   }])
   .controller('AccessTokensCtrl', require('./access-tokens-controller'))
diff --git a/res/app/settings/keys/adb-keys/adb-keys.jade b/res/app/settings/keys/adb-keys/adb-keys.pug
similarity index 100%
rename from res/app/settings/keys/adb-keys/adb-keys.jade
rename to res/app/settings/keys/adb-keys/adb-keys.pug
diff --git a/res/app/settings/keys/adb-keys/index.js b/res/app/settings/keys/adb-keys/index.js
index 1b904be1..49877d98 100644
--- a/res/app/settings/keys/adb-keys/index.js
+++ b/res/app/settings/keys/adb-keys/index.js
@@ -6,7 +6,7 @@ module.exports = angular.module('stf.settings.keys.adb-keys', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'settings/keys/adb-keys/adb-keys.jade', require('./adb-keys.jade')
+      'settings/keys/adb-keys/adb-keys.pug', require('./adb-keys.pug')
     )
   }])
   .controller('AdbKeysCtrl', require('./adb-keys-controller'))
diff --git a/res/app/settings/keys/index.js b/res/app/settings/keys/index.js
index 066293c0..8b41bfee 100644
--- a/res/app/settings/keys/index.js
+++ b/res/app/settings/keys/index.js
@@ -6,7 +6,7 @@ module.exports = angular.module('stf.settings.keys', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'settings/keys/keys.jade', require('./keys.jade')
+      'settings/keys/keys.pug', require('./keys.pug')
     )
   }])
   .controller('KeysCtrl', require('./keys-controller'))
diff --git a/res/app/settings/keys/keys.jade b/res/app/settings/keys/keys.jade
deleted file mode 100644
index a5e4ac85..00000000
--- a/res/app/settings/keys/keys.jade
+++ /dev/null
@@ -1,5 +0,0 @@
-.row
-  .col-md-6
-    div(ng-include='"settings/keys/access-tokens/access-tokens.jade"')
-  .col-md-6
-    div(ng-include='"settings/keys/adb-keys/adb-keys.jade"')
diff --git a/res/app/settings/keys/keys.pug b/res/app/settings/keys/keys.pug
new file mode 100644
index 00000000..9797a17b
--- /dev/null
+++ b/res/app/settings/keys/keys.pug
@@ -0,0 +1,5 @@
+.row
+  .col-md-6
+    div(ng-include='"settings/keys/access-tokens/access-tokens.pug"')
+  .col-md-6
+    div(ng-include='"settings/keys/adb-keys/adb-keys.pug"')
diff --git a/res/app/settings/notifications/index.js b/res/app/settings/notifications/index.js
index a28d4ce6..8eff1634 100644
--- a/res/app/settings/notifications/index.js
+++ b/res/app/settings/notifications/index.js
@@ -3,8 +3,8 @@ module.exports = angular.module('settings-notifications', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'settings/notifications/notifications.jade'
-    , require('./notifications.jade')
+      'settings/notifications/notifications.pug'
+    , require('./notifications.pug')
     )
   }])
   .factory('NotificationsService', require('./notifications-service'))
diff --git a/res/app/settings/notifications/notifications.jade b/res/app/settings/notifications/notifications.pug
similarity index 100%
rename from res/app/settings/notifications/notifications.jade
rename to res/app/settings/notifications/notifications.pug
diff --git a/res/app/settings/settings-controller.js b/res/app/settings/settings-controller.js
index 7dd306e9..d157fc12 100644
--- a/res/app/settings/settings-controller.js
+++ b/res/app/settings/settings-controller.js
@@ -4,12 +4,12 @@ module.exports = function SettingsCtrl($scope, gettext) {
     {
       title: gettext('General'),
       icon: 'fa-gears fa-fw',
-      templateUrl: 'settings/general/general.jade'
+      templateUrl: 'settings/general/general.pug'
     },
     {
       title: gettext('Keys'),
       icon: 'fa-key fa-fw',
-      templateUrl: 'settings/keys/keys.jade'
+      templateUrl: 'settings/keys/keys.pug'
     }
   ]
 }
diff --git a/res/app/settings/settings.jade b/res/app/settings/settings.pug
similarity index 100%
rename from res/app/settings/settings.jade
rename to res/app/settings/settings.pug
diff --git a/res/app/user/index.js b/res/app/user/index.js
index d8413e3f..3a3b6aa2 100644
--- a/res/app/user/index.js
+++ b/res/app/user/index.js
@@ -3,7 +3,7 @@ module.exports = angular.module('stf.user-profile', [])
 
     $routeProvider
       .when('/user/:user*', {
-        template: require('./user.jade')
+        template: require('./user.pug')
       })
   })
   .controller('UserProfileCtrl', require('./user-controller'))
diff --git a/res/app/user/user.jade b/res/app/user/user.pug
similarity index 100%
rename from res/app/user/user.jade
rename to res/app/user/user.pug
diff --git a/res/app/views/docs.jade b/res/app/views/docs.pug
similarity index 100%
rename from res/app/views/docs.jade
rename to res/app/views/docs.pug
diff --git a/res/app/views/index.jade b/res/app/views/index.pug
similarity index 97%
rename from res/app/views/index.jade
rename to res/app/views/index.pug
index 71a565d0..f9b54404 100644
--- a/res/app/views/index.jade
+++ b/res/app/views/index.pug
@@ -19,7 +19,7 @@ html(ng-app='app')
           pane-size='{{!$root.basicMode && !$root.standalone ? 44 : 0 }}px',
 
           pane-handle='')
-          div(ng-include='"menu.jade"')
+          div(ng-include='"menu.pug"')
 
         .pane-center(fa-pane, pane-id='main', pane-anchor='center').fill-height
           socket-state
diff --git a/res/auth/ldap/scripts/signin/index.js b/res/auth/ldap/scripts/signin/index.js
index 3f142bc9..0e6d9fde 100644
--- a/res/auth/ldap/scripts/signin/index.js
+++ b/res/auth/ldap/scripts/signin/index.js
@@ -4,7 +4,7 @@ module.exports = angular.module('stf.signin', [])
   .config(function($routeProvider) {
     $routeProvider
       .when('/auth/ldap/', {
-        template: require('./signin.jade')
+        template: require('./signin.pug')
       })
   })
   .controller('SignInCtrl', require('./signin-controller'))
diff --git a/res/auth/ldap/scripts/signin/signin.jade b/res/auth/ldap/scripts/signin/signin.pug
similarity index 100%
rename from res/auth/ldap/scripts/signin/signin.jade
rename to res/auth/ldap/scripts/signin/signin.pug
diff --git a/res/auth/ldap/views/index.jade b/res/auth/ldap/views/index.pug
similarity index 100%
rename from res/auth/ldap/views/index.jade
rename to res/auth/ldap/views/index.pug
diff --git a/res/auth/mock/scripts/signin/index.js b/res/auth/mock/scripts/signin/index.js
index 929fc3b6..2f5afe3c 100644
--- a/res/auth/mock/scripts/signin/index.js
+++ b/res/auth/mock/scripts/signin/index.js
@@ -4,7 +4,7 @@ module.exports = angular.module('stf.signin', [])
   .config(function($routeProvider) {
     $routeProvider
       .when('/auth/mock/', {
-        template: require('./signin.jade')
+        template: require('./signin.pug')
       })
   })
   .controller('SignInCtrl', require('./signin-controller'))
diff --git a/res/auth/mock/scripts/signin/signin.jade b/res/auth/mock/scripts/signin/signin.pug
similarity index 100%
rename from res/auth/mock/scripts/signin/signin.jade
rename to res/auth/mock/scripts/signin/signin.pug
diff --git a/res/auth/mock/views/index.jade b/res/auth/mock/views/index.pug
similarity index 100%
rename from res/auth/mock/views/index.jade
rename to res/auth/mock/views/index.pug
diff --git a/res/common/status/views/404.jade b/res/common/status/views/404.pug
similarity index 100%
rename from res/common/status/views/404.jade
rename to res/common/status/views/404.pug
diff --git a/res/common/status/views/maintenance.jade b/res/common/status/views/maintenance.pug
similarity index 100%
rename from res/common/status/views/maintenance.jade
rename to res/common/status/views/maintenance.pug
diff --git a/res/common/status/views/partials/styles.jade b/res/common/status/views/partials/styles.pug
similarity index 100%
rename from res/common/status/views/partials/styles.jade
rename to res/common/status/views/partials/styles.pug
diff --git a/webpack.config.js b/webpack.config.js
index 6e9ae34e..73f4dc18 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -56,7 +56,7 @@ module.exports = {
         , {test: /\.otf/, loader: 'url?limit=1&mimetype=application/font-woff'}
         , {test: /\.ttf/, loader: 'url?limit=1&mimetype=application/font-woff'}
         , {test: /\.eot/, loader: 'url?limit=1&mimetype=vnd.ms-fontobject'}
-        , {test: /\.jade$/, loader: 'template-html-loader'}
+        , {test: /\.pug$/, loader: 'template-html-loader'}
         , {test: /\.html$/, loader: 'html-loader'}
         , {test: /angular\.js$/, loader: 'exports?angular'}
         , {test: /angular-cookies\.js$/, loader: 'imports?angular=angular'}