diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
new file mode 100644
index 000000000..d1adfe8cd
--- /dev/null
+++ b/.github/workflows/sonarqube.yml
@@ -0,0 +1,26 @@
+name: SonarQube
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  sonarqube:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: SonarQube Scan
+        uses: sonarsource/sonarqube-scan-action@master
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+      # If you wish to fail your job when the Quality Gate is red, uncomment the
+      # following lines. This would typically be used to fail a deployment.
+      - name: SonarQube Quality Gate check
+        uses: sonarsource/sonarqube-quality-gate-action@master
+        timeout-minutes: 5
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
diff --git a/.gitignore b/.gitignore
index e765ef7b0..b9960e21e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,18 @@
-node_modules
+# IDE stuff
 .idea
+.vscode
+
+# dependencies
+node_modules
+vendor
+
+# artifacts
 .sass-cache
 npm-debug.log
+dist
 
-# Don't mess with other dev's config
+# don't mess with other dev's config
 launch_phpunit.sh
-dist
+
+# since we are using only dev dependencies atm, we can exclude it from polluting the repo
+composer.lock
diff --git a/Gruntfile.js b/Gruntfile.js
index 8f9ebc37a..dc4cb382f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -338,18 +338,17 @@ module.exports = function (grunt) {
 							replacement: function (matchedString) {
 								jsResources = [];
 
-								var jsArray = matchedString.match(/script\([A-z']+,\s?'([\/A-z.-]+)'\);/g);
+								const jsArray = matchedString.match(/script\([A-z]+::[A-z_]+,\s?'([\/A-z.-]+)'\);/g);
 								jsArray.forEach(function (file) {
-									var regex = /script\([A-z']+,\s?'([\/A-z.-]+)'\);/g;
-									var matches = regex.exec(file);
+									const regex = /script\([A-z]+::[A-z_]+,\s?'([\/A-z.-]+)'\);/g;
+									const matches = regex.exec(file);
 									if (matches) {
 										jsResources.push("'js/" + matches[1] + ".js'");
-
 									}
 								});
 								//Replace the entire build-js-start to build-js-end block with this <script> tag
 
-								return "script('passman', 'passman.min');";
+								return "script(MyAppTemplateConfig::APP_ID, 'passman.min');";
 							}
 						},
 						{
@@ -357,7 +356,7 @@ module.exports = function (grunt) {
 							match: /\/\s?\*build\-css\-start[\s\S]*build\-css\-end+\*\//,
 							replacement: function (matchedString) {
 								//Replace the entire build-css-start to build-css-end block with this <link> tag
-								return "style('passman', 'passman.min');"
+								return "style(MyAppTemplateConfig::APP_ID, 'passman.min');";
 							}
 						}
 					]
diff --git a/css/app.css b/css/app.css
index 54cd8ed3a..f71affc34 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1235,15 +1235,11 @@
   background: none;
   background-position-x: 0%;
   background-position-y: 0%;
-  background-repeat: repeat;
-  background-image: none;
-  background-size: auto;
   background-image: var(--icon-triangle-s-dark);
   background-size: 16px;
   background-repeat: no-repeat;
   background-position: center;
   border: none;
-  border-radius: 0;
   outline: none !important;
   box-shadow: none;
   content: " ";
@@ -1261,10 +1257,6 @@
 #app-navigation:not(.vue) > ul > li > .app-navigation-entry-bullet + a, #app-navigation:not(.vue) > ul > li > ul > li > .app-navigation-entry-bullet + a {
   background: rgba(0, 0, 0, 0) !important; }
 
-#app-navigation:not(.vue) > ul > li > a.svg, #app-navigation:not(.vue) > ul > li > ul > li > a.svg {
-  padding: 0 12px 0 44px;
-  padding-left: 44px; }
-
 #app-navigation:not(.vue) > ul > li > .app-navigation-entry-bullet, #app-navigation:not(.vue) > ul > li > ul > li > .app-navigation-entry-bullet {
   position: absolute;
   display: block;
diff --git a/css/app.css.map b/css/app.css.map
index 2fe0496e1..01e56a937 100644
--- a/css/app.css.map
+++ b/css/app.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../sass/app.scss","../sass/variables.scss","../sass/mixins.scss","../sass/partials/button.scss","../sass/partials/popovermenu.scss","../sass/partials/tabs.scss","../sass/partials/pwgen.scss","../sass/partials/icon-picker.scss","../sass/partials/share-incoming.scss","../sass/vaults.scss","../sass/credentials.scss","../sass/menu.scss","../sass/share_credential.scss","../sass/settings.scss","../sass/searchboxexpander.scss","../sass/toastify.scss"],
 "names": [],
 "file": "app.css"
diff --git a/css/public-page.css b/css/public-page.css
index 217241434..89887b9c6 100644
--- a/css/public-page.css
+++ b/css/public-page.css
@@ -115,7 +115,6 @@ header {
           white-space: normal; }
 
 .credential_field {
-  /* overflow: hidden; */
   display: flex;
   flex-wrap: wrap;
   align-items: center; }
diff --git a/css/public-page.css.map b/css/public-page.css.map
index a94b66a23..b1f7f8540 100644
--- a/css/public-page.css.map
+++ b/css/public-page.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;ACpBH;;;;;;;;;;;;;;;;;;;;GAoBG;ACpBH;;;;;;;;;;;;;;;;;;;;GAoBG;AFIH,MAAO;EACL,OAAO,EAAE,IAAI;;AAGf,gBAAiB;EACf,WAAW,EAAE,CAAC;;AAGhB,iBAAkB;EAChB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EAEnB,kCAAiB;IACf,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,IAAI;IAEb,wDAAsB;MACpB,SAAS,EAAE,KAAK;MAChB,KAAK,EAAE,GAAG;MACV,MAAM,EAAE,SAAS;MACjB,OAAO,EAAE,IAAI;MACb,MAAM,EAAE,8CAA8C;MACtD,UAAU,EAAE,4BAA4B;MEd5C,qBAAqB,EFeM,GAAG;MEd9B,aAAa,EFcc,GAAG;MEb9B,eAAe,EAAE,WAAW;MAAG,qDAAqD;MFehF,8DAAM;QACJ,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE,MAAM;MAGhB,2DAAG;QACD,WAAW,EAAE,IAAI;QACjB,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;QACnB,KAAK,EAAE,oBAAoB;MAG7B,+DAAO;QACL,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,SAAS,EAAE,KAAK;QAEhB,iEAAE;UACA,YAAY,EAAE,GAAG;MAIrB,8DAAM;QACJ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,MAAM;QAEd,6EAAe;UACb,KAAK,EAAE,KAAK;UACZ,WAAW,EAAE,GAAG;UAChB,aAAa,EAAE,IAAI;QAGrB,iEAAG;UACD,OAAO,EAAE,QAAQ;UACjB,UAAU,EAAE,UAAU;QAExB,6GAA+C;UAC7C,WAAW,EAAE,MAAM;;AAO7B,iBAAkB;EAChB,uBAAuB;EACvB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,MAAM;EAEnB,iDAAc;IACZ,YAAY,EAAE,IAAI;EAGpB,wBAAO;IACL,OAAO,EAAE,IAAI;IACb,GAAG,EAAE,GAAG;IAER,8BAAM;MACJ,MAAM,EAAE,OAAO;MACf,OAAO,EAAE,GAAG;MACZ,UAAU,EAAE,YAAY;MAExB,oCAAQ;QACN,OAAO,EAAE,CAAC;;AAMlB,KAAM;EACJ,GAAG,EAAE,GAAG;EACR,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EAEf,UAAK;IACH,gBAAgB,EAAE,4BAA4B;IAC9C,KAAK,EAAE,6BAA6B;IACpC,OAAO,EAAE,QAAQ;IACjB,SAAS,EAAE,KAAK;IAChB,YAAY,EAAE,GAAG;IACjB,aAAa,EAAE,GAAG;IAClB,OAAO,EAAE,YAAY;IErGvB,qBAAqB,EFsGI,IAAI;IErG7B,aAAa,EFqGY,IAAI;IEpG7B,eAAe,EAAE,WAAW;IAAG,qDAAqD;;AFwGtF,OAAQ;EACN,SAAS,EAAE,KAAK;EAChB,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,MAAM;EAElB,cAAO;IACL,KAAK,EAAE,oBAAoB;IAC3B,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,KAAK;IAEb,oBAAQ;MACN,eAAe,EAAE,SAAS;;AAMhC,yBAA0B;EACxB,wDAAyD;IACvD,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,IAAI;IAEb,6EAAqB;MACnB,KAAK,EAAE,KAAK",
+"mappings": "AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;ACpBH;;;;;;;;;;;;;;;;;;;;GAoBG;ACpBH;;;;;;;;;;;;;;;;;;;;GAoBG;AFIH,MAAO;EACL,OAAO,EAAE,IAAI;;AAGf,gBAAiB;EACf,WAAW,EAAE,CAAC;;AAGhB,iBAAkB;EAChB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EAEnB,kCAAiB;IACf,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,IAAI;IAEb,wDAAsB;MACpB,SAAS,EAAE,KAAK;MAChB,KAAK,EAAE,GAAG;MACV,MAAM,EAAE,SAAS;MACjB,OAAO,EAAE,IAAI;MACb,MAAM,EAAE,8CAA8C;MACtD,UAAU,EAAE,4BAA4B;MEd5C,qBAAqB,EFeM,GAAG;MEd9B,aAAa,EFcc,GAAG;MEb9B,eAAe,EAAE,WAAW;MAAG,qDAAqD;MFehF,8DAAM;QACJ,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE,MAAM;MAGhB,2DAAG;QACD,WAAW,EAAE,IAAI;QACjB,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;QACnB,KAAK,EAAE,oBAAoB;MAG7B,+DAAO;QACL,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,SAAS,EAAE,KAAK;QAEhB,iEAAE;UACA,YAAY,EAAE,GAAG;MAIrB,8DAAM;QACJ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,MAAM;QAEd,6EAAe;UACb,KAAK,EAAE,KAAK;UACZ,WAAW,EAAE,GAAG;UAChB,aAAa,EAAE,IAAI;QAGrB,iEAAG;UACD,OAAO,EAAE,QAAQ;UACjB,UAAU,EAAE,UAAU;QAExB,6GAA+C;UAC7C,WAAW,EAAE,MAAM;;AAO7B,iBAAkB;EAChB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,MAAM;EAEnB,iDAAc;IACZ,YAAY,EAAE,IAAI;EAGpB,wBAAO;IACL,OAAO,EAAE,IAAI;IACb,GAAG,EAAE,GAAG;IAER,8BAAM;MACJ,MAAM,EAAE,OAAO;MACf,OAAO,EAAE,GAAG;MACZ,UAAU,EAAE,YAAY;MAExB,oCAAQ;QACN,OAAO,EAAE,CAAC;;AAMlB,KAAM;EACJ,GAAG,EAAE,GAAG;EACR,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EAEf,UAAK;IACH,gBAAgB,EAAE,4BAA4B;IAC9C,KAAK,EAAE,6BAA6B;IACpC,OAAO,EAAE,QAAQ;IACjB,SAAS,EAAE,KAAK;IAChB,YAAY,EAAE,GAAG;IACjB,aAAa,EAAE,GAAG;IAClB,OAAO,EAAE,YAAY;IEpGvB,qBAAqB,EFqGI,IAAI;IEpG7B,aAAa,EFoGY,IAAI;IEnG7B,eAAe,EAAE,WAAW;IAAG,qDAAqD;;AFuGtF,OAAQ;EACN,SAAS,EAAE,KAAK;EAChB,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,MAAM;EAElB,cAAO;IACL,KAAK,EAAE,oBAAoB;IAC3B,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,KAAK;IAEb,oBAAQ;MACN,eAAe,EAAE,SAAS;;AAMhC,yBAA0B;EACxB,wDAAyD;IACvD,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,IAAI;IAEb,6EAAqB;MACnB,KAAK,EAAE,KAAK",
 "sources": ["../sass/public-page.scss","../sass/variables.scss","../sass/mixins.scss"],
 "names": [],
 "file": "public-page.css"
diff --git a/js/app/app.js b/js/app/app.js
index 0a151ea38..80a827072 100644
--- a/js/app/app.js
+++ b/js/app/app.js
@@ -23,6 +23,8 @@
 (function() {
   'use strict';
 
+  const APP_ID = 'passman';
+
   /**
    * @ngdoc overview
    * @name passmanApp
@@ -84,13 +86,14 @@
     localStorageServiceProvider.setNotify(true, true);
   }).config(function($translateProvider) {
     $translateProvider.useSanitizeValueStrategy('sanitizeParameters');
-    $translateProvider.useUrlLoader(OC.generateUrl('/apps/passman/api/v2/language'));
+    $translateProvider.useUrlLoader(OC.generateUrl('/apps/' + APP_ID + '/api/v2/language'));
     $translateProvider.preferredLanguage('en');
   }).run([
     '$rootScope', function($rootScope) {
       $rootScope.$on('$routeChangeSuccess', function(e, curr, prev) {
         $('.ui-dialog-content').dialog('close');
       });
+      $rootScope.APP_ID = APP_ID;
     }]);
 
   /**
@@ -120,4 +123,4 @@
       angular.element('#app-content-wrapper').scope().$apply();
     });
   });
-}());
\ No newline at end of file
+}());
diff --git a/js/app/app_public.js b/js/app/app_public.js
index bdbef7432..2552c32a2 100644
--- a/js/app/app_public.js
+++ b/js/app/app_public.js
@@ -23,6 +23,8 @@
 (function () {
 	'use strict';
 
+    const APP_ID = 'passman';
+
 	angular
 		.module('passmanApp', [
 			'ngAnimate',
@@ -38,7 +40,10 @@
 		/** global: oc_requesttoken */
 		$httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
 	}]).config(function ($translateProvider) {
-		$translateProvider.useUrlLoader(OC.generateUrl('/apps/passman/api/v2/language'));
+		$translateProvider.useUrlLoader(OC.generateUrl('/apps/' + APP_ID + '/api/v2/language'));
 		$translateProvider.preferredLanguage('en');
-	});
-}());
\ No newline at end of file
+	}).run([
+        '$rootScope', function($rootScope) {
+            $rootScope.APP_ID = APP_ID;
+        }]);
+}());
diff --git a/js/app/controllers/settings.js b/js/app/controllers/settings.js
index 19a2c2ccc..634dc01c4 100644
--- a/js/app/controllers/settings.js
+++ b/js/app/controllers/settings.js
@@ -32,8 +32,8 @@
 	 * Controller of the passmanApp
 	 */
 	angular.module('passmanApp')
