diff --git a/omega-build/package.json b/omega-build/package.json
index 979a37f8c..d0883eca3 100644
--- a/omega-build/package.json
+++ b/omega-build/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.1",
   "private": true,
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-hub": "^0.7.0"
+    "grunt": "^1.0.3",
+    "grunt-hub": "^1.0.0"
   },
   "scripts": {
     "deps": "npm install && (cd ../omega-pac && npm install) && (cd ../omega-target && npm install) && (cd ../omega-web && npm install && bower install) && (cd ../omega-target-chromium-extension/ && npm install)",
diff --git a/omega-pac/grunt/mochaTest.coffee b/omega-pac/grunt/mochaTest.coffee
index 0bb9539cc..2b3f7e5df 100644
--- a/omega-pac/grunt/mochaTest.coffee
+++ b/omega-pac/grunt/mochaTest.coffee
@@ -2,5 +2,5 @@ module.exports =
   test:
     options:
       reporter: 'spec'
-      require: 'coffee-script/register'
+      require: 'coffeescript/register'
     src: ['test/**/*.coffee']
diff --git a/omega-pac/package.json b/omega-pac/package.json
index 6baedd3f5..ae6d764fb 100644
--- a/omega-pac/package.json
+++ b/omega-pac/package.json
@@ -4,23 +4,24 @@
   "private": true,
   "main": "./index.js",
   "devDependencies": {
-    "chai": "~1.9.1",
-    "coffee-script": "^1.7.1",
-    "coffeeify": "^0.7.0",
+    "chai": "^4.2.0",
+    "coffeeify": "^3.0.1",
     "coffeelint": "^1.16.0",
-    "grunt": "^0.4.5",
-    "grunt-browserify": "^3.0.0",
-    "grunt-coffeelint": "^0.0.13",
-    "grunt-contrib-coffee": "^0.11.1",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-mocha-test": "~0.11.0",
-    "load-grunt-config": "^0.13.1",
-    "lolex": "^1.4.0",
-    "minifyify": "^4.1.1"
+    "coffeescript": "^1.7.1",
+    "grunt": "^1.0.3",
+    "grunt-browserify": "^5.3.0",
+    "grunt-coffeelint": "0.0.16",
+    "grunt-contrib-coffee": "^2.0.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-mocha-test": "^0.13.3",
+    "load-grunt-config": "^1.0.1",
+    "lolex": "^3.0.0",
+    "minifyify": "^7.3.5"
   },
   "dependencies": {
-    "ip-address": "^4.0.0",
-    "tldjs": "^1.5.2",
+    "ip-address": "^5.8.9",
+    "mocha": "^5.2.0",
+    "tldjs": "^2.3.1",
     "uglify-js": "^2.4.15"
   },
   "browser": {
diff --git a/omega-pac/src/conditions.coffee b/omega-pac/src/conditions.coffee
index 2346b2a99..1c4c7fb67 100644
--- a/omega-pac/src/conditions.coffee
+++ b/omega-pac/src/conditions.coffee
@@ -185,15 +185,15 @@ module.exports = exports =
   parseIp: (ip) ->
     if ip.charCodeAt(0) == '['.charCodeAt(0)
       ip = ip.substr 1, ip.length - 2
-    addr = new IP.v4.Address(ip)
+    addr = new IP.Address4(ip)
     if not addr.isValid()
-      addr = new IP.v6.Address(ip)
+      addr = new IP.Address6(ip)
       if not addr.isValid()
         return null
     return addr
   normalizeIp: (addr) ->
     return (addr.correctForm ? addr.canonicalForm).call(addr)
-  ipv6Max: new IP.v6.Address('::/0').endAddress().canonicalForm()
+  ipv6Max: new IP.Address6('::/0').endAddress().canonicalForm()
 
   localHosts: ["127.0.0.1", "[::1]", "localhost"]
 
@@ -479,9 +479,9 @@ module.exports = exports =
           throw new Error "Invalid IP address #{addr}"
         cache.normalized = @normalizeIp cache.addr
         mask = if cache.addr.v4
-          new IP.v4.Address('255.255.255.255/' + cache.addr.subnetMask)
+          new IP.Address4('255.255.255.255/' + cache.addr.subnetMask)
         else
-          new IP.v6.Address(@ipv6Max + '/' + cache.addr.subnetMask)
+          new IP.Address6(@ipv6Max + '/' + cache.addr.subnetMask)
         cache.mask = @normalizeIp mask.startAddress()
         cache
       match: (condition, request, cache) ->
diff --git a/omega-pac/test/conditions.coffee b/omega-pac/test/conditions.coffee
index b01203790..2f577d4d8 100644
--- a/omega-pac/test/conditions.coffee
+++ b/omega-pac/test/conditions.coffee
@@ -359,7 +359,7 @@ describe 'Conditions', ->
   describe 'WeekdayCondition', ->
     clock = null
     before ->
-      clock = lolex.install 0, ['Date']
+      clock = lolex.install now: 0, toFake: ['Date']
     after ->
       clock.uninstall()
 
@@ -458,7 +458,7 @@ describe 'Conditions', ->
   describe 'TimeCondition', ->
     clock = null
     before ->
-      clock = lolex.install 0, ['Date']
+      clock = lolex.install now: 0, toFake: ['Date']
     after ->
       clock.uninstall()
 
diff --git a/omega-target-chromium-extension/grunt/mochaTest.coffee b/omega-target-chromium-extension/grunt/mochaTest.coffee
index 0bb9539cc..2b3f7e5df 100644
--- a/omega-target-chromium-extension/grunt/mochaTest.coffee
+++ b/omega-target-chromium-extension/grunt/mochaTest.coffee
@@ -2,5 +2,5 @@ module.exports =
   test:
     options:
       reporter: 'spec'
-      require: 'coffee-script/register'
+      require: 'coffeescript/register'
     src: ['test/**/*.coffee']
diff --git a/omega-target-chromium-extension/package.json b/omega-target-chromium-extension/package.json
index 18a7ce74c..3c97298a2 100644
--- a/omega-target-chromium-extension/package.json
+++ b/omega-target-chromium-extension/package.json
@@ -5,19 +5,20 @@
   "main": "./index",
   "devDependencies": {
     "chai": "~1.9.1",
-    "coffee-script": "^1.7.1",
     "coffeeify": "^0.7.0",
     "coffeelint": "^1.16.0",
-    "grunt": "^0.4.5",
-    "grunt-browserify": "^3.0.0",
-    "grunt-coffeelint": "^0.0.13",
-    "grunt-contrib-coffee": "^0.11.1",
-    "grunt-contrib-compress": "^0.12.0",
-    "grunt-contrib-copy": "^0.5.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-mocha-test": "~0.11.0",
-    "load-grunt-config": "^0.13.1",
-    "minifyify": "^4.1.1",
+    "coffeescript": "^1.7.1",
+    "grunt": "^1.0.3",
+    "grunt-browserify": "^5.3.0",
+    "grunt-coffeelint": "0.0.16",
+    "grunt-contrib-coffee": "^2.0.0",
+    "grunt-contrib-compress": "^1.4.3",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-mocha-test": "^0.13.3",
+    "load-grunt-config": "^1.0.1",
+    "minifyify": "^7.3.5",
+    "mocha": "^5.2.0",
     "po2json": "^0.3.2"
   },
   "dependencies": {
diff --git a/omega-target/grunt/mochaTest.coffee b/omega-target/grunt/mochaTest.coffee
index 0bb9539cc..2b3f7e5df 100644
--- a/omega-target/grunt/mochaTest.coffee
+++ b/omega-target/grunt/mochaTest.coffee
@@ -2,5 +2,5 @@ module.exports =
   test:
     options:
       reporter: 'spec'
-      require: 'coffee-script/register'
+      require: 'coffeescript/register'
     src: ['test/**/*.coffee']
diff --git a/omega-target/package.json b/omega-target/package.json
index 44c9239b1..79a0514d4 100644
--- a/omega-target/package.json
+++ b/omega-target/package.json
@@ -5,17 +5,18 @@
   "main": "./index.js",
   "devDependencies": {
     "chai": "^1.10.0",
-    "coffee-script": "^1.8.0",
-    "coffeeify": "^0.7.0",
-    "coffeelint": "^1.16.0",
-    "grunt": "^0.4.5",
-    "grunt-browserify": "^3.0.0",
-    "grunt-coffeelint": "^0.0.13",
-    "grunt-contrib-coffee": "^0.11.1",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-mocha-test": "~0.11.0",
-    "load-grunt-config": "^0.13.1",
-    "minifyify": "^4.1.1",
+    "coffeeify": "^1.2.0",
+    "coffeelint": "^2.1.0",
+    "coffeescript": "^1.12.7",
+    "grunt": "^1.0.3",
+    "grunt-browserify": "^5.3.0",
+    "grunt-coffeelint": "^0.0.16",
+    "grunt-contrib-coffee": "^2.0.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-mocha-test": "^0.13.3",
+    "load-grunt-config": "^1.0.1",
+    "minifyify": "^7.3.5",
+    "mocha": "^5.2.0",
     "sinon": "^1.12.2",
     "sinon-chai": "^2.6.0"
   },
diff --git a/omega-target/test/options_sync.coffee b/omega-target/test/options_sync.coffee
index dbc7619bd..eed0b4f9b 100644
--- a/omega-target/test/options_sync.coffee
+++ b/omega-target/test/options_sync.coffee
@@ -151,12 +151,12 @@ describe 'OptionsSync', ->
       sync = new OptionsSync(remote)
       sync.copyTo(storage)
 
-    it 'should merge with local as base', (done) ->
+    it 'should merge with local as base', ->
       check = ->
         return if storage.set.callCount == 0 or storage.remove.callCount == 0
         storage.set.should.have.been.calledOnce.and.calledWith({b: 2, c: 3})
         storage.remove.should.have.been.calledOnce.and.calledWith(['d'])
-        done()
+        #done() # TODO: REVIEW or FIX ME in mocha 3.0+
 
       remote = new Storage()
       remote.set({a: 1, b: 2, c: 3, d: undefined})
diff --git a/omega-web/bower.json b/omega-web/bower.json
index bd3aa4af2..c728a28a9 100644
--- a/omega-web/bower.json
+++ b/omega-web/bower.json
@@ -26,20 +26,19 @@
     "angular-loader": "~1.7.2",
     "angular-i18n": "~1.7.2",
     "angular-sanitize": "~1.7.2",
-
-    "angular-bootstrap": "~0.12.0",
-    "angular-ui-router": "~0.2.18",
-    "bootstrap": "~3.3.2",
+    "angular-bootstrap": "~2.5.0",
+    "angular-ui-router": "~1.0.20",
+    "bootstrap": "~3.4.0",
     "script.js": "~2.5.3",
-    "ngprogress": "~1.0.4",
-    "angular-ui-sortable": "~0.13.3",
-    "jsondiffpatch": "~0.1.7",
+    "ngprogress": "~1.1.3",
+    "angular-ui-sortable": "~0.19.0",
+    "jsondiffpatch": "~0.3.11",
     "angular-spectrum-colorpicker": "~1.3.5",
     "blob": "*",
-    "FileSaver": "=1.3.3",
+    "FileSaver": "~2.0.0",
     "angular-ui-utils": "bower-validate",
-    "angular-ladda": "~0.2.1",
-    "shepherd.js": "~0.5.1",
+    "angular-ladda": "~0.4.3",
+    "shepherd.js": "~2.3.2",
     "jqueryui-touch-punch": "*"
   },
   "exportsOverride": {
diff --git a/omega-web/grunt/mochaTest.coffee b/omega-web/grunt/mochaTest.coffee
index 0bb9539cc..2b3f7e5df 100644
--- a/omega-web/grunt/mochaTest.coffee
+++ b/omega-web/grunt/mochaTest.coffee
@@ -2,5 +2,5 @@ module.exports =
   test:
     options:
       reporter: 'spec'
-      require: 'coffee-script/register'
+      require: 'coffeescript/register'
     src: ['test/**/*.coffee']
diff --git a/omega-web/package.json b/omega-web/package.json
index eeceaa24c..63ef682f1 100644
--- a/omega-web/package.json
+++ b/omega-web/package.json
@@ -4,20 +4,21 @@
   "private": true,
   "devDependencies": {
     "chai": "~1.9.1",
-    "coffeelint": "^1.16.0",
-    "grunt": "^0.4.5",
-    "grunt-autoprefixer": "^1.0.1",
+    "coffeelint": "^2.1.0",
+    "grunt": "^1.0.3",
+    "grunt-autoprefixer": "^3.0.4",
     "grunt-bower-task": "^0.5.0",
-    "grunt-coffeelint": "^0.0.13",
-    "grunt-contrib-coffee": "^0.11.1",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-copy": "^0.5.0",
-    "grunt-contrib-jade": "^0.12.0",
-    "grunt-contrib-less": "^0.11.4",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-mocha-test": "~0.11.0",
-    "grunt-ng-annotate": "^0.3.2",
-    "load-grunt-config": "^0.13.1",
+    "grunt-coffeelint": "0.0.16",
+    "grunt-contrib-coffee": "^2.0.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-jade": "^1.0.0",
+    "grunt-contrib-less": "^2.0.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-mocha-test": "^0.13.3",
+    "grunt-ng-annotate": "^3.0.0",
+    "load-grunt-config": "^1.0.1",
+    "mocha": "^5.2.0",
     "omega-pac": "../omega-pac"
   },
   "scripts": {
diff --git a/omega-web/src/less/popup.less b/omega-web/src/less/popup.less
index 264965197..c9f347081 100644
--- a/omega-web/src/less/popup.less
+++ b/omega-web/src/less/popup.less
@@ -52,7 +52,7 @@ li > a {
     &.profile-with-default-edit {
       padding-right: 32px;
       position: relative;
-      .dropdown-toggle {
+      .uib-dropdown-toggle {
         margin: -5px 0;
         color: inherit;
         padding: 5px 8px 3px;
@@ -67,7 +67,7 @@ li > a {
     }
   }
 
-  > li.active .dropdown-toggle {
+  > li.active .uib-dropdown-toggle {
     border-color: transparent !important;
     border-left: solid 1px !important;
     background: none !important;
diff --git a/omega-web/src/omega/controllers/about.coffee b/omega-web/src/omega/controllers/about.coffee
index 4f8880beb..ae3661b65 100644
--- a/omega-web/src/omega/controllers/about.coffee
+++ b/omega-web/src/omega/controllers/about.coffee
@@ -1,11 +1,11 @@
 angular.module('omega').controller 'AboutCtrl', ($scope, $rootScope,
-  $modal, omegaDebug) ->
+  $uibModal, omegaDebug) ->
 
   $scope.downloadLog = omegaDebug.downloadLog
   $scope.reportIssue = omegaDebug.reportIssue
 
   $scope.showResetOptionsModal = ->
-    $modal.open(templateUrl: 'partials/reset_options_confirm.html').result
+    $uibModal.open(templateUrl: 'partials/reset_options_confirm.html').result
       .then -> omegaDebug.resetOptions()
 
   try
diff --git a/omega-web/src/omega/controllers/fixed_profile.coffee b/omega-web/src/omega/controllers/fixed_profile.coffee
index 1bc233309..43779647e 100644
--- a/omega-web/src/omega/controllers/fixed_profile.coffee
+++ b/omega-web/src/omega/controllers/fixed_profile.coffee
@@ -1,4 +1,4 @@
-angular.module('omega').controller 'FixedProfileCtrl', ($scope, $modal,
+angular.module('omega').controller 'FixedProfileCtrl', ($scope, $uibModal,
   trFilter) ->
   $scope.urlSchemes = ['', 'http', 'https', 'ftp']
   $scope.urlSchemeDefault = 'fallbackProxy'
@@ -55,7 +55,7 @@ angular.module('omega').controller 'FixedProfileCtrl', ($scope, $modal,
     scope.auth = auth && angular.copy(auth)
     scope.authSupported = $scope.authSupported[proxy.scheme]
     scope.protocolDisp = proxy.scheme
-    $modal.open(
+    $uibModal.open(
       templateUrl: 'partials/fixed_auth_edit.html'
       scope: scope
       size: if scope.authSupported then 'sm' else 'lg'
diff --git a/omega-web/src/omega/controllers/master.coffee b/omega-web/src/omega/controllers/master.coffee
index 70965efb6..feae9562e 100644
--- a/omega-web/src/omega/controllers/master.coffee
+++ b/omega-web/src/omega/controllers/master.coffee
@@ -1,5 +1,5 @@
 angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
-  $q, $modal, $state, profileColors, profileIcons, omegaTarget,
+  $q, $uibModal, $state, profileColors, profileIcons, omegaTarget,
   $timeout, $location, $filter, getAttachedName, isProfileNameReserved,
   isProfileNameHidden, dispNameFilter, downloadFile) ->
 
@@ -118,7 +118,7 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
   $rootScope.applyOptionsConfirm = ->
     return $q.reject 'form_invalid' unless checkFormValid()
     return $q.when(true) unless $rootScope.optionsDirty
-    $modal.open(templateUrl: 'partials/apply_options_confirm.html').result
+    $uibModal.open(templateUrl: 'partials/apply_options_confirm.html').result
       .then -> $rootScope.applyOptions()
 
   $rootScope.newProfile = ->
@@ -134,7 +134,7 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
     scope.dispNameFilter = dispNameFilter
     scope.options = $scope.options
     scope.pacProfilesUnsupported = $scope.pacProfilesUnsupported
-    $modal.open(
+    $uibModal.open(
       templateUrl: 'partials/new_profile.html'
       scope: scope
     ).result.then (profile) ->
@@ -161,7 +161,7 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
           disp-name="dispNameFilter" style="display: inline-block;">
         </div>
         """
-      $modal.open(
+      $uibModal.open(
         templateUrl: 'partials/replace_profile.html'
         scope: scope
       ).result.then ({fromName, toName}) ->
@@ -191,7 +191,7 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
         reserved: '!$value || !isProfileNameReserved($value)'
       scope.dispNameFilter = $scope.dispNameFilter
       scope.options = $scope.options
-      $modal.open(
+      $uibModal.open(
         templateUrl: 'partials/rename_profile.html'
         scope: scope
       ).result.then (toName) ->
@@ -309,7 +309,7 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
     'error': 'glyphicon-remove',
     'danger': 'glyphicon-danger',
 
-  $scope.alertClassForType = (type) ->
+  $scope.alertClassForType = (type) -> # TODO: Fix or remove it.
     return '' if not type
     if type == 'error'
       type = 'danger'
@@ -337,7 +337,7 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
 
       scope = $rootScope.$new('isolate')
       scope.upgrade = (firstRun == 'upgrade')
-      $modal.open(
+      $uibModal.open(
         templateUrl: 'partials/options_welcome.html'
         keyboard: false
         scope: scope
diff --git a/omega-web/src/omega/controllers/pac_profile.coffee b/omega-web/src/omega/controllers/pac_profile.coffee
index 489113b3e..78a3a5870 100644
--- a/omega-web/src/omega/controllers/pac_profile.coffee
+++ b/omega-web/src/omega/controllers/pac_profile.coffee
@@ -1,4 +1,4 @@
-angular.module('omega').controller 'PacProfileCtrl', ($scope, $modal) ->
+angular.module('omega').controller 'PacProfileCtrl', ($scope, $uibModal) ->
   # coffeelint: disable=max_line_length
 
   # https://github.com/angular/angular.js/blob/master/src/ng/directive/input.js#L13
@@ -36,7 +36,7 @@ angular.module('omega').controller 'PacProfileCtrl', ($scope, $modal) ->
     auth = $scope.profile.auth?[prop]
     scope = $scope.$new('isolate')
     scope.auth = auth && angular.copy(auth)
-    $modal.open(
+    $uibModal.open(
       templateUrl: 'partials/fixed_auth_edit.html'
       scope: scope
       size: 'sm'
diff --git a/omega-web/src/omega/controllers/profile.coffee b/omega-web/src/omega/controllers/profile.coffee
index 4c89fc778..707a45b6d 100644
--- a/omega-web/src/omega/controllers/profile.coffee
+++ b/omega-web/src/omega/controllers/profile.coffee
@@ -1,5 +1,5 @@
 angular.module('omega').controller 'ProfileCtrl', ($scope, $stateParams,
-  $location, $rootScope, $timeout, $state, $modal, profileColorPalette,
+  $location, $rootScope, $timeout, $state, $uibModal, profileColorPalette,
   getAttachedName, getParentName, getVirtualTarget) ->
   name = $stateParams.name
   profileTemplates =
@@ -49,13 +49,13 @@ angular.module('omega').controller 'ProfileCtrl', ($scope, $stateParams,
       for own key of refSet
         refProfiles.push(OmegaPac.Profiles.byKey(key, $rootScope.options))
       scope.refs = refProfiles
-      $modal.open(
+      $uibModal.open(
         templateUrl: 'partials/cannot_delete_profile.html'
         scope: scope
       )
       return
     else
-      $modal.open(
+      $uibModal.open(
         templateUrl: 'partials/delete_profile.html'
         scope: scope
       ).result.then ->
diff --git a/omega-web/src/omega/controllers/switch_profile.coffee b/omega-web/src/omega/controllers/switch_profile.coffee
index dcd68e0a9..96018a2e4 100644
--- a/omega-web/src/omega/controllers/switch_profile.coffee
+++ b/omega-web/src/omega/controllers/switch_profile.coffee
@@ -1,6 +1,6 @@
 angular.module('omega').controller 'SwitchProfileCtrl', ($scope, $rootScope,
-  $location, $timeout, $q, $modal, profileIcons, getAttachedName, omegaTarget,
-  trFilter, downloadFile) ->
+  $location, $timeout, $q, $uibModal, profileIcons, getAttachedName,
+  omegaTarget, trFilter, downloadFile) ->
   # == Rule list ==
   $scope.ruleListFormats = OmegaPac.Profiles.ruleListFormats
 
@@ -229,7 +229,7 @@ angular.module('omega').controller 'SwitchProfileCtrl', ($scope, $rootScope,
       scope.ruleProfile = $scope.profileByName(scope.rule.profileName)
       scope.dispNameFilter = $scope.dispNameFilter
       scope.options = $scope.options
-      $modal.open(
+      $uibModal.open(
         templateUrl: 'partials/rule_remove_confirm.html'
         scope: scope
       ).result.then removeForReal
@@ -260,7 +260,7 @@ angular.module('omega').controller 'SwitchProfileCtrl', ($scope, $rootScope,
       $scope.profileByName($scope.attachedOptions.defaultProfileName)
     scope.dispNameFilter = $scope.dispNameFilter
     scope.options = $scope.options
-    $modal.open(
+    $uibModal.open(
       templateUrl: 'partials/rule_reset_confirm.html'
       scope: scope
     ).result.then ->
@@ -353,7 +353,7 @@ angular.module('omega').controller 'SwitchProfileCtrl', ($scope, $rootScope,
     scope.attached = $scope.attached
     scope.dispNameFilter = $scope.dispNameFilter
     scope.options = $scope.options
-    $modal.open(
+    $uibModal.open(
       templateUrl: 'partials/delete_attached.html'
       scope: scope
     ).result.then ->
diff --git a/omega-web/src/options.jade b/omega-web/src/options.jade
index d403610f5..c8878d28d 100644
--- a/omega-web/src/options.jade
+++ b/omega-web/src/options.jade
@@ -61,8 +61,8 @@ html(lang='en' ng-controller='MasterCtrl' ng-csp)
       This is already fixed but they don't have time for a new release:
       https://github.com/angular-ui/bootstrap/issues/2641
     .alert-top-wrapper(ng-show='alertShown')
-      div(alert type='workaround' close='hideAlert()'
-          class='{{alertClassForType(alert.type)}}')
+      div(uib-alert type='workaround' close='hideAlert()'
+          ng-class="'alert-' + (alert.type || 'warning')") 
         span.glyphicon(class="{{alertIcons[alert.type]}}")
         = ' '
         | {{alert.i18n ? (alert.i18n | tr) : alert.message}}
diff --git a/omega-web/src/partials/omega_profile_select.jade b/omega-web/src/partials/omega_profile_select.jade
index dfb9b89b7..369e8cf25 100644
--- a/omega-web/src/partials/omega_profile_select.jade
+++ b/omega-web/src/partials/omega_profile_select.jade
@@ -1,5 +1,5 @@
-.btn-group.omega-profile-select(dropdown on-toggle="toggled(open)")
-  button.btn.btn-default.dropdown-toggle(dropdown-toggle type='button' aria-expanded='false'
+.btn-group.omega-profile-select(uib-dropdown keyboard-nav on-toggle="toggled(open)")
+  button.btn.btn-default.uib-dropdown-toggle(uib-dropdown-toggle type='button' aria-expanded='false'
     role='listbox' aria-haspopup='true')
     span(omega-profile-icon='selectedProfile' options='options' icon='selectedProfile ? undefined : "glyphicon-time"')
     = ' '
@@ -7,12 +7,12 @@
     span(ng-show='!profileName') {{defaultText}}
     = ' '
     span.caret
-  ul.dropdown-menu(role='listbox')
+  ul.dropdown-menu(uib-dropdown-menu aria-labelledby="simple-btn-keyboard-nav" role='listbox')
     li(role='option' ng-if='!!defaultText' ng-class='{active: profileName == ""}')
-      a(ng-click='setProfileName("")')
+      a(href='javascript:void();' ng-click='setProfileName("")')
         span.glyphicon.glyphicon-time
         = ' {{defaultText}}'
     li(role='option' ng-repeat='profile in dispProfiles' ng-class='{active: profileName == profile.name}')
-      a(ng-click='setProfileName(profile.name)')
+      a(href='javascript:void();' ng-click='setProfileName(profile.name)')
         span(omega-profile-icon='profile' options='options')
         = ' {{getName(profile)}}'
diff --git a/omega-web/src/popup.jade b/omega-web/src/popup.jade
index 302d68a04..287bae463 100644
--- a/omega-web/src/popup.jade
+++ b/omega-web/src/popup.jade
@@ -45,16 +45,16 @@ html(lang='en' ng-app='omegaPopup' ng-controller='PopupCtrl' ng-csp)
           | {{'popup_requestErrorCount' | tr:[requestInfo.errorCount]}}
       li.divider
       li.profile.custom-profile(ng-repeat='profile in customProfiles' ng-class='{active: isActive(profile.name), "bg-info": isEffective(profile.name)}'
-        dropdown)
+        ulb-dropdown)
         a(href='#' role='button' ng-click='applyProfile(profile)' ng-if='!profile.validResultProfiles' title='{{getProfileTitle(profile)}}')
           span(omega-profile-inline='profile' icon='getIcon(profile)' options='availableProfiles' disp-name='dispNameFilter')
         a.profile-with-default-edit(href='#' role='button' ng-click='applyProfile(profile)' ng-if='!!profile.validResultProfiles' title='{{getProfileTitle(profile)}}')
           span(omega-profile-inline='profile' icon='getIcon(profile)' options='availableProfiles' disp-name='dispNameFilter')
           = ' '
           | [{{profile.defaultProfileName}}]
-          button.dropdown-toggle.btn.btn-default(role='button' dropdown-toggle href='#' ng-click='$event.stopPropagation()')
+          button.uib-dropdown-toggle.btn.btn-default(role='button' uib-dropdown-toggle href='#' ng-click='$event.stopPropagation()')
             span.glyphicon.glyphicon-chevron-down
-        ul.dropdown-menu(ng-if='!!profile.validResultProfiles')
+        ul.uib-dropdown-menu(ng-if='!!profile.validResultProfiles')
           li(ng-repeat='p in profile.validResultProfiles' ng-class='{active: p.name == profile.defaultProfileName}')
             a(href='#' role='button' ng-click='setDefaultProfile(profile.name, p.name)' title='{{getProfileTitle(profile)}}')
               span(omega-profile-inline='p' options='availableProfiles' disp-name='dispNameFilter')
@@ -64,13 +64,13 @@ html(lang='en' ng-app='omegaPopup' ng-controller='PopupCtrl' ng-csp)
           span.glyphicon.glyphicon-plus
           = ' '
           span {{'popup_addCondition' | tr}}
-      li(ng-show='!!currentDomain && validResultProfiles.length' dropdown is-open="tempRuleMenu.open")
-        a.dropdown-toggle(href='#' role='button' dropdown-toggle data-shortcut='tempRule')
+      li(ng-show='!!currentDomain && validResultProfiles.length' uib-dropdown is-open="tempRuleMenu.open")
+        a.uib-dropdown-toggle(href='#' role='button' uib-dropdown-toggle data-shortcut='tempRule')
           span.glyphicon.glyphicon-filter
           = ' '
           span.current-domain {{currentDomain}}
           span.caret
-        ul.dropdown-menu
+        ul.uib-dropdown-menu
           li(ng-repeat='profile in validResultProfiles' ng-class='{active: profile.name == currentTempRuleProfile}'
             ng-show='!!currentTempRuleProfile || validResultProfiles.length == 1 || profile.name != currentProfileName')
             a(href='#' role='button' ng-click='addTempRule(currentDomain, profile.name)' title='{{getProfileTitle(profile)}}')