-		.controller('SettingsCtrl', ['$scope', '$rootScope', 'SettingsService', 'VaultService', 'CredentialService', '$location', '$routeParams', '$http', 'EncryptService', 'NotificationService', '$sce', '$translate',
-			function ($scope, $rootScope, SettingsService, VaultService, CredentialService, $location, $routeParams, $http, EncryptService, NotificationService, $sce, $translate) {
+		.controller('SettingsCtrl', ['$scope', '$rootScope', 'SettingsService', 'VaultService', 'CredentialService', 'UrlService', '$location', '$routeParams', '$http', 'EncryptService', 'NotificationService', '$sce', '$translate',
+			function ($scope, $rootScope, SettingsService, VaultService, CredentialService, UrlService, $location, $routeParams, $http, EncryptService, NotificationService, $sce, $translate) {
 				$scope.vault_settings = {};
 				$scope.new_vault_name = '';
 				$scope.showGenericImport = false;
@@ -147,7 +147,7 @@
 				};
 
 				var getPassmanVersion = function () {
-					var url = OC.generateUrl('apps/passman/api/internal/version');
+					var url = UrlService.generateUrl('/api/internal/version');
 					$http.get(url).then(function (result) {
 						$scope.passman_version = result.data.version;
 					});
diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js
index b34ec9660..af5be83eb 100644
--- a/js/app/controllers/share.js
+++ b/js/app/controllers/share.js
@@ -32,8 +32,8 @@
 	 * This file is part of passman, licensed under AGPLv3
 	 */
 	angular.module('passmanApp')
-		.controller('ShareCtrl', ['$scope', 'VaultService', 'CredentialService', 'SettingsService', '$location', '$routeParams', 'ShareService', 'NotificationService', 'SharingACL', 'EncryptService', '$translate', '$rootScope',
-			function ($scope, VaultService, CredentialService, SettingsService, $location, $routeParams, ShareService, NotificationService, SharingACL, EncryptService, $translate, $rootScope) {
+		.controller('ShareCtrl', ['$scope', 'VaultService', 'CredentialService', 'SettingsService', '$location', '$routeParams', 'ShareService', 'NotificationService', 'SharingACL', 'EncryptService', 'UrlService', '$translate', '$rootScope',
+			function ($scope, VaultService, CredentialService, SettingsService, $location, $routeParams, ShareService, NotificationService, SharingACL, EncryptService, UrlService, $translate, $rootScope) {
 				$scope.active_vault = VaultService.getActiveVault();
 
 
@@ -305,7 +305,7 @@
 					var port;
 					var defaultPort = ($location.$$protocol === 'http') ? 80 : 443;
 					port = (defaultPort !== $location.$$port) ? ':'+ $location.$$port : '';
-					return $location.$$protocol + '://' + $location.$$host + port + OC.generateUrl('apps/passman/share/public#') + hash;
+					return $location.$$protocol + '://' + $location.$$host + port + UrlService.generateUrl('/share/public#') + hash;
 				};
 
 				$scope.sharing_complete = true;
diff --git a/js/app/controllers/vaultreqdeletion.js b/js/app/controllers/vaultreqdeletion.js
index 7534c3485..d11d2a8e7 100644
--- a/js/app/controllers/vaultreqdeletion.js
+++ b/js/app/controllers/vaultreqdeletion.js
@@ -31,15 +31,15 @@
 	 * Controller of the passmanApp
 	 */
 	angular.module('passmanApp')
-		.controller('RequestDeleteCtrl', ['$scope', '$location', '$http', '$routeParams', 'VaultService', 'NotificationService', '$translate',
-			function ($scope, $location, $http, $routeParams, VaultService, NotificationService, $translate) {
+		.controller('RequestDeleteCtrl', ['$scope', '$location', '$http', '$routeParams', 'VaultService', 'NotificationService', 'UrlService', '$translate',
+			function ($scope, $location, $http, $routeParams, VaultService, NotificationService, UrlService, $translate) {
 				$scope.reason = '';
 				VaultService.getVault({guid: $routeParams.vault_id}).then(function(vault){
 					$scope.pending_deletion = vault.delete_request_pending;
 				});
 
 				$scope.requestDeletion = function () {
-					var queryUrl = OC.generateUrl('apps/passman/admin/request-deletion/'+ $routeParams.vault_id);
+					var queryUrl = UrlService.generateUrl('/admin/request-deletion/'+ $routeParams.vault_id);
 					var params = {
 						reason: $scope.reason
 					};
@@ -51,11 +51,11 @@
 				};
 
 				$scope.removeRequestDeletion = function () {
-					var queryUrl = OC.generateUrl('apps/passman/admin/request-deletion/' + $routeParams.vault_id);
+					var queryUrl = UrlService.generateUrl('/admin/request-deletion/' + $routeParams.vault_id);
 					$http.delete(queryUrl).then(function () {
 						NotificationService.showNotification($translate.instant('deletion.removed'), 5000);
 						$location.path('#/');
 					});
 				};
 			}]);
-}());
\ No newline at end of file
+}());
diff --git a/js/app/directives/icon.js b/js/app/directives/icon.js
index 72efc9230..7b63bbee5 100644
--- a/js/app/directives/icon.js
+++ b/js/app/directives/icon.js
@@ -30,7 +30,7 @@
    * # passwordGen
    */
   angular.module('passmanApp').directive('credentialIcon', [
-    '$window', function($window) {
+    '$window', 'UrlService', function($window, UrlService) {
       return {
         template: '<img ng-src="{{ iconUrl }}" class="icon-image-size">',
         restrict: 'E',
@@ -47,7 +47,7 @@
             } else {
               if(scope.credential.url) {
                 var url = window.btoa(angular.copy(scope.credential.url)).replace('/', '_');
-                scope.iconUrl = OC.generateUrl('apps/passman/api/v2/icon/') + url + '/' +
+                scope.iconUrl = UrlService.generateUrl('/api/v2/icon/') + url + '/' +
                     scope.credential.credential_id;
               }
             }
diff --git a/js/app/directives/iconpicker.js b/js/app/directives/iconpicker.js
index e6a78f7d1..7ee2ddf98 100644
--- a/js/app/directives/iconpicker.js
+++ b/js/app/directives/iconpicker.js
@@ -30,7 +30,7 @@
    * # passwordGen
    */
   angular.module('passmanApp').directive('iconPicker', [
-    '$window', 'IconService', '$http', 'NotificationService','$translate', function($window, IconService, $http, NotificationService, $translate) {
+    '$window', 'IconService', '$http', 'NotificationService', 'UrlService', '$translate', function($window, IconService, $http, NotificationService, UrlService, $translate) {
       return {
         templateUrl: 'views/partials/icon-picker.html',
         restrict: 'A',
@@ -117,7 +117,7 @@
 
             scope.refreshUrlIcon = function(){
 				NotificationService.showNotification($translate.instant('use.icon.refresh.trying'), 5000);
-				var queryUrl = OC.generateUrl('apps/passman/api/v2/geticon/'+btoa(scope.credential.url));
+				var queryUrl = UrlService.generateUrl('/api/v2/geticon/'+btoa(scope.credential.url));
 				$http.get(queryUrl).then(function (response) {
 				    if(typeof response.data.content !== 'undefined'){
 					    scope.customIcon = {};
diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js
index 4f830dfa2..54abd90e3 100644
--- a/js/app/services/credentialservice.js
+++ b/js/app/services/credentialservice.js
@@ -30,7 +30,7 @@
 	 * Service in the passmanApp.
 	 */
 	angular.module('passmanApp')
-		.service('CredentialService', ['$http', 'EncryptService', 'VaultService', 'FileService', function ($http, EncryptService, VaultService, FileService) {
+		.service('CredentialService', ['$http', 'EncryptService', 'VaultService', 'FileService', 'UrlService', function ($http, EncryptService, VaultService, FileService, UrlService) {
 			var credential = {
 				'credential_id': null,
 				'guid': null,
@@ -72,7 +72,7 @@
 
 					_credential.expire_time = new Date(angular.copy(credential.expire_time)).getTime() / 1000;
 
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials');
+					var queryUrl = UrlService.generateUrl('/api/v2/credentials');
 					return $http.post(queryUrl, _credential).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -91,7 +91,7 @@
 					}
 					_credential.expire_time = new Date(angular.copy(credential.expire_time)).getTime() / 1000;
 
-					const queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + credential.guid);
+					const queryUrl = UrlService.generateUrl('/api/v2/credentials/' + credential.guid);
 					return $http.patch(queryUrl, _credential).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -101,7 +101,7 @@
 					});
 				},
 				getCredential: function (guid) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + guid);
+					var queryUrl = UrlService.generateUrl('/api/v2/credentials/' + guid);
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -111,7 +111,7 @@
 					});
 				},
 				destroyCredential: function (guid) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + guid);
+					var queryUrl = UrlService.generateUrl('/api/v2/credentials/' + guid);
 					return $http.delete(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -171,7 +171,7 @@
 					return key;
 				},
 				getRevisions: function (guid) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + guid + '/revision');
+					var queryUrl = UrlService.generateUrl('/api/v2/credentials/' + guid + '/revision');
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -183,7 +183,7 @@
 				updateRevision: function (revision) {
 					var _revision = angular.copy(revision);
 					_revision.credential_data = window.btoa(JSON.stringify(_revision.credential_data));
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + revision.credential_data.guid + '/revision/' + revision.revision_id);
+					var queryUrl = UrlService.generateUrl('/api/v2/credentials/' + revision.credential_data.guid + '/revision/' + revision.revision_id);
 					return $http.patch(queryUrl, _revision).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -193,7 +193,7 @@
 					});
 				},
 				deleteRevision: function (credential_guid, revision_id) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + credential_guid + '/revision/' + revision_id);
+					var queryUrl = UrlService.generateUrl('/api/v2/credentials/' + credential_guid + '/revision/' + revision_id);
 					return $http.delete(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
diff --git a/js/app/services/fileservice.js b/js/app/services/fileservice.js
index 395608229..902a018da 100644
--- a/js/app/services/fileservice.js
+++ b/js/app/services/fileservice.js
@@ -31,10 +31,10 @@
 	 * Service in the passmanApp.
 	 */
 	angular.module('passmanApp')
-		.service('FileService', ['$http', 'EncryptService', function ($http, EncryptService) {
+		.service('FileService', ['$http', 'EncryptService', 'UrlService', function ($http, EncryptService, UrlService) {
 			return {
 				uploadFile: function (file, key) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/file');
+					var queryUrl = UrlService.generateUrl('/api/v2/file');
 					var _file = angular.copy(file);
 					_file.filename = EncryptService.encryptString(_file.filename, key);
 					var data = EncryptService.encryptString(angular.copy(file.data), key);
@@ -48,7 +48,7 @@
 					});
 				},
 				deleteFile: function (file) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/file/' + file.file_id);
+					var queryUrl = UrlService.generateUrl('/api/v2/file/' + file.file_id);
 					var _file = angular.copy(file);
 					return $http.delete(queryUrl, _file).then(function (response) {
 						if (response.data) {
@@ -59,7 +59,7 @@
 					});
 				},
 				getFile: function (file) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/file/' + file.file_id);
+					var queryUrl = UrlService.generateUrl('/api/v2/file/' + file.file_id);
 					var _file = angular.copy(file);
 					return $http.get(queryUrl, _file).then(function (response) {
 						if (response.data) {
@@ -80,7 +80,7 @@
 				 * @returns {*}
 				 */
 				updateFile: function (file, key) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/file/' + file.file_id);
+					var queryUrl = UrlService.generateUrl('/api/v2/file/' + file.file_id);
 					var _file = angular.copy(file);
 					_file.filename = EncryptService.encryptString(_file.filename, key);
 					var data = EncryptService.encryptString(angular.copy(file.file_data), key);
diff --git a/js/app/services/iconservice.js b/js/app/services/iconservice.js
index 323d484b3..55b4059b8 100644
--- a/js/app/services/iconservice.js
+++ b/js/app/services/iconservice.js
@@ -31,10 +31,10 @@
 	 * Service in the passmanApp.
 	 */
 	angular.module('passmanApp')
-		.service('IconService', ['$http', function ($http) {
+		.service('IconService', ['UrlService', '$http', function (UrlService, $http) {
 			return {
 				getIcons: function () {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/icon/list');
+					var queryUrl = UrlService.generateUrl('/api/v2/icon/list');
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -45,4 +45,4 @@
 				}
 			};
 		}]);
-}());
\ No newline at end of file
+}());
diff --git a/js/app/services/settingsservice.js b/js/app/services/settingsservice.js
index 70e07d429..051d84fdd 100644
--- a/js/app/services/settingsservice.js
+++ b/js/app/services/settingsservice.js
@@ -32,13 +32,13 @@
 	 * Service in the passmanApp.
 	 */
 	angular.module('passmanApp')
-		.service('SettingsService', ['localStorageService', '$http', '$rootScope', function (localStorageService, $http, $rootScope) {
+		.service('SettingsService', ['UrlService', 'localStorageService', '$http', '$rootScope', function (UrlService, localStorageService, $http, $rootScope) {
 			var settings = {
 				defaultVault: null,
 				defaultVaultPass: null
 			};
 
-			$http.get(OC.generateUrl('apps/passman/api/v2/settings')).then(function (response) {
+			$http.get(UrlService.generateUrl('/api/v2/settings')).then(function (response) {
 				if (response.data) {
 					settings = angular.merge(settings, response.data);
 					$rootScope.$broadcast('settings_loaded');
@@ -63,4 +63,4 @@
 				}
 			};
 		}]);
-}());
\ No newline at end of file
+}());
diff --git a/js/app/services/shareservice.js b/js/app/services/shareservice.js
index 020c38865..d8bb2daff 100644
--- a/js/app/services/shareservice.js
+++ b/js/app/services/shareservice.js
@@ -32,7 +32,7 @@
 	 * Service in the passmanApp.
 	 */
 	angular.module('passmanApp')
-		.service('ShareService', ['$http', 'VaultService', 'EncryptService', 'CredentialService', function ($http, VaultService, EncryptService, CredentialService) {
+		.service('ShareService', ['$http', 'VaultService', 'EncryptService', 'CredentialService', 'UrlService', function ($http, VaultService, EncryptService, CredentialService, UrlService) {
 			// Setup sjcl random engine to max paranoia level and start collecting data
 			var paranoia_level = 10;
 			/** global: sjcl */
@@ -41,7 +41,7 @@
 
 			return {
 				search: function (string) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/search');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/search');
 					return $http.post(queryUrl, {search: string}).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -51,7 +51,7 @@
 					});
 				},
 				shareWithUser: function (credential, target_user_data) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/share');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/share');
 					return $http.post(queryUrl,
 						{
 							item_id: credential.credential_id,
@@ -62,7 +62,7 @@
 					);
 				},
 				getVaultsByUser: function (userId) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/vaults/' + userId);
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/vaults/' + userId);
 					return $http.get(queryUrl, {search: userId}).then(function (response) {
 						if (response.data) {
 							for (var i = 0; i < response.data.length; i++) {
@@ -76,7 +76,7 @@
 					});
 				},
 				getPendingRequests: function () {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/pending');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/pending');
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -84,7 +84,7 @@
 					});
 				},
 				saveSharingRequest: function (request, crypted_shared_key) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/save');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/save');
 					return $http.post(queryUrl, {
 						item_guid: request.item_guid,
 						target_vault_guid: request.target_vault_guid,
@@ -94,33 +94,33 @@
 					});
 				},
 				declineSharingRequest: function (request) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/decline/' + request.req_id);
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/decline/' + request.req_id);
 					return $http.delete(queryUrl).then(function (response) {
 						return response.data;
 					});
 				},
 				unshareCredential: function (credential) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential.guid);
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/credential/' + credential.guid);
 					return $http.delete(queryUrl).then(function (response) {
 						return response.data;
 					});
 				},
 
 				unshareCredentialFromUser: function (credential, user_id) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential.guid + '/' + user_id);
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/credential/' + credential.guid + '/' + user_id);
 					return $http.delete(queryUrl).then(function (response) {
 						return response.data;
 					});
 				},
 
 				createPublicSharedCredential: function (shareObj) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/public');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/public');
 					return $http.post(queryUrl, shareObj).then(function (response) {
 						return response.data;
 					});
 				},
 				getPublicSharedCredential: function (credential_guid) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential_guid + '/public');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/credential/' + credential_guid + '/public');
 					return $http.get(queryUrl).then(function (response) {
 							if (response.data) {
 								return response;
@@ -133,7 +133,7 @@
 						});
 				},
 				getSharedCredentialACL: function (credential) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential.guid + '/acl');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/credential/' + credential.guid + '/acl');
 					return $http.get(queryUrl).then(function (response) {
 							if (response.data) {
 								return response.data;
@@ -146,13 +146,13 @@
 						});
 				},
 				updateCredentialAcl: function (credential, acl) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential.guid + '/acl');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/credential/' + credential.guid + '/acl');
 					return $http.patch(queryUrl, acl).then(function (response) {
 						return response.data;
 					});
 				},
 				getCredendialsSharedWithUs: function (vault_guid) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/vault/' + vault_guid + '/get');
+					var queryUrl = UrlService.generateUrl('/api/v2/sharing/vault/' + vault_guid + '/get');
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -160,7 +160,7 @@
 					});
 				},
 				downloadSharedFile: function (credential, file) {
-					const queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential.guid + '/file/' + file.guid);
+					const queryUrl = UrlService.generateUrl('/api/v2/sharing/credential/' + credential.guid + '/file/' + file.guid);
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -168,7 +168,7 @@
 					});
 				},
 				uploadSharedFile: function (credential, file, key) {
-					const queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential.guid + '/file');
+					const queryUrl = UrlService.generateUrl('/api/v2/sharing/credential/' + credential.guid + '/file');
 					let _file = angular.copy(file);
 					_file.filename = EncryptService.encryptString(_file.filename, key);
 					const data = EncryptService.encryptString(angular.copy(file.data), key);
diff --git a/js/app/services/urlservice.js b/js/app/services/urlservice.js
new file mode 100644
index 000000000..3ac0c25e4
--- /dev/null
+++ b/js/app/services/urlservice.js
@@ -0,0 +1,52 @@
+/**
+ * Nextcloud - passman
+ *
+ * @copyright Copyright (c) 2016, Sander Brand (brantje@gmail.com)
+ * @copyright Copyright (c) 2016, Marcos Zuriaga Miguel (wolfi@wolfi.es)
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+(function () {
+	'use strict';
+
+	/**
+	 * @ngdoc service
+	 * @name passmanApp.UrlService
+	 * @description
+	 * # UrlService
+	 * Service in the passmanApp.
+	 */
+	angular.module('passmanApp')
+		.service('UrlService', ['$rootScope', function ($rootScope) {
+			return {
+                /**
+                 * Like OC.generateUrl, but with an additional apps/<appid>/ prefix
+                 * @returns {*}
+                 */
+                generateUrl: function (localAppUrl) {
+                    let prefix = 'apps/' + $rootScope.APP_ID;
+                    if (!localAppUrl) {
+                        localAppUrl = '';
+                    }
+                    if (!localAppUrl.startsWith('/')) {
+                        prefix += '/';
+                    }
+					return OC.generateUrl(prefix + localAppUrl);
+				}
+			};
+		}]);
+}());
diff --git a/js/app/services/vaultservice.js b/js/app/services/vaultservice.js
index da3eb9923..d65d4e6e4 100644
--- a/js/app/services/vaultservice.js
+++ b/js/app/services/vaultservice.js
@@ -32,13 +32,13 @@
 	 * Service in the passmanApp.
 	 */
 	angular.module('passmanApp')
-		.service('VaultService', ['$http', function ($http) {
+		.service('VaultService', ['UrlService', '$http', function (UrlService, $http) {
 			// AngularJS will instantiate a singleton by calling "new" on this function
 			var _this = this;
 			var _activeVault;
 			var service = {
 				getVaults: function () {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/vaults');
+					var queryUrl = UrlService.generateUrl('/api/v2/vaults');
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -71,7 +71,7 @@
 
 				},
 				createVault: function (vaultName) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/vaults');
+					var queryUrl = UrlService.generateUrl('/api/v2/vaults');
 					return $http.post(queryUrl, {vault_name: vaultName}).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -81,7 +81,7 @@
 					});
 				},
 				getVault: function (vault) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/vaults/' + vault.guid);
+					var queryUrl = UrlService.generateUrl('/api/v2/vaults/' + vault.guid);
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							if (response.data.vault_settings) {
@@ -101,7 +101,7 @@
 					delete _vault.defaultVault;
 					delete _vault.vaultKey;
 					_vault.vault_settings = window.btoa(JSON.stringify(_vault.vault_settings));
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/vaults/' + _vault.guid);
+					var queryUrl = UrlService.generateUrl('/api/v2/vaults/' + _vault.guid);
 					return $http.patch(queryUrl, _vault).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -113,7 +113,7 @@
 				updateSharingKeys: function (vault) {
 					var _vault = angular.copy(vault);
 					delete _vault.vaultKey;
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/vaults/' + _vault.guid + '/sharing-keys');
+					var queryUrl = UrlService.generateUrl('/api/v2/vaults/' + _vault.guid + '/sharing-keys');
 					return $http.post(queryUrl, _vault).then(function (response) {
 						if (response.data) {
 							return response.data;
@@ -123,7 +123,7 @@
 					});
 				},
 				reEncryptACLSharingKeys: function (vault, oldVaultPass, newVaultPass, EncryptService) {
-					const queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/vault/' + vault.guid + '/acl');
+					const queryUrl = UrlService.generateUrl('/api/v2/sharing/vault/' + vault.guid + '/acl');
 					return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
 							const updateACLSharingKey = function (index) {
@@ -131,7 +131,7 @@
 								const decrypted_shared_key = EncryptService.decryptString(angular.copy(acl.shared_key), oldVaultPass);
 								acl.shared_key = EncryptService.encryptString(decrypted_shared_key, newVaultPass);
 
-								const patchUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + acl.item_guid + '/acl/shared_key');
+								const patchUrl = UrlService.generateUrl('/api/v2/sharing/credential/' + acl.item_guid + '/acl/shared_key');
 								$http.patch(patchUrl, {
 									shared_key: acl.shared_key
 								}).then(function () {
@@ -147,8 +147,8 @@
 					});
 				},
 				deleteVault: function (vault, file_ids) {
-					var queryUrl = OC.generateUrl('apps/passman/api/v2/vaults/' + vault.guid);
-					var deleteFilesUrl = OC.generateUrl('apps/passman/api/v2/files/delete');
+					var queryUrl = UrlService.generateUrl('/api/v2/vaults/' + vault.guid);
+					var deleteFilesUrl = UrlService.generateUrl('/api/v2/files/delete');
 					var filesData = {
 						"file_ids": JSON.stringify(file_ids)
 					};
diff --git a/js/importers/importer-randomdata.js b/js/importers/importer-randomdata.js
index c0b6929d1..f19188ea7 100644
--- a/js/importers/importer-randomdata.js
+++ b/js/importers/importer-randomdata.js
@@ -27,6 +27,8 @@ var PassmanImporter = PassmanImporter || {};
 	'use strict';
 	// Define the importer
 
+    const APP_ID = 'passman';
+
 // Define the importer
 	PassmanImporter.randomData = {
 		info: {
@@ -60,7 +62,7 @@ var PassmanImporter = PassmanImporter || {};
 			var _this = this;
 			var generateCredential = function (max, i, callback) {
 				if (jQuery) {
-					var url = OC.generateUrl('apps/passman/api/internal/generate_person');
+					var url = OC.generateUrl('apps/' + APP_ID + '/api/internal/generate_person');
 					$.ajax({
 						url: url,
 						dataType: 'json',
@@ -118,4 +120,4 @@ var PassmanImporter = PassmanImporter || {};
 			});
 		});
 	};
-})(window, $, PassmanImporter);
\ No newline at end of file
+})(window, $, PassmanImporter);
diff --git a/js/settings-admin.js b/js/settings-admin.js
index a4f4410e1..6d0381812 100644
--- a/js/settings-admin.js
+++ b/js/settings-admin.js
@@ -21,6 +21,7 @@
  */
 
 $(document).ready(function () {
+    const urlPrefix = 'apps/passman';
 	var Settings = function (baseUrl) {
 		this._baseUrl = baseUrl;
 		this._settings = [];
@@ -83,7 +84,7 @@ $(document).ready(function () {
 	};
 
 
-	var settings = new Settings(OC.generateUrl('apps/passman/api/v2/settings'));
+	var settings = new Settings(OC.generateUrl(urlPrefix + '/api/v2/settings'));
 	settings.load();
 	// ADMIN SETTINGS
 
@@ -139,7 +140,7 @@ $(document).ready(function () {
 	};
 	$('.account_mover_selector').select2({
 		ajax: {
-			url: OC.generateUrl('apps/passman/admin/search'),
+			url: OC.generateUrl(urlPrefix + '/admin/search'),
 			dataType: 'json',
 			delay: 50,
 			data: function (param) {
@@ -173,7 +174,7 @@ $(document).ready(function () {
 		$(self).attr('disabled', 'disabled');
 		$(self).html('<i class="fa fa-spinner fa-spin"></i> ' + OC.L10N.translate('passman', 'Moving') + '...');
 		if (accountMover.source_account && accountMover.destination_account) {
-			$.post(OC.generateUrl('apps/passman/admin/move'), accountMover, function (data) {
+			$.post(OC.generateUrl(urlPrefix + '/admin/move'), accountMover, function (data) {
 				$(self).removeAttr('disabled');
 				$(self).html('Move');
 				if (data.success) {
@@ -223,14 +224,14 @@ $(document).ready(function () {
 		if (!confirm(OC.L10N.translate('passman', "Are you really sure?\nThis will delete the vault and all credentials in it!"))) {
 			return;
 		}
-		$.post(OC.generateUrl('apps/passman/admin/accept-delete-request'), req, function () {
+		$.post(OC.generateUrl(urlPrefix + '/admin/accept-delete-request'), req, function () {
 			$(el).parent().parent().remove();
 		});
 	}
 
 	function ignoreDeleteRequest (el, req) {
 		$.ajax({
-			url: OC.generateUrl('apps/passman/admin/request-deletion/' + req.vault_guid),
+			url: OC.generateUrl(urlPrefix + '/admin/request-deletion/' + req.vault_guid),
 			type: 'DELETE',
 			success: function () {
 				$(el).parent().parent().remove();
@@ -238,7 +239,7 @@ $(document).ready(function () {
 		});
 	}
 
-	$.get(OC.generateUrl('apps/passman/admin/delete-requests'), function (requests) {
+	$.get(OC.generateUrl(urlPrefix + '/admin/delete-requests'), function (requests) {
 		var table = $('#requests-table tbody');
 		$.each(requests, function (k, request) {
 			var accept = $('<span class="link accept">[Accept]&nbsp;</span>');
diff --git a/lib/Activity.php b/lib/Activity.php
index c9c8c1ccf..11d8d09b5 100644
--- a/lib/Activity.php
+++ b/lib/Activity.php
@@ -23,12 +23,13 @@
 
 namespace OCA\Passman;
 
+use OCA\Passman\AppInfo\Application;
 use OCP\IURLGenerator;
 use OCP\L10N\IFactory;
 
 class Activity implements \OCP\Activity\IExtension {
-	const FILTER_PASSMAN = 'passman';
-	const APP_NAME = 'passman';
+	const FILTER_PASSMAN = Application::APP_ID;
+	const APP_NAME = Application::APP_ID;
 	const TYPE_ITEM_ACTION = 'passman_item_action';
 	const TYPE_ITEM_EXPIRED = 'passman_item_expired';
 	const TYPE_ITEM_SHARED = 'passman_item_shared';
@@ -197,13 +198,13 @@ public function getSpecialParameterList($app, $text) {
 				case self::SUBJECT_ITEM_DESTROYED:
 				case self::SUBJECT_ITEM_DESTROYED_SELF:
 					return [
-						0 => 'passman',
+						0 => Application::APP_ID,
 						1 => 'username',
 					];
 				case self::SUBJECT_APPLY_REV:
 				case self::SUBJECT_APPLY_REV_SELF:
 					return [
-						0 => 'passman',
+						0 => Application::APP_ID,
 						1 => 'username',
 						2 => '', //unknown
 					];
@@ -213,7 +214,7 @@ public function getSpecialParameterList($app, $text) {
 				case self::SUBJECT_ITEM_SHARED:
 				case self::SUBJECT_ITEM_SHARED_PUBLICLY:
 					return [
-						0 => 'passman',
+						0 => Application::APP_ID,
 					];
 			}
 		}
@@ -261,8 +262,8 @@ public function getNavigation() {
 			'top' => [],
 			'apps' => [self::FILTER_PASSMAN =>
 				[
-					'id' => 'passman',
-					'name' => (string)$l->t('Passwords'),
+					'id' => Application::APP_ID,
+					'name' => (string)$l->t(Application::APP_LABEL),
 					'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::FILTER_PASSMAN]),
 				],
 			],
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index df6cd4d7c..201888d42 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -35,7 +35,6 @@
 use OCA\Passman\Service\CronService;
 use OCA\Passman\Service\FileService;
 use OCA\Passman\Service\NotificationService;
-use OCA\Passman\Service\SettingsService;
 use OCA\Passman\Service\ShareService;
 use OCA\Passman\Service\VaultService;
 use OCA\Passman\Utility\Utils;
@@ -44,8 +43,6 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\IDBConnection;
-use OCP\IGroupManager;
 use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Notification\IManager;
@@ -56,6 +53,8 @@
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'passman';
+	public const APP_NAME = 'Passman';
+	public const APP_LABEL = 'Passwords';
 
 	public function __construct() {
 		parent::__construct(self::APP_ID);
@@ -79,8 +78,6 @@ public function register(IRegistrationContext $context): void {
 		$context->registerService('ShareController', function (ContainerInterface $c) {
 			/** @var IUserManager $userManager */
 			$userManager = $c->get(IUserManager::class);
-			/** @var IGroupManager $groupManager */
-			$groupManager = $c->get(IGroupManager::class);
 			/** @var IUserSession $userSession */
 			$userSession = $c->get(IUserSession::class);
 
@@ -88,7 +85,6 @@ public function register(IRegistrationContext $context): void {
 				$c->get('AppName'),
 				$c->get('Request'),
 				$userSession->getUser(),
-				$groupManager,
 				$userManager,
 				$c->get(ActivityService::class),
 				$c->get(VaultService::class),
@@ -96,7 +92,6 @@ public function register(IRegistrationContext $context): void {
 				$c->get(CredentialService::class),
 				$c->get(NotificationService::class),
 				$c->get(FileService::class),
-				$c->get(SettingsService::class),
 				$c->get(IManager::class)
 			);
 		});
@@ -107,8 +102,7 @@ public function register(IRegistrationContext $context): void {
 				$c->get(LoggerInterface::class),
 				$c->get(Utils::class),
 				$c->get(NotificationService::class),
-				$c->get(ActivityService::class),
-				$c->get(IDBConnection::class)
+				$c->get(ActivityService::class)
 			));
 
 		$context->registerService('Logger', fn(ContainerInterface $c) => $c->get(ServerContainer::class)->getLogger());
diff --git a/lib/Controller/CredentialController.php b/lib/Controller/CredentialController.php
index accffb568..432f485a9 100644
--- a/lib/Controller/CredentialController.php
+++ b/lib/Controller/CredentialController.php
@@ -143,8 +143,8 @@ public function updateCredential($changed, $created,
 
 
 		if (!hash_equals($storedCredential->getUserId(), $this->userId)) {
-			$acl = $this->sharingService->getCredentialAclForUser($this->userId, $storedCredential->getGuid());
-			if ($acl->hasPermission(SharingACL::WRITE)) {
+			$sharingAcl = $this->sharingService->getACL($this->userId, $storedCredential->getGuid());
+			if ($sharingAcl->hasPermission(SharingACL::WRITE)) {
 				$credential['shared_key'] = $storedCredential->getSharedKey();
 			} else {
 				return new DataResponse(['msg' => 'Not authorized'], Http::STATUS_UNAUTHORIZED);
@@ -153,7 +153,7 @@ public function updateCredential($changed, $created,
 				return new DataResponse(['msg' => 'Not authorized'], Http::STATUS_UNAUTHORIZED);
 			}
 
-			if (!$acl->hasPermission(SharingACL::FILES)) {
+			if (!$sharingAcl->hasPermission(SharingACL::FILES)) {
 				// what ever the client transmitted, if it has no files permission, the previous files content will be preserved
 				$credential['files'] = $storedCredential->getFiles();
 			}
diff --git a/lib/Controller/FileController.php b/lib/Controller/FileController.php
index 38ad70eb3..3cd02aafa 100644
--- a/lib/Controller/FileController.php
+++ b/lib/Controller/FileController.php
@@ -95,7 +95,7 @@ public function updateFile($file_id, $file_data, $filename) {
 		try {
 			$file = $this->fileService->getFile($file_id, $this->userId);
 		} catch (\Exception) {
-
+			// do just nothing when having problems getting the requested file
 		}
 		if ($file) {
 			if ($file_data) {
diff --git a/lib/Controller/IconController.php b/lib/Controller/IconController.php
index 1fab0b34d..d6d0efe7c 100644
--- a/lib/Controller/IconController.php
+++ b/lib/Controller/IconController.php
@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Exception\DriverException;
 use OC\App\AppManager;
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Service\CredentialService;
 use OCA\Passman\Service\IconService;
 use OCA\Passman\Utility\Utils;
@@ -136,14 +137,14 @@ public function getIcon($base64Url, $credentialId) {
 	 * @NoCSRFRequired
 	 */
 	public function getLocalIconList() {
-		$dir = $this->am->getAppPath('passman');
+		$dir = $this->am->getAppPath(Application::APP_ID);
 		$result = Utils::getDirContents($dir . '/img/icons');
 		$isLowerThanPhp8 = version_compare(phpversion(), '8.0', '<');
 
 		$icons = [];
 		foreach ($result as $icon) {
 			$iconPath = $icon;
-			$path = explode('passman/', (string) $iconPath);
+			$path = explode(Application::APP_ID . '/', (string) $iconPath);
 			$pack = explode('/', $path[1])[2];
 			$mime = mime_content_type($iconPath);
 			if ($mime !== 'directory') {
@@ -152,7 +153,7 @@ public function getLocalIconList() {
 				}
 				$icon = [];
 				$icon['mimetype'] = $mime;
-				$icon['url'] = $this->urlGenerator->linkTo('passman', $path[1]);
+				$icon['url'] = $this->urlGenerator->linkTo(Application::APP_ID, $path[1]);
 				$icon['pack'] = $pack;
 				$icon['data'] = base64_encode(file_get_contents($iconPath));
 				if (!isset($icons[$pack])) {
diff --git a/lib/Controller/InternalController.php b/lib/Controller/InternalController.php
index 6e63209b1..fe0f0b695 100644
--- a/lib/Controller/InternalController.php
+++ b/lib/Controller/InternalController.php
@@ -11,6 +11,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Service\CredentialService;
 use OCA\Passman\Service\NotificationService;
 use OCP\App\IAppManager;
@@ -80,7 +81,7 @@ public function read($credential_id) {
 	 * @NoCSRFRequired
 	 */
 	public function getAppVersion() {
-		return new JSONResponse(['version' => $this->appManager->getAppInfo('passman')["version"]]);
+		return new JSONResponse(['version' => $this->appManager->getAppInfo(Application::APP_ID)["version"]]);
 	}
 
 	/**
@@ -99,12 +100,12 @@ public function generatePerson() {
 	 */
 	public function getSettings() {
 		$settings = [
-			'link_sharing_enabled' => intval($this->config->getAppValue('passman', 'link_sharing_enabled', 1)),
-			'user_sharing_enabled' => intval($this->config->getAppValue('passman', 'user_sharing_enabled', 1)),
-			'vault_key_strength' => intval($this->config->getAppValue('passman', 'vault_key_strength', 3)),
-			'check_version' => intval($this->config->getAppValue('passman', 'check_version', 1)),
-			'https_check' => intval($this->config->getAppValue('passman', 'https_check', 1)),
-			'disable_contextmenu' => intval($this->config->getAppValue('passman', 'disable_contextmenu', 1)),
+			'link_sharing_enabled' => intval($this->config->getAppValue(Application::APP_ID, 'link_sharing_enabled', 1)),
+			'user_sharing_enabled' => intval($this->config->getAppValue(Application::APP_ID, 'user_sharing_enabled', 1)),
+			'vault_key_strength' => intval($this->config->getAppValue(Application::APP_ID, 'vault_key_strength', 3)),
+			'check_version' => intval($this->config->getAppValue(Application::APP_ID, 'check_version', 1)),
+			'https_check' => intval($this->config->getAppValue(Application::APP_ID, 'https_check', 1)),
+			'disable_contextmenu' => intval($this->config->getAppValue(Application::APP_ID, 'disable_contextmenu', 1)),
 		];
 		return new JSONResponse($settings);
 	}
@@ -116,7 +117,7 @@ public function saveSettings($key, $value) {
 		if (is_numeric($value)) {
 			$value = intval($value);
 		}
-		$this->config->setAppValue('passman', $key, $value);
+		$this->config->setAppValue(Application::APP_ID, $key, $value);
 	}
 
 }
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 602681491..b43dbfd59 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -11,6 +11,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Service\SettingsService;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\JSONResponse;
@@ -39,14 +40,14 @@ public function __construct(
 	 * @return TemplateResponse
 	 */
 	public function getForm() {
-		return new TemplateResponse('passman', 'part.admin');
+		return new TemplateResponse(Application::APP_ID, 'part.admin');
 	}
 
 	/**
 	 * @return string the section ID, e.g. 'sharing'
 	 */
 	public function getSection() {
-		return 'passman';
+		return Application::APP_ID;
 	}
 
 	/**
diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
index 02eb203e5..51ac779a1 100644
--- a/lib/Controller/ShareController.php
+++ b/lib/Controller/ShareController.php
@@ -12,13 +12,13 @@
 namespace OCA\Passman\Controller;
 
 use OCA\Passman\Activity;
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Db\File;
 use OCA\Passman\Db\SharingACL;
 use OCA\Passman\Service\ActivityService;
 use OCA\Passman\Service\CredentialService;
 use OCA\Passman\Service\FileService;
 use OCA\Passman\Service\NotificationService;
-use OCA\Passman\Service\SettingsService;
 use OCA\Passman\Service\ShareService;
 use OCA\Passman\Service\VaultService;
 use OCA\Passman\Utility\NotFoundJSONResponse;
@@ -28,7 +28,6 @@
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\NotFoundResponse;
-use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\Notification\IManager;
@@ -42,7 +41,6 @@ public function __construct(
 		$AppName,
 		IRequest $request,
 		private $userId,
-		private readonly IGroupManager $groupManager,
 		private readonly IUserManager $userManager,
 		private readonly ActivityService $activityService,
 		private readonly VaultService $vaultService,
@@ -50,7 +48,6 @@ public function __construct(
 		private readonly CredentialService $credentialService,
 		private readonly NotificationService $notificationService,
 		private readonly FileService $fileService,
-		private readonly SettingsService $settings,
 		private readonly IManager $manager,
 	) {
 		parent::__construct(
@@ -127,7 +124,7 @@ public function applyIntermediateShare($item_id, $item_guid, $vaults, $permissio
 
 		$acl = null;
 		try {
-			$acl = $this->shareService->getCredentialAclForUser($first_vault['user_id'], $item_guid);
+			$acl = $this->shareService->getACL($first_vault['user_id'], $item_guid);
 		} catch (\Exception) {
 			// no need to catch this
 		}
@@ -211,7 +208,7 @@ public function unshareCredentialFromUser($item_guid, $user_id) {
 		$acl = null;
 		$sr = null;
 		try {
-			$acl = $this->shareService->getCredentialAclForUser($user_id, $item_guid);
+			$acl = $this->shareService->getACL($user_id, $item_guid);
 		} catch (\Exception) {
 			// no need to handle this
 		}
@@ -225,7 +222,7 @@ public function unshareCredentialFromUser($item_guid, $user_id) {
 		if ($sr) {
 			$this->shareService->cleanItemRequestsForUser($sr);
 			$notification = $this->manager->createNotification();
-			$notification->setApp('passman')
+			$notification->setApp(Application::APP_ID)
 				->setObject('passman_share_request', $sr->getId())
 				->setUser($user_id);
 			$this->manager->markProcessed($notification);
@@ -276,7 +273,7 @@ public function savePendingRequest($item_guid, $target_vault_guid, $final_shared
 		}
 
 		$notification = $this->manager->createNotification();
-		$notification->setApp('passman')
+		$notification->setApp(Application::APP_ID)
 			->setObject('passman_share_request', $sr->getId())
 			->setUser($this->userId->getUID());
 		$this->manager->markProcessed($notification);
@@ -380,7 +377,7 @@ public function deleteShareRequest($share_request_id) {
 
 
 			$notification = $this->manager->createNotification();
-			$notification->setApp('passman')
+			$notification->setApp(Application::APP_ID)
 				->setObject('passman_share_request', $share_request_id)
 				->setUser($this->userId->getUID());
 			$this->manager->markProcessed($notification);
@@ -538,7 +535,7 @@ public function updateSharedCredentialACL($item_guid, $user_id, $permission) {
 				$acl->setPermissions($permission);
 				return $this->shareService->updateCredentialACL($acl);
 			} catch (\Exception) {
-
+				// handled by the ($acl === null) condition below
 			}
 
 			if ($acl === null) {
diff --git a/lib/Controller/VaultController.php b/lib/Controller/VaultController.php
index 23a9991b9..0bf8f1cf1 100644
--- a/lib/Controller/VaultController.php
+++ b/lib/Controller/VaultController.php
@@ -14,8 +14,6 @@
 use OCA\Passman\Db\Credential;
 use OCA\Passman\Service\CredentialService;
 use OCA\Passman\Service\DeleteVaultRequestService;
-use OCA\Passman\Service\FileService;
-use OCA\Passman\Service\SettingsService;
 use OCA\Passman\Service\VaultService;
 use OCA\Passman\Utility\NotFoundJSONResponse;
 use OCP\AppFramework\ApiController;
@@ -32,8 +30,6 @@ public function __construct(
 		private readonly VaultService $vaultService,
 		private readonly CredentialService $credentialService,
 		private readonly DeleteVaultRequestService $deleteVaultRequestService,
-		private readonly SettingsService $settings,
-		private readonly FileService $fileService,
 		private readonly LoggerInterface $logger,
 	) {
 		parent::__construct(
diff --git a/lib/Notifier.php b/lib/Notifier.php
index 481451084..1d3f5d9a3 100644
--- a/lib/Notifier.php
+++ b/lib/Notifier.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman;
 
+use OCA\Passman\AppInfo\Application;
 use OCP\IURLGenerator;
 use OCP\L10N\IFactory;
 use OCP\Notification\INotification;
@@ -41,13 +42,13 @@ public function __construct(
 	 * @param string $languageCode The code of the language that should be used to prepare the notification
 	 */
 	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'passman') {
+		if ($notification->getApp() !== Application::APP_ID) {
 			// Not my app => throw
 			throw new \InvalidArgumentException();
 		}
 
 		// Read the language from the notification
-		$l = $this->factory->get('passman', $languageCode);
+		$l = $this->factory->get(Application::APP_ID, $languageCode);
 
 		// Set the icon for the notification
 		$notification->setIcon(
@@ -124,7 +125,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 	 * @return string
 	 */
 	public function getID(): string {
-		return 'passman';
+		return Application::APP_ID;
 	}
 
 	/**
@@ -133,6 +134,6 @@ public function getID(): string {
 	 * @return string
 	 */
 	public function getName(): string {
-		return $this->factory->get('passman')->t('Passwords');
+		return $this->factory->get(Application::APP_ID)->t(Application::APP_LABEL);
 	}
 }
diff --git a/lib/Search/Provider.php b/lib/Search/Provider.php
index 25ee5c3a7..180b0e8b2 100644
--- a/lib/Search/Provider.php
+++ b/lib/Search/Provider.php
@@ -56,7 +56,7 @@ public function getId(): string {
 	}
 
 	public function getName(): string {
-		return $this->l10n->t('Passman');
+		return $this->l10n->t(Application::APP_NAME);
 	}
 
 	public function getOrder(string $route, array $routeParameters): int {
@@ -89,7 +89,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 									\sprintf("Part of Passman vault %s", $vault->getName()),
 									sprintf(
 										"%s#/vault/%s?show=%s&showv=%s",
-										$this->urlGenerator->linkToRoute('passman.Page.index'),
+										$this->urlGenerator->linkToRoute(Application::APP_ID . '.Page.index'),
 										$vault->getGuid(),
 										$credential->getGuid(),
 										$vault->getGuid()	// need to pass vault guid again, to preserve it if credential.js rewrites path to /
diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php
index acbcdf4f7..a37295137 100644
--- a/lib/Service/ActivityService.php
+++ b/lib/Service/ActivityService.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Service;
 
+use OCA\Passman\AppInfo\Application;
 use OCP\IConfig;
 use OCP\AppFramework\Db\DoesNotExistException;
 
@@ -54,7 +55,7 @@ public function add($subject, $subjectParams = [],
 		if($user) {
 			$activity = $this->manager->generateEvent();
 			$activity->setType($type);
-			$activity->setApp('passman');
+			$activity->setApp(Application::APP_ID);
 			$activity->setSubject($subject, $subjectParams);
 			$activity->setLink($link);
 			$activity->setAffectedUser($user);
diff --git a/lib/Service/CredentialService.php b/lib/Service/CredentialService.php
index f028b25c5..dcdb89549 100644
--- a/lib/Service/CredentialService.php
+++ b/lib/Service/CredentialService.php
@@ -24,6 +24,7 @@
 namespace OCA\Passman\Service;
 
 use OCA\Passman\Activity;
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Db\Credential;
 use OCA\Passman\Db\CredentialMapper;
 use OCA\Passman\Db\SharingACL;
@@ -238,7 +239,7 @@ public function getDirectEditLink(Credential $credential): string {
 		return $this->urlGenerator->getAbsoluteURL(
 			$this->urlGenerator->linkTo(
 				'',
-				'index.php/apps/passman/#/vault/' . $vault->getGuid() . '/edit/' . $credential->getGuid()
+				'index.php/apps/' . Application::APP_ID . '/#/vault/' . $vault->getGuid() . '/edit/' . $credential->getGuid()
 			)
 		);
 	}
diff --git a/lib/Service/CronService.php b/lib/Service/CronService.php
index c68b62642..2e937180b 100644
--- a/lib/Service/CronService.php
+++ b/lib/Service/CronService.php
@@ -24,6 +24,7 @@
 namespace OCA\Passman\Service;
 
 use OCA\Passman\Activity;
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Db\Credential;
 use OCA\Passman\Utility\Utils;
 use OCP\DB\Exception;
@@ -45,10 +46,10 @@ public function expireCredentials() {
 		$expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime());
 		foreach ($expired_credentials as $credential) {
 			try {
-				$this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', ['app' => 'passman']);
+				$this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', ['app' => Application::APP_ID]);
 				if (!$this->notificationService->hasCredentialExpirationNotification($credential)) {
 				$link = $this->credentialService->getDirectEditLink($credential);
-					$this->logger->debug($credential->getLabel() . ' is expired, adding notification!', ['app' => 'passman']);
+					$this->logger->debug($credential->getLabel() . ' is expired, adding notification!', ['app' => Application::APP_ID]);
 					$this->activityService->add(
 						Activity::SUBJECT_ITEM_EXPIRED, [$credential->getLabel(), $credential->getUserId()],
 						'', [],
@@ -56,7 +57,7 @@ public function expireCredentials() {
 					$this->notificationService->credentialExpiredNotification($credential, $link);
 				}
 			} catch (Exception $exception) {
-				$this->logger->error('Error while creating a notification: ' . $exception->getMessage(), ['app' => 'passman']);
+				$this->logger->error('Error while creating a notification: ' . $exception->getMessage(), ['app' => Application::APP_ID]);
 			}
 		}
 	}
diff --git a/lib/Service/NotificationService.php b/lib/Service/NotificationService.php
index df07b9bd4..526891d08 100644
--- a/lib/Service/NotificationService.php
+++ b/lib/Service/NotificationService.php
@@ -24,12 +24,15 @@
 namespace OCA\Passman\Service;
 
 
+use OCA\Passman\AppInfo\Application;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IURLGenerator;
 use OCP\Notification\IManager;
 
 class NotificationService {
+    public const APP_URL_PREFIX = 'index.php/apps/' . Application::APP_ID;
+
 	public function __construct(
 		private readonly IManager $manager,
 		private readonly IURLGenerator $urlGenerator,
@@ -37,8 +40,8 @@ public function __construct(
 	) {
 	}
 
-	function credentialExpiredNotification($credential, $link) {
-		$api = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'index.php/apps/passman'));
+	public function credentialExpiredNotification($credential, $link) {
+		$api = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', self::APP_URL_PREFIX));
 		$notification = $this->manager->createNotification();
 		$remindAction = $notification->createAction();
 		$remindAction->setLabel('remind')
@@ -48,7 +51,7 @@ function credentialExpiredNotification($credential, $link) {
 		$declineAction->setLabel('ignore')
 			->setLink($api . '/api/internal/notifications/read/' . $credential->getId(), 'DELETE');
 
-		$notification->setApp('passman')
+		$notification->setApp(Application::APP_ID)
 			->setUser($credential->getUserId())
 			->setDateTime(new \DateTime())
 			->setObject('credential', $credential->getId()) // Set notification type and id
@@ -61,16 +64,16 @@ function credentialExpiredNotification($credential, $link) {
 	}
 
 
-	function credentialSharedNotification($data) {
-		$link = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'index.php/apps/passman/#/'));
-		$api = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'index.php/apps/passman'));
+	public function credentialSharedNotification($data) {
+		$link = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', self::APP_URL_PREFIX . '/#/'));
+		$api = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', self::APP_URL_PREFIX));
 		$notification = $this->manager->createNotification();
 
 		$declineAction = $notification->createAction();
 		$declineAction->setLabel('decline')
 			->setLink($api . '/api/v2/sharing/decline/' . $data['req_id'], 'DELETE');
 
-		$notification->setApp('passman')
+		$notification->setApp(Application::APP_ID)
 			->setUser($data['target_user'])
 			->setDateTime(new \DateTime())
 			->setObject('passman_share_request', $data['req_id']) // type and id
@@ -82,9 +85,9 @@ function credentialSharedNotification($data) {
 	}
 
 
-	function credentialDeclinedSharedNotification($data) {
+	public function credentialDeclinedSharedNotification($data) {
 		$notification = $this->manager->createNotification();
-		$notification->setApp('passman')
+		$notification->setApp(Application::APP_ID)
 			->setUser($data['target_user'])
 			->setDateTime(new \DateTime())
 			->setObject('passman_share_request', $data['req_id']) // type and id
@@ -93,9 +96,9 @@ function credentialDeclinedSharedNotification($data) {
 	}
 
 
-	function credentialAcceptedSharedNotification($data) {
+	public function credentialAcceptedSharedNotification($data) {
 		$notification = $this->manager->createNotification();
-		$notification->setApp('passman')
+		$notification->setApp(Application::APP_ID)
 			->setUser($data['target_user'])
 			->setDateTime(new \DateTime())
 			->setObject('passman_share_request', $data['req_id']) // type and id
@@ -103,7 +106,7 @@ function credentialAcceptedSharedNotification($data) {
 		$this->manager->notify($notification);
 	}
 
-	function hasCredentialExpirationNotification($credential): bool {
+	public function hasCredentialExpirationNotification($credential): bool {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from('notifications')
@@ -112,7 +115,7 @@ function hasCredentialExpirationNotification($credential): bool {
 			return $qb->executeQuery()->rowCount() !== 0;
 	}
 
-	function deleteNotificationsOfCredential($credential) {
+	public function deleteNotificationsOfCredential($credential) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->delete('notifications')
 			->where($qb->expr()->eq('object_id', $qb->createNamedParameter($credential->getId(), IQueryBuilder::PARAM_INT)))
@@ -120,9 +123,9 @@ function deleteNotificationsOfCredential($credential) {
 		return $qb->executeStatement();
 	}
 
-	function markNotificationOfCredentialAsProcessed(int $credential_id, string $user_id): void {
+	public function markNotificationOfCredentialAsProcessed(int $credential_id, string $user_id): void {
 		$notification = $this->manager->createNotification();
-		$notification->setApp('passman')
+		$notification->setApp(Application::APP_ID)
 			->setObject('credential', $credential_id)
 			->setUser($user_id);
 		$this->manager->markProcessed($notification);
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index f7da1f94a..0c0f07ad8 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Service;
 
+use OCA\Passman\AppInfo\Application;
 use OCP\IConfig;
 
 
@@ -47,16 +48,16 @@ public function __construct(
 		private $appName,
 	) {
 		$this->settings = [
-			'link_sharing_enabled' => intval($this->config->getAppValue('passman', 'link_sharing_enabled', 1)),
-			'user_sharing_enabled' => intval($this->config->getAppValue('passman', 'user_sharing_enabled', 1)),
-			'vault_key_strength' => intval($this->config->getAppValue('passman', 'vault_key_strength', 3)),
-			'check_version' => intval($this->config->getAppValue('passman', 'check_version', 1)),
-			'https_check' => intval($this->config->getAppValue('passman', 'https_check', 1)),
-			'disable_contextmenu' => intval($this->config->getAppValue('passman', 'disable_contextmenu', 1)),
-			'server_side_encryption' => $this->config->getAppValue('passman', 'server_side_encryption', 'aes-256-cbc'),
-			'rounds_pbkdf2_stretching' => $this->config->getAppValue('passman', 'rounds_pbkdf2_stretching', 100),
-			'disable_debugger' => $this->config->getAppValue('passman', 'disable_debugger', 1),
-			'enable_global_search' => $this->config->getAppValue('passman', 'enable_global_search', 0),
+			'link_sharing_enabled' => intval($this->config->getAppValue(Application::APP_ID, 'link_sharing_enabled', 1)),
+			'user_sharing_enabled' => intval($this->config->getAppValue(Application::APP_ID, 'user_sharing_enabled', 1)),
+			'vault_key_strength' => intval($this->config->getAppValue(Application::APP_ID, 'vault_key_strength', 3)),
+			'check_version' => intval($this->config->getAppValue(Application::APP_ID, 'check_version', 1)),
+			'https_check' => intval($this->config->getAppValue(Application::APP_ID, 'https_check', 1)),
+			'disable_contextmenu' => intval($this->config->getAppValue(Application::APP_ID, 'disable_contextmenu', 1)),
+			'server_side_encryption' => $this->config->getAppValue(Application::APP_ID, 'server_side_encryption', 'aes-256-cbc'),
+			'rounds_pbkdf2_stretching' => $this->config->getAppValue(Application::APP_ID, 'rounds_pbkdf2_stretching', 100),
+			'disable_debugger' => $this->config->getAppValue(Application::APP_ID, 'disable_debugger', 1),
+			'enable_global_search' => $this->config->getAppValue(Application::APP_ID, 'enable_global_search', 0),
 			'settings_loaded' => 1
 		];
 	}
@@ -78,7 +79,7 @@ public function getAppSettings() {
 	 * @return mixed
 	 */
 	public function getAppSetting($key, $default_value = null) {
-		$value = $this->settings[$key] ?: $this->config->getAppValue('passman', $key, $default_value);
+		$value = $this->settings[$key] ?: $this->config->getAppValue(Application::APP_ID, $key, $default_value);
 		if (in_array($key, $this->numeric_settings)) {
 			$value = intval($value);
 		}
@@ -94,7 +95,7 @@ public function getAppSetting($key, $default_value = null) {
 	 */
 	public function setAppSetting($key, $value) {
 		$this->settings[$key] = $value;
-		$this->config->setAppValue('passman', $key, $value);
+		$this->config->setAppValue(Application::APP_ID, $key, $value);
 	}
 
 	/**
diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index 299257ce7..20029152d 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -24,6 +24,7 @@
 namespace OCA\Passman\Service;
 
 
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Db\CredentialMapper;
 use OCA\Passman\Db\CredentialRevision;
 use OCA\Passman\Db\ShareRequest;
@@ -43,7 +44,7 @@ public function __construct(
 		private readonly CredentialMapper $credential,
 		private readonly CredentialRevisionService $revisions,
 		private readonly EncryptService $encryptService,
-		private readonly IManager $IManager,
+		private readonly IManager $manager,
 	) {
 	}
 
@@ -292,19 +293,6 @@ public function getCredentialPendingAclList(string $item_guid): array {
 		return $this->shareRequest->getRequestsByItemGuid($item_guid);
 	}
 
-	/**
-	 * Gets the ACL on the credential for the user
-	 *
-	 * @param string|null $user_id
-	 * @param string $item_guid
-	 * @return SharingACL
-	 * @throws DoesNotExistException
-	 * @throws MultipleObjectsReturnedException
-	 */
-	public function getCredentialAclForUser(?string $user_id, string $item_guid): SharingACL {
-		return $this->sharingACL->getItemACL($user_id, $item_guid);
-	}
-
 	/**
 	 * Get pending share requests by guid
 	 *
@@ -389,11 +377,11 @@ public function unshareCredential(string $item_guid): void {
 		}
 		foreach ($request_list as $request) {
 			$this->deleteShareRequest($request);
-			$notification = $this->IManager->createNotification();
-			$notification->setApp('passman')
+			$notification = $this->manager->createNotification();
+			$notification->setApp(Application::APP_ID)
 				->setObject('passman_share_request', $request->getId())
 				->setUser($request->getTargetUserId());
-			$this->IManager->markProcessed($notification);
+			$this->manager->markProcessed($notification);
 		}
 	}
 }
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index e298af9a5..46201ebe7 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -25,6 +25,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
+use OCA\Passman\AppInfo\Application;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
@@ -39,6 +40,7 @@ class Admin implements ISettings {
 	 * @param IConfig $config
 	 * @param IL10N $l
 	 * @param IAppManager $appManager
+	 * @param LoggerInterface $logger
 	 */
 	public function __construct(
 		protected IConfig $config,
@@ -53,8 +55,8 @@ public function __construct(
 	 */
 	public function getForm(): TemplateResponse {
 		$hasInternetConnection = $this->config->getSystemValue('has_internet_connection', true);
-		$checkVersion = $this->config->getAppValue('passman', 'check_version', '1') === '1';
-		$localVersion = $this->appManager->getAppInfo('passman')["version"];
+		$checkVersion = $this->config->getAppValue(Application::APP_ID, 'check_version', '1') === '1';
+		$localVersion = $this->appManager->getAppInfo(Application::APP_ID)["version"];
 		$githubVersion = $this->l->t('Unable to get version info');
 		$githubReleaseUrl = null;
 
@@ -83,7 +85,7 @@ public function getForm(): TemplateResponse {
 			}
 		}
 
-		return new TemplateResponse('passman', 'admin', [
+		return new TemplateResponse(Application::APP_ID, 'admin', [
 			'localVersion' => $localVersion,
 			'githubVersion' => $githubVersion,
 			'githubReleaseUrl' => $githubReleaseUrl,
@@ -96,7 +98,7 @@ public function getForm(): TemplateResponse {
 	 * @return string
 	 */
 	public function getSection(): string {
-		return 'passman';
+		return Application::APP_ID;
 	}
 
 	/**
diff --git a/lib/Settings/AdminSection.php b/lib/Settings/AdminSection.php
index ef8f47a05..a74a3ebd7 100644
--- a/lib/Settings/AdminSection.php
+++ b/lib/Settings/AdminSection.php
@@ -6,6 +6,7 @@
  */
 namespace OCA\Passman\Settings;
 
+use OCA\Passman\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
@@ -35,7 +36,7 @@ public function getID() {
 	 * @return string
 	 */
 	public function getName() {
-		return $this->l->t('Passman');
+		return $this->l->t(Application::APP_NAME);
 	}
 
 	/**
diff --git a/sass/menu.scss b/sass/menu.scss
index f803e8036..5590ec5e4 100644
--- a/sass/menu.scss
+++ b/sass/menu.scss
@@ -247,15 +247,11 @@
   background: none;
   background-position-x: 0%;
   background-position-y: 0%;
-  background-repeat: repeat;
-  background-image: none;
-  background-size: auto;
   background-image: var(--icon-triangle-s-dark);
   background-size: 16px;
   background-repeat: no-repeat;
   background-position: center;
   border: none;
-  border-radius: 0;
   outline: none !important;
   box-shadow: none;
   content: " ";
@@ -273,10 +269,6 @@
 #app-navigation:not(.vue) > ul > li > .app-navigation-entry-bullet + a, #app-navigation:not(.vue) > ul > li > ul > li > .app-navigation-entry-bullet + a {
   background: rgba(0,0,0,0) !important;
 }
-#app-navigation:not(.vue) > ul > li > a.svg, #app-navigation:not(.vue) > ul > li > ul > li > a.svg {
-  padding: 0 12px 0 44px;
-  padding-left: 44px;
-}
 #app-navigation:not(.vue) > ul > li > .app-navigation-entry-bullet, #app-navigation:not(.vue) > ul > li > ul > li > .app-navigation-entry-bullet {
   position: absolute;
   display: block;
diff --git a/sass/public-page.scss b/sass/public-page.scss
index 09d9c8b3e..36f75235c 100644
--- a/sass/public-page.scss
+++ b/sass/public-page.scss
@@ -95,7 +95,6 @@ header {
 }
 
 .credential_field {
-  /* overflow: hidden; */
   display: flex;
   flex-wrap: wrap;
   align-items: center;
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 000000000..027f378f9
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,10 @@
+sonar.projectKey=Passman
+sonar.qualitygate.wait=true
+sonar.sources=./
+sonar.exclusions=./l10n,./tests,./css
+sonar.language=php
+
+sonar.issue.ignore.multicriteria=e1
+# Ignore "Hard-coded credentials are security-sensitive"
+sonar.issue.ignore.multicriteria.e1.ruleKey=javascript:S2068
+sonar.issue.ignore.multicriteria.e1.resourceKey=l10n/*
diff --git a/templates/_config.php b/templates/_config.php
new file mode 100644
index 000000000..d9bb30b47
--- /dev/null
+++ b/templates/_config.php
@@ -0,0 +1,6 @@
+<?php
+
+class MyAppTemplateConfig
+{
+    public const APP_ID = 'passman';
+}
diff --git a/templates/admin.php b/templates/admin.php
index bee8264c9..cb95af3a0 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -2,10 +2,12 @@
 /** @var \OCP\IL10N $l */
 /** @var array $_ */
 
-script('passman', 'settings-admin');
+include_once '_config.php';
 
-style('passman', 'admin');
-style('passman', 'vendor/font-awesome/font-awesome.min');
+script(MyAppTemplateConfig::APP_ID, 'settings-admin');
+
+style(MyAppTemplateConfig::APP_ID, 'admin');
+style(MyAppTemplateConfig::APP_ID, 'vendor/font-awesome/font-awesome.min');
 ?>
 
 <div id="passwordSharingSettings" class="followup section">
diff --git a/templates/bookmarklet.php b/templates/bookmarklet.php
index 4f9088373..6ce1f6e5f 100644
--- a/templates/bookmarklet.php
+++ b/templates/bookmarklet.php
@@ -1,85 +1,89 @@
 <?php
+
+include_once '_config.php';
+
 /*
  * Javascripts
  */
 /*build-js-start*/
-script('passman', 'vendor/angular/angular.min');
-script('passman', 'vendor/angular-animate/angular-animate.min');
-script('passman', 'vendor/angular-cookies/angular-cookies.min');
-script('passman', 'vendor/angular-resource/angular-resource.min');
-script('passman', 'vendor/angular-route/angular-route.min');
-script('passman', 'vendor/angular-sanitize/angular-sanitize.min');
-script('passman', 'vendor/angular-touch/angular-touch.min');
-script('passman', 'vendor/angular-local-storage/angular-local-storage.min');
-script('passman', 'vendor/angular-off-click/angular-off-click.min');
-script('passman', 'vendor/angularjs-datetime-picker/angularjs-datetime-picker.min');
-script('passman', 'vendor/angular-translate/angular-translate.min');
-script('passman', 'vendor/angular-translate/angular-translate-loader-url.min');
-script('passman', 'vendor/ng-password-meter/ng-password-meter');
-script('passman', 'vendor/sjcl/sjcl');
-script('passman', 'vendor/zxcvbn/zxcvbn');
-script('passman', 'vendor/ng-clipboard/clipboard.min');
-script('passman', 'vendor/ng-clipboard/ngclipboard');
-script('passman', 'vendor/ng-tags-input/ng-tags-input.min');
-script('passman', 'vendor/angular-xeditable/xeditable.min');
-script('passman', 'vendor/sha/sha');
-script('passman', 'vendor/llqrcode/llqrcode');
-script('passman', 'vendor/forge.0.6.9.min');
-script('passman', 'vendor/download');
-script('passman', 'vendor/ui-sortable/sortable');
-script('passman', 'vendor/papa-parse/papaparse.min');
-script('passman', 'lib/promise');
-script('passman', 'lib/crypto_wrap');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular/angular.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-animate/angular-animate.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-cookies/angular-cookies.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-resource/angular-resource.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-route/angular-route.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-sanitize/angular-sanitize.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-touch/angular-touch.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-local-storage/angular-local-storage.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-off-click/angular-off-click.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angularjs-datetime-picker/angularjs-datetime-picker.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-translate/angular-translate.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-translate/angular-translate-loader-url.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-password-meter/ng-password-meter');
+script(MyAppTemplateConfig::APP_ID, 'vendor/sjcl/sjcl');
+script(MyAppTemplateConfig::APP_ID, 'vendor/zxcvbn/zxcvbn');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-clipboard/clipboard.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-clipboard/ngclipboard');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-tags-input/ng-tags-input.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-xeditable/xeditable.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/sha/sha');
+script(MyAppTemplateConfig::APP_ID, 'vendor/llqrcode/llqrcode');
+script(MyAppTemplateConfig::APP_ID, 'vendor/forge.0.6.9.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/download');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ui-sortable/sortable');
+script(MyAppTemplateConfig::APP_ID, 'vendor/papa-parse/papaparse.min');
+script(MyAppTemplateConfig::APP_ID, 'lib/promise');
+script(MyAppTemplateConfig::APP_ID, 'lib/crypto_wrap');
 
 
-script('passman', 'app/app');
-script('passman', 'templates');
-script('passman', 'app/controllers/edit_credential');
-script('passman', 'app/controllers/bookmarklet');
-script('passman', 'app/filters/range');
-script('passman', 'app/filters/propsfilter');
-script('passman', 'app/filters/byte');
-script('passman', 'app/filters/tagfilter');
-script('passman', 'app/filters/escapeHTML');
-script('passman', 'app/filters/as');
-script('passman', 'app/filters/toHHMMSS');
-script('passman', 'app/services/vaultservice');
-script('passman', 'app/services/credentialservice');
-script('passman', 'app/services/settingsservice');
-script('passman', 'app/services/fileservice');
-script('passman', 'app/services/encryptservice');
-script('passman', 'app/services/tagservice');
-script('passman', 'app/services/notificationservice');
-script('passman', 'app/services/shareservice');
-script('passman', 'app/directives/passwordgen');
-script('passman', 'app/directives/fileselect');
-script('passman', 'app/directives/progressbar');
-script('passman', 'app/directives/otp');
-script('passman', 'app/directives/qrreader');
-script('passman', 'app/directives/tooltip');
-script('passman', 'app/directives/use-theme');
-script('passman', 'app/directives/credentialfield');
-script('passman', 'app/directives/ngenter');
-script('passman', 'app/directives/autoscroll');
-script('passman', 'app/directives/clickselect');
-script('passman', 'app/directives/colorfromstring');
+script(MyAppTemplateConfig::APP_ID, 'app/app');
+script(MyAppTemplateConfig::APP_ID, 'templates');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/edit_credential');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/bookmarklet');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/range');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/propsfilter');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/byte');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/tagfilter');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/escapeHTML');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/as');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/toHHMMSS');
+script(MyAppTemplateConfig::APP_ID, 'app/services/vaultservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/credentialservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/settingsservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/fileservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/encryptservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/tagservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/notificationservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/shareservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/urlservice');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/passwordgen');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/fileselect');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/progressbar');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/otp');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/qrreader');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/tooltip');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/use-theme');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/credentialfield');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/ngenter');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/autoscroll');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/clickselect');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/colorfromstring');
 /*build-js-end*/
 
 /*
  * Styles
  */
 /*build-css-start*/
-style('passman', 'vendor/ng-password-meter/ng-password-meter');
-style('passman', 'vendor/bootstrap/bootstrap.min');
-style('passman', 'vendor/bootstrap/bootstrap-theme.min');
-style('passman', 'vendor/font-awesome/font-awesome.min');
-style('passman', 'vendor/angular-xeditable/xeditable.min');
-style('passman', 'vendor/ng-tags-input/ng-tags-input.min');
-style('passman', 'vendor/angularjs-datetime-picker/angularjs-datetime-picker');
-style('passman', 'app');
+style(MyAppTemplateConfig::APP_ID, 'vendor/ng-password-meter/ng-password-meter');
+style(MyAppTemplateConfig::APP_ID, 'vendor/bootstrap/bootstrap.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/bootstrap/bootstrap-theme.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/font-awesome/font-awesome.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/angular-xeditable/xeditable.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/ng-tags-input/ng-tags-input.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/angularjs-datetime-picker/angularjs-datetime-picker');
+style(MyAppTemplateConfig::APP_ID, 'app');
 /*build-css-end*/
 
-style('passman', 'bookmarklet');
+style(MyAppTemplateConfig::APP_ID, 'bookmarklet');
 
 ?>
 
diff --git a/templates/main.php b/templates/main.php
index 2200a8184..d2ff5f7f7 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -1,122 +1,125 @@
 <?php
 
+include_once '_config.php';
+
 /*
  * Javascripts
  */
 /*build-js-start*/
-script('passman', 'vendor/angular/angular.min');
-script('passman', 'vendor/angular-animate/angular-animate.min');
-script('passman', 'vendor/angular-cookies/angular-cookies.min');
-script('passman', 'vendor/angular-resource/angular-resource.min');
-script('passman', 'vendor/angular-route/angular-route.min');
-script('passman', 'vendor/angular-sanitize/angular-sanitize.min');
-script('passman', 'vendor/angular-touch/angular-touch.min');
-script('passman', 'vendor/angular-local-storage/angular-local-storage.min');
-script('passman', 'vendor/angular-off-click/angular-off-click.min');
-script('passman', 'vendor/angularjs-datetime-picker/angularjs-datetime-picker.min');
-script('passman', 'vendor/angular-translate/angular-translate.min');
-script('passman', 'vendor/angular-translate/angular-translate-loader-url.min');
-script('passman', 'vendor/ng-password-meter/ng-password-meter');
-script('passman', 'vendor/sjcl/sjcl');
-script('passman', 'vendor/zxcvbn/zxcvbn');
-script('passman', 'vendor/ng-clipboard/clipboard.min');
-script('passman', 'vendor/ng-clipboard/ngclipboard');
-script('passman', 'vendor/ng-tags-input/ng-tags-input.min');
-script('passman', 'vendor/angular-xeditable/xeditable.min');
-script('passman', 'vendor/sha/sha');
-script('passman', 'vendor/llqrcode/llqrcode');
-script('passman', 'vendor/forge.0.6.9.min');
-script('passman', 'vendor/download');
-script('passman', 'vendor/ui-sortable/sortable');
-script('passman', 'vendor/papa-parse/papaparse.min');
-script('passman', 'lib/promise');
-script('passman', 'lib/crypto_wrap');
-script('passman', 'lib/otpauth.umd');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular/angular.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-animate/angular-animate.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-cookies/angular-cookies.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-resource/angular-resource.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-route/angular-route.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-sanitize/angular-sanitize.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-touch/angular-touch.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-local-storage/angular-local-storage.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-off-click/angular-off-click.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angularjs-datetime-picker/angularjs-datetime-picker.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-translate/angular-translate.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-translate/angular-translate-loader-url.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-password-meter/ng-password-meter');
+script(MyAppTemplateConfig::APP_ID, 'vendor/sjcl/sjcl');
+script(MyAppTemplateConfig::APP_ID, 'vendor/zxcvbn/zxcvbn');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-clipboard/clipboard.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-clipboard/ngclipboard');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-tags-input/ng-tags-input.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-xeditable/xeditable.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/sha/sha');
+script(MyAppTemplateConfig::APP_ID, 'vendor/llqrcode/llqrcode');
+script(MyAppTemplateConfig::APP_ID, 'vendor/forge.0.6.9.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/download');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ui-sortable/sortable');
+script(MyAppTemplateConfig::APP_ID, 'vendor/papa-parse/papaparse.min');
+script(MyAppTemplateConfig::APP_ID, 'lib/promise');
+script(MyAppTemplateConfig::APP_ID, 'lib/crypto_wrap');
+script(MyAppTemplateConfig::APP_ID, 'lib/otpauth.umd');
 
 
-script('passman', 'app/app');
-script('passman', 'templates');
-script('passman', 'app/controllers/main');
-script('passman', 'app/controllers/menu');
-script('passman', 'app/controllers/vault');
-script('passman', 'app/controllers/credential');
-script('passman', 'app/controllers/edit_credential');
-script('passman', 'app/controllers/share');
-script('passman', 'app/controllers/share_settings');
-script('passman', 'app/controllers/revision');
-script('passman', 'app/controllers/settings');
-script('passman', 'app/controllers/import');
-script('passman', 'app/controllers/export');
-script('passman', 'app/controllers/generic-csv-importer');
-script('passman', 'app/controllers/vaultreqdeletion');
-script('passman', 'app/filters/range');
-script('passman', 'app/filters/propsfilter');
-script('passman', 'app/filters/byte');
-script('passman', 'app/filters/tagfilter');
-script('passman', 'app/filters/escapeHTML');
-script('passman', 'app/filters/as');
-script('passman', 'app/filters/credentialsearch');
-script('passman', 'app/filters/toHHMMSS');
-script('passman', 'app/services/cacheservice');
-script('passman', 'app/services/vaultservice');
-script('passman', 'app/services/credentialservice');
-script('passman', 'app/services/settingsservice');
-script('passman', 'app/services/fileservice');
-script('passman', 'app/services/encryptservice');
-script('passman', 'app/services/iconservice');
-script('passman', 'app/services/tagservice');
-script('passman', 'app/services/notificationservice');
-script('passman', 'app/services/shareservice');
-script('passman', 'app/services/searchboxexpanderservice');
-script('passman', 'app/factory/sharingacl');
-script('passman', 'app/directives/passwordgen');
-script('passman', 'app/directives/fileselect');
-script('passman', 'app/directives/progressbar');
-script('passman', 'app/directives/otp');
-script('passman', 'app/directives/qrreader');
-script('passman', 'app/directives/tooltip');
-script('passman', 'app/directives/use-theme');
-script('passman', 'app/directives/credentialfield');
-script('passman', 'app/directives/ngenter');
-script('passman', 'app/directives/autoscroll');
-script('passman', 'app/directives/clickselect');
-script('passman', 'app/directives/colorfromstring');
-script('passman', 'app/directives/credentialcounter');
-script('passman', 'app/directives/clearbutton2');
-script('passman', 'app/directives/credentialtemplate');
-script('passman', 'app/directives/clickdisable');
-script('passman', 'app/directives/icon');
-script('passman', 'app/directives/iconpicker');
-script('passman', 'importers/import-main');
-script('passman', 'importers/importer-keepasscsv');
-script('passman', 'importers/importer-lastpasscsv');
-script('passman', 'importers/importer-dashlanecsv');
-script('passman', 'importers/importer-zohocsv');
-script('passman', 'importers/importer-passmanjson');
-script('passman', 'importers/importer-ocpasswords');
-script('passman', 'importers/importer-clipperz');
-script('passman', 'importers/importer-teampass');
-script('passman', 'importers/importer-enpass');
-script('passman', 'importers/importer-passpackcsv');
-script('passman', 'importers/importer-randomdata');
-script('passman', 'importers/importer-padlock');
-script('passman', 'exporters/exporter-main');
-script('passman', 'exporters/exporter-csv');
-script('passman', 'exporters/exporter-json');
+script(MyAppTemplateConfig::APP_ID, 'app/app');
+script(MyAppTemplateConfig::APP_ID, 'templates');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/main');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/menu');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/vault');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/credential');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/edit_credential');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/share');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/share_settings');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/revision');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/settings');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/import');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/export');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/generic-csv-importer');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/vaultreqdeletion');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/range');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/propsfilter');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/byte');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/tagfilter');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/escapeHTML');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/as');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/credentialsearch');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/toHHMMSS');
+script(MyAppTemplateConfig::APP_ID, 'app/services/cacheservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/vaultservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/credentialservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/settingsservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/fileservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/encryptservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/iconservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/tagservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/notificationservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/shareservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/searchboxexpanderservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/urlservice');
+script(MyAppTemplateConfig::APP_ID, 'app/factory/sharingacl');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/passwordgen');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/fileselect');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/progressbar');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/otp');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/qrreader');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/tooltip');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/use-theme');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/credentialfield');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/ngenter');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/autoscroll');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/clickselect');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/colorfromstring');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/credentialcounter');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/clearbutton2');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/credentialtemplate');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/clickdisable');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/icon');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/iconpicker');
+script(MyAppTemplateConfig::APP_ID, 'importers/import-main');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-keepasscsv');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-lastpasscsv');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-dashlanecsv');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-zohocsv');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-passmanjson');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-ocpasswords');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-clipperz');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-teampass');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-enpass');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-passpackcsv');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-randomdata');
+script(MyAppTemplateConfig::APP_ID, 'importers/importer-padlock');
+script(MyAppTemplateConfig::APP_ID, 'exporters/exporter-main');
+script(MyAppTemplateConfig::APP_ID, 'exporters/exporter-csv');
+script(MyAppTemplateConfig::APP_ID, 'exporters/exporter-json');
 /*build-js-end*/
 
 /*
  * Styles
  */
 /*build-css-start*/
-style('passman', 'vendor/ng-password-meter/ng-password-meter');
-style('passman', 'vendor/bootstrap/bootstrap.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/ng-password-meter/ng-password-meter');
+style(MyAppTemplateConfig::APP_ID, 'vendor/bootstrap/bootstrap.min');
 
-style('passman', 'vendor/font-awesome/font-awesome.min');
-style('passman', 'vendor/angular-xeditable/xeditable.min');
-style('passman', 'vendor/ng-tags-input/ng-tags-input.min');
-style('passman', 'vendor/angularjs-datetime-picker/angularjs-datetime-picker');
-style('passman', 'app');
+style(MyAppTemplateConfig::APP_ID, 'vendor/font-awesome/font-awesome.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/angular-xeditable/xeditable.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/ng-tags-input/ng-tags-input.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/angularjs-datetime-picker/angularjs-datetime-picker');
+style(MyAppTemplateConfig::APP_ID, 'app');
 /*build-css-end*/
 ?>
 
diff --git a/templates/public_share.php b/templates/public_share.php
index c718dced7..cff83ce9a 100644
--- a/templates/public_share.php
+++ b/templates/public_share.php
@@ -1,70 +1,74 @@
 <?php
+
+include_once '_config.php';
+
 /*
  * Javascripts
  */
 /*build-js-start*/
-script('passman', 'vendor/angular/angular.min');
-script('passman', 'vendor/angular-animate/angular-animate.min');
-script('passman', 'vendor/angular-cookies/angular-cookies.min');
-script('passman', 'vendor/angular-resource/angular-resource.min');
-script('passman', 'vendor/angular-route/angular-route.min');
-script('passman', 'vendor/angular-sanitize/angular-sanitize.min');
-script('passman', 'vendor/angular-touch/angular-touch.min');
-script('passman', 'vendor/angular-local-storage/angular-local-storage.min');
-script('passman', 'vendor/angular-off-click/angular-off-click.min');
-script('passman', 'vendor/angularjs-datetime-picker/angularjs-datetime-picker.min');
-script('passman', 'vendor/ng-password-meter/ng-password-meter');
-script('passman', 'vendor/angular-translate/angular-translate.min');
-script('passman', 'vendor/angular-translate/angular-translate-loader-url.min');
-script('passman', 'vendor/sjcl/sjcl');
-script('passman', 'vendor/zxcvbn/zxcvbn');
-script('passman', 'vendor/ng-clipboard/clipboard.min');
-script('passman', 'vendor/ng-clipboard/ngclipboard');
-script('passman', 'vendor/ng-tags-input/ng-tags-input.min');
-script('passman', 'vendor/angular-xeditable/xeditable.min');
-script('passman', 'vendor/sha/sha');
-script('passman', 'vendor/llqrcode/llqrcode');
-script('passman', 'vendor/forge.0.6.9.min');
-script('passman', 'vendor/download');
-script('passman', 'lib/promise');
-script('passman', 'lib/crypto_wrap');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular/angular.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-animate/angular-animate.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-cookies/angular-cookies.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-resource/angular-resource.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-route/angular-route.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-sanitize/angular-sanitize.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-touch/angular-touch.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-local-storage/angular-local-storage.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-off-click/angular-off-click.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angularjs-datetime-picker/angularjs-datetime-picker.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-password-meter/ng-password-meter');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-translate/angular-translate.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-translate/angular-translate-loader-url.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/sjcl/sjcl');
+script(MyAppTemplateConfig::APP_ID, 'vendor/zxcvbn/zxcvbn');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-clipboard/clipboard.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-clipboard/ngclipboard');
+script(MyAppTemplateConfig::APP_ID, 'vendor/ng-tags-input/ng-tags-input.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/angular-xeditable/xeditable.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/sha/sha');
+script(MyAppTemplateConfig::APP_ID, 'vendor/llqrcode/llqrcode');
+script(MyAppTemplateConfig::APP_ID, 'vendor/forge.0.6.9.min');
+script(MyAppTemplateConfig::APP_ID, 'vendor/download');
+script(MyAppTemplateConfig::APP_ID, 'lib/promise');
+script(MyAppTemplateConfig::APP_ID, 'lib/crypto_wrap');
 
 
-script('passman', 'app/app_public');
-script('passman', 'app/controllers/public_shared_credential');
-script('passman', 'app/filters/range');
-script('passman', 'app/filters/propsfilter');
-script('passman', 'app/filters/byte');
-script('passman', 'app/filters/escapeHTML');
-script('passman', 'app/services/vaultservice');
-script('passman', 'app/services/credentialservice');
-script('passman', 'app/services/settingsservice');
-script('passman', 'app/services/fileservice');
-script('passman', 'app/services/encryptservice');
-script('passman', 'app/services/tagservice');
-script('passman', 'app/services/notificationservice');
-script('passman', 'app/services/shareservice');
-script('passman', 'app/directives/otp');
-script('passman', 'app/directives/tooltip');
-script('passman', 'app/directives/use-theme');
-script('passman', 'app/directives/credentialfield');
-script('passman', 'app/directives/ngenter');
+script(MyAppTemplateConfig::APP_ID, 'app/app_public');
+script(MyAppTemplateConfig::APP_ID, 'app/controllers/public_shared_credential');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/range');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/propsfilter');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/byte');
+script(MyAppTemplateConfig::APP_ID, 'app/filters/escapeHTML');
+script(MyAppTemplateConfig::APP_ID, 'app/services/vaultservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/credentialservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/settingsservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/fileservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/encryptservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/tagservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/notificationservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/shareservice');
+script(MyAppTemplateConfig::APP_ID, 'app/services/urlservice');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/otp');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/tooltip');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/use-theme');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/credentialfield');
+script(MyAppTemplateConfig::APP_ID, 'app/directives/ngenter');
 /*build-js-end*/
 
 /*
  * Styles
  */
 /*build-css-start*/
-style('passman', 'vendor/ng-password-meter/ng-password-meter');
-style('passman', 'vendor/bootstrap/bootstrap.min');
-style('passman', 'vendor/bootstrap/bootstrap-theme.min');
-style('passman', 'vendor/font-awesome/font-awesome.min');
-style('passman', 'vendor/angular-xeditable/xeditable.min');
-style('passman', 'vendor/ng-tags-input/ng-tags-input.min');
-style('passman', 'vendor/angularjs-datetime-picker/angularjs-datetime-picker');
-style('passman', 'app');
+style(MyAppTemplateConfig::APP_ID, 'vendor/ng-password-meter/ng-password-meter');
+style(MyAppTemplateConfig::APP_ID, 'vendor/bootstrap/bootstrap.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/bootstrap/bootstrap-theme.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/font-awesome/font-awesome.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/angular-xeditable/xeditable.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/ng-tags-input/ng-tags-input.min');
+style(MyAppTemplateConfig::APP_ID, 'vendor/angularjs-datetime-picker/angularjs-datetime-picker');
+style(MyAppTemplateConfig::APP_ID, 'app');
 /*build-css-end*/
-style('passman', 'public-page');
+style(MyAppTemplateConfig::APP_ID, 'public-page');
 
 ?>
 <div class="share-controller" ng-app="passmanApp" ng-controller="PublicSharedCredential">
diff --git a/tests/integration/AppTest.php b/tests/integration/AppTest.php
index cbbf54dc6..0ad3eb6a3 100644
--- a/tests/integration/AppTest.php
+++ b/tests/integration/AppTest.php
@@ -21,6 +21,7 @@
  *
  */
 
+use OCA\Passman\AppInfo\Application;
 use OCP\AppFramework\App;
 use Test\TestCase;
 
@@ -36,13 +37,13 @@ class AppTest extends TestCase {
 
     public function setUp() {
         parent::setUp();
-        $app = new App('passman');
+        $app = new App(Application::APP_ID);
         $this->container = $app->getContainer();
     }
 
     public function testAppInstalled() {
         $appManager = $this->container->query('OCP\App\IAppManager');
-        $this->assertTrue($appManager->isInstalled('passman'));
+        $this->assertTrue($appManager->isInstalled(Application::APP_ID));
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/unit/controller/FileControllerTest.php b/tests/unit/controller/FileControllerTest.php
index c6946ed06..b3e8346fe 100644
--- a/tests/unit/controller/FileControllerTest.php
+++ b/tests/unit/controller/FileControllerTest.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Service\FileService;
 use OCP\AppFramework\Http\JSONResponse;
 use PHPUnit_Framework_TestCase;
@@ -51,7 +52,7 @@ public function setUp() {
 		$request = $this->getMockBuilder('OCP\IRequest')->getMock();
 		$this->fileService = $this->createMock(FileService::class);
 		$this->controller = new FileController(
-			'passman', $request, $this->userId, $this->fileService
+			Application::APP_ID, $request, $this->userId, $this->fileService
 		);
 	}
 
diff --git a/tests/unit/controller/InternalControllerTest.php b/tests/unit/controller/InternalControllerTest.php
index b69f53738..d3891b7c5 100644
--- a/tests/unit/controller/InternalControllerTest.php
+++ b/tests/unit/controller/InternalControllerTest.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCP\AppFramework\Http\JSONResponse;
 use PHPUnit_Framework_TestCase;
 
@@ -45,7 +46,7 @@ public function setUp() {
 			->disableOriginalConstructor()
 			->getMock();
 		$this->controller = new InternalController(
-			'passman', $request, $this->userId, $this->credentialService, $config
+			Application::APP_ID, $request, $this->userId, $this->credentialService, $config
 		);
 	}
 
diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php
index 169d2142c..e56b87a6a 100644
--- a/tests/unit/controller/PageControllerTest.php
+++ b/tests/unit/controller/PageControllerTest.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCP\AppFramework\Http\TemplateResponse;
 use PHPUnit_Framework_TestCase;
 
@@ -41,7 +42,7 @@ public function setUp() {
 		$request = $this->getMockBuilder('OCP\IRequest')->getMock();
 
 		$this->controller = new PageController(
-			'passman', $request, $this->userId
+			Application::APP_ID, $request, $this->userId
 		);
 	}
 
diff --git a/tests/unit/controller/SettingsControllerTest.php b/tests/unit/controller/SettingsControllerTest.php
index 2b9b5af09..480422321 100644
--- a/tests/unit/controller/SettingsControllerTest.php
+++ b/tests/unit/controller/SettingsControllerTest.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Service\SettingsService;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -43,10 +44,10 @@ public function setUp() {
 		$IL10N = $this->getMockBuilder('OCP\IL10N')->getMock();
 		$config = $this->getMockBuilder('OCP\IConfig')->getMock();
 		$userId = 'admin';
-		$settings = new SettingsService($userId, $config, 'passman');
+		$settings = new SettingsService($userId, $config, Application::APP_ID);
 
 		$this->controller = new SettingsController(
-			'passman', $request, $userId, $settings, $IL10N
+			Application::APP_ID, $request, $userId, $settings, $IL10N
 		);
 	}
 
diff --git a/tests/unit/controller/TranslationControllerTest.php b/tests/unit/controller/TranslationControllerTest.php
index 1a2f2175f..65e7d2f7d 100644
--- a/tests/unit/controller/TranslationControllerTest.php
+++ b/tests/unit/controller/TranslationControllerTest.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCP\AppFramework\Http\JSONResponse;
 use PHPUnit_Framework_TestCase;
 
@@ -42,7 +43,7 @@ public function setUp() {
 		$IL10N = $this->getMockBuilder('OCP\IL10N')->getMock();
 
 		$this->controller = new TranslationController(
-			'passman', $request, $IL10N
+			Application::APP_ID, $request, $IL10N
 		);
 	}
 
diff --git a/tests/unit/controller/VaultControllerTest.php b/tests/unit/controller/VaultControllerTest.php
index 392e3ec1b..e705b1b52 100644
--- a/tests/unit/controller/VaultControllerTest.php
+++ b/tests/unit/controller/VaultControllerTest.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Service\CredentialService;
 use OCA\Passman\Service\DeleteVaultRequestService;
 use OCA\Passman\Service\SettingsService;
@@ -52,7 +53,7 @@ public function setUp() {
 		$this->deleteVaultRequestService = $this->createMock(DeleteVaultRequestService::class);
 
 		$this->controller = new VaultController(
-			'passman', $request, $this->userId, $this->vaultService, $this->credentialService, $this->deleteVaultRequestService,  $this->settingsService
+			Application::APP_ID, $request, $this->userId, $this->vaultService, $this->credentialService, $this->deleteVaultRequestService,  $this->settingsService
 		);
 	}
 
diff --git a/tests/unit/lib/Service/EncryptServiceTest.php b/tests/unit/lib/Service/EncryptServiceTest.php
index de12078fc..ec305a884 100644
--- a/tests/unit/lib/Service/EncryptServiceTest.php
+++ b/tests/unit/lib/Service/EncryptServiceTest.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Service\EncryptService;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -44,7 +45,7 @@ class EncryptServiceTest extends PHPUnit_Framework_TestCase {
 	public function setUp() {
 		$config = $this->getMockBuilder('OCP\IConfig')->getMock();
 		$userId = 'admin';
-		$settings_service = new SettingsService($userId, $config, 'passman');
+		$settings_service = new SettingsService($userId, $config, Application::APP_ID);
 		$this->service = new EncryptService($settings_service);
 
 	}
@@ -56,4 +57,4 @@ public function testMakeKey() {
 		$this->testKey = $this->service->makeKey('userKey', 'serverKey', 'userSuppliedKey');
 		$this->assertTrue($this->testKey === '967efb38599fb81ebc95b280e7c86cda0593e469f6a391caf9e9fee7c3976fd1edcdeefdb6a99e9f0bc47fda4b77fb8309c1955211dccf1dab1aad00c2ad5656');
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/lib/Service/SettingsServiceTest.php b/tests/unit/lib/Service/SettingsServiceTest.php
index f94bb0fbf..a627b6c89 100644
--- a/tests/unit/lib/Service/SettingsServiceTest.php
+++ b/tests/unit/lib/Service/SettingsServiceTest.php
@@ -23,11 +23,12 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\AppInfo\Application;
+use OCA\Passman\Service\SettingsService;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use PHPUnit_Framework_TestCase;
-use OCA\Passman\Service\SettingsService;
 
 /**
  * Class SettingsServiceTest
@@ -42,7 +43,7 @@ class SettingsServiceTest extends PHPUnit_Framework_TestCase {
 	public function setUp() {
 		$config = $this->getMockBuilder('OCP\IConfig')->getMock();
 		$userId = 'admin';
-		$this->service = new SettingsService($userId, $config, 'passman');
+		$this->service = new SettingsService($userId, $config, Application::APP_ID);
 	}
 
 	/**
@@ -83,4 +84,4 @@ public function testIsEnabled() {
 		$result = $this->service->isEnabled('link_sharing_enabled');
 		$this->assertFalse($result);
 	}
-}
\ No newline at end of file
+}