diff --git a/zero.Api/Endpoints/Integrations/IntegrationsController.cs b/zero.Api/Endpoints/Integrations/IntegrationsController.cs
index ad84a171..89611c5f 100644
--- a/zero.Api/Endpoints/Integrations/IntegrationsController.cs
+++ b/zero.Api/Endpoints/Integrations/IntegrationsController.cs
@@ -1,43 +1,41 @@
 //using Microsoft.AspNetCore.Mvc;
-//using System.Collections.Generic;
-//using System.Threading.Tasks;
-//using zero.Core.Collections;
-//using zero.Core.Entities;
-//using zero.Core.Integrations;
-//using zero.Web.Models;
 
-//namespace zero.Web.Controllers
+//namespace zero.Api.Endpoints.Integrations;
+
+//public class IntegrationsController : ZeroApiController
 //{
-//  //[ZeroAuthorize(Permissions.Sections.PREFIX + "commerce", PermissionsValue.Read)]
-//  public class IntegrationsController : BackofficeController
+//  public IntegrationsController(IIntegrationService store)
 //  {
-//    IIntegrationsCollection Collection;
 
-//    public IntegrationsController(IIntegrationsCollection collection)
-//    {
-//      Collection = collection;
-//    }
-
-
-//    public EditModel<Integration> GetEmpty([FromQuery] string alias) => Edit(Collection.GetEmpty(alias));
-
-
-//    public async Task<EditModel<Integration>> GetByAlias([FromQuery] string alias) => Edit(await Collection.GetByAlias(alias));
-
-
-//    public async Task<Paged<Integration>> Load([FromQuery] ListQuery<Integration> query) => await Collection.Load(query);
-
-
-//    public async Task<IList<IntegrationTypeWithStatus>> GetTypes() => await Collection.GetTypesWithStatus();
-
-
-//    [HttpPost]
-//    public async Task<Result<Integration>> Save([FromBody] Integration model) => await Collection.Save(model);
-
-//    [HttpPost]
-//    public async Task<Result<Integration>> SaveActiveState([FromBody] Integration model) => model.IsActive ? await Collection.Activate(model.Alias) : await Collection.Deactivate(model.Alias);
-
-//    [HttpDelete]
-//    public async Task<Result<Integration>> Delete([FromQuery] string alias) => await Collection.DeleteByAlias(alias);
 //  }
+
+
+//  [HttpGet("empty")]
+//  [ZeroAuthorize(LanguagePermissions.Create)]
+//  public virtual Task<ActionResult<Language>> Empty(string flavor = null) => EmptyModel(flavor);
+
+
+//  [HttpGet("{id}")]
+//  [ZeroAuthorize(LanguagePermissions.Read)]
+//  public virtual Task<ActionResult<Language>> Get(string id, string changeVector = null) => GetModel(id, changeVector);
+
+
+//  [HttpGet("")]
+//  [ZeroAuthorize(LanguagePermissions.Read)]
+//  public virtual Task<ActionResult<Paged>> Get([FromQuery] ListQuery<Language> query) => GetModelsByIndex<LanguageBasic, zero_Api_Languages_Listing>(query);
+
+
+//  [HttpPost("")]
+//  [ZeroAuthorize(LanguagePermissions.Create)]
+//  public virtual Task<ActionResult<Result>> Create(Language saveModel) => CreateModel(saveModel);
+
+
+//  [HttpPut("{id}")]
+//  [ZeroAuthorize(LanguagePermissions.Update)]
+//  public virtual Task<ActionResult<Result>> Update(string id, Language updateModel, [FromQuery] string changeToken = null) => UpdateModel(id, updateModel, changeToken);
+
+
+//  [HttpDelete("{id}")]
+//  [ZeroAuthorize(LanguagePermissions.Delete)]
+//  public virtual Task<ActionResult<Result>> Delete(string id) => DeleteModel(id);
 //}
\ No newline at end of file
diff --git a/zero.Api/Endpoints/Integrations/_IntegrationsController.cs b/zero.Api/Endpoints/Integrations/_IntegrationsController.cs
new file mode 100644
index 00000000..ad84a171
--- /dev/null
+++ b/zero.Api/Endpoints/Integrations/_IntegrationsController.cs
@@ -0,0 +1,43 @@
+//using Microsoft.AspNetCore.Mvc;
+//using System.Collections.Generic;
+//using System.Threading.Tasks;
+//using zero.Core.Collections;
+//using zero.Core.Entities;
+//using zero.Core.Integrations;
+//using zero.Web.Models;
+
+//namespace zero.Web.Controllers
+//{
+//  //[ZeroAuthorize(Permissions.Sections.PREFIX + "commerce", PermissionsValue.Read)]
+//  public class IntegrationsController : BackofficeController
+//  {
+//    IIntegrationsCollection Collection;
+
+//    public IntegrationsController(IIntegrationsCollection collection)
+//    {
+//      Collection = collection;
+//    }
+
+
+//    public EditModel<Integration> GetEmpty([FromQuery] string alias) => Edit(Collection.GetEmpty(alias));
+
+
+//    public async Task<EditModel<Integration>> GetByAlias([FromQuery] string alias) => Edit(await Collection.GetByAlias(alias));
+
+
+//    public async Task<Paged<Integration>> Load([FromQuery] ListQuery<Integration> query) => await Collection.Load(query);
+
+
+//    public async Task<IList<IntegrationTypeWithStatus>> GetTypes() => await Collection.GetTypesWithStatus();
+
+
+//    [HttpPost]
+//    public async Task<Result<Integration>> Save([FromBody] Integration model) => await Collection.Save(model);
+
+//    [HttpPost]
+//    public async Task<Result<Integration>> SaveActiveState([FromBody] Integration model) => model.IsActive ? await Collection.Activate(model.Alias) : await Collection.Deactivate(model.Alias);
+
+//    [HttpDelete]
+//    public async Task<Result<Integration>> Delete([FromQuery] string alias) => await Collection.DeleteByAlias(alias);
+//  }
+//}
\ No newline at end of file
diff --git a/zero.Api/Endpoints/Translations/Maps/TranslationBasic.cs b/zero.Api/Endpoints/Translations/Maps/TranslationBasic.cs
index fa394ebd..b00a937c 100644
--- a/zero.Api/Endpoints/Translations/Maps/TranslationBasic.cs
+++ b/zero.Api/Endpoints/Translations/Maps/TranslationBasic.cs
@@ -1,7 +1,13 @@
 namespace zero.Api.Endpoints.Translations;
 
-public class TranslationBasic : BasicModel<Translation>
+public class TranslationBasic : ZeroIdEntity
 {
+  public string Key { get; set; }
+
+  public DateTimeOffset CreatedDate { get; set; }
+
+  public string Flavor { get; set; }
+
   public string Value { get; set; }
 
   public TranslationDisplay Display { get; set; }
diff --git a/zero.Api/Endpoints/Translations/Maps/LanguageMapperProfile.cs b/zero.Api/Endpoints/Translations/Maps/TranslationMapperProfile.cs
similarity index 88%
rename from zero.Api/Endpoints/Translations/Maps/LanguageMapperProfile.cs
rename to zero.Api/Endpoints/Translations/Maps/TranslationMapperProfile.cs
index c239f3ce..1804cb26 100644
--- a/zero.Api/Endpoints/Translations/Maps/LanguageMapperProfile.cs
+++ b/zero.Api/Endpoints/Translations/Maps/TranslationMapperProfile.cs
@@ -12,7 +12,10 @@ public class TranslationMapperProfile : ZeroMapperProfile
 
   protected virtual void Map(Translation source, TranslationBasic target, IZeroMapperContext ctx)
   {
-    this.MapBasicData(source, target);
+    target.Id = source.Id;
+    target.Key = source.Key;
+    target.Flavor = source.Flavor;
+    target.CreatedDate = source.CreatedDate;
     target.Value = source.Value;
     target.Display = source.Display;
   }
diff --git a/zero.Api/Endpoints/Translations/TranslationsController.cs b/zero.Api/Endpoints/Translations/TranslationsController.cs
index 107d9eb8..d3d5f031 100644
--- a/zero.Api/Endpoints/Translations/TranslationsController.cs
+++ b/zero.Api/Endpoints/Translations/TranslationsController.cs
@@ -25,7 +25,7 @@ public class TranslationsController : ZeroApiEntityStoreController<Translation,
   public virtual Task<ActionResult<Paged>> Get([FromQuery] ListQuery<Translation> query)
   {
     query.SearchFor(x => x.Key, x => x.Value);
-    return GetModelsByIndex<zero_Api_Translations_Listing>(query);
+    return GetModelsByIndex<TranslationBasic, zero_Api_Translations_Listing>(query);
   }
 
 
diff --git a/zero.Backoffice.UI/app/_about.vue b/zero.Backoffice.UI/app/_about.vue
deleted file mode 100644
index 424aa40f..00000000
--- a/zero.Backoffice.UI/app/_about.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  <div class="root">
-    about
-  </div>
-</template>
-
-
-<script lang="ts">
-  export default {
-    data: () => ({
-      
-    })
-  }
-
-</script>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/_root.vue b/zero.Backoffice.UI/app/_root.vue
deleted file mode 100644
index 54381473..00000000
--- a/zero.Backoffice.UI/app/_root.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div class="root">root</div>
-</template>
-
-
-<script lang="ts">
-  export default {
-    data: () => ({
-      
-    })
-  }
-
-</script>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/app.vue b/zero.Backoffice.UI/app/app.vue
index 43b612c8..b014376d 100644
--- a/zero.Backoffice.UI/app/app.vue
+++ b/zero.Backoffice.UI/app/app.vue
@@ -22,6 +22,7 @@
   import { useAccountStore } from './account/store';
   import { useUiStore } from './ui/store';
   import { useTranslationStore } from './stores/translations';
+  import { useAppStore } from './modules/applications/store';
   import accountApi from './account/api';
   import { defineComponent } from 'vue';
 
@@ -44,6 +45,7 @@
       if (userResponse.success)
       {
         this.accountStore.user = userResponse.data;
+        await useAppStore().setup();
         await useUiStore().setup();
       }
       else
diff --git a/zero.Backoffice.UI/app/core/router/routerConfig.ts b/zero.Backoffice.UI/app/core/router/routerConfig.ts
index 98099556..bcc02c98 100644
--- a/zero.Backoffice.UI/app/core/router/routerConfig.ts
+++ b/zero.Backoffice.UI/app/core/router/routerConfig.ts
@@ -18,21 +18,8 @@ export function getRouterConfig(basePath: string, zero: Zero): RouterOptions
     routes: []
   } as RouterOptions;
 
-  //options.routes.push({
-  //  name: 'xroot',
-  //  path: '/',
-  //  component: () => import('../../_root.vue'),
-  //  meta: {
-  //    name: 'Root name',
-  //    alias: 'rootalias',
-  //    section: 'Root section'
-  //  }
-  //} as RouteRecordRaw);
-
-  options.routes.push({ path: '/', component: () => import('../../_root.vue') });
-  options.routes.push({ path: '/about', component: () => import('../../_about.vue') });
-
-  // TODO add zero routes
+  options.routes.push({ name: 'dashboard', path: '/', redirect: { name: 'pages' } });
+  options.routes.push({ name: '404', path: '/:pathMatch(.*)', component: () => import('../../notfound.vue') });
 
   return options;
 }
diff --git a/zero.Backoffice.UI/app/dashboard.vue b/zero.Backoffice.UI/app/dashboard.vue
new file mode 100644
index 00000000..f2953a80
--- /dev/null
+++ b/zero.Backoffice.UI/app/dashboard.vue
@@ -0,0 +1,15 @@
+<template>
+</template>
+
+
+<script lang="ts">
+  export default {
+    created()
+    {
+      this.$router.replace({
+        name: 'pages'
+      });
+    }
+  }
+
+</script>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/applications/store.ts b/zero.Backoffice.UI/app/modules/applications/store.ts
new file mode 100644
index 00000000..41dfdc61
--- /dev/null
+++ b/zero.Backoffice.UI/app/modules/applications/store.ts
@@ -0,0 +1,17 @@
+
+import { defineStore } from 'pinia';
+import api from './api';
+
+export const useAppStore = defineStore('zero.apps', {
+  state: () => ({
+    applications: []
+  }),
+
+  actions: {
+    async setup()
+    {
+      const response = await api.getByQuery({ pageSize: 1000 });
+      this.applications = response.data;
+    }
+  }
+});
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/integrations/api.ts b/zero.Backoffice.UI/app/modules/integrations/api.ts
new file mode 100644
index 00000000..0dbc0644
--- /dev/null
+++ b/zero.Backoffice.UI/app/modules/integrations/api.ts
@@ -0,0 +1,24 @@
+import { get, post, put, del, ApiRequestConfig, ApiRequestQuery } from '../../services/request';
+
+export default {
+
+  getEmpty: (flavor?: string, config?: ApiRequestConfig) => get("translations/empty", { ...config, params: { flavor } }),
+
+  getById: (id: string, changeVector?: string, config?: ApiRequestConfig) => get('translations/' + id, { ...config, params: { changeVector } }),
+
+  getByQuery: (query: ApiRequestQuery, config?: ApiRequestConfig) => get('translations', { ...config, params: { ...query } }),
+
+  create: (model: any, config?: ApiRequestConfig) => post('translations', model, config),
+
+  update: (model: any, config?: ApiRequestConfig) => put('translations/' + model.id, model, config),
+
+  delete: (id: string, config?: ApiRequestConfig) => del('translations/' + id, null, config),
+
+  //getEmpty: async alias => await get(base + 'getEmpty', { params: { alias } }),
+  //getTypes: async () => await get(base + 'getTypes'),
+  //getByAlias: async (alias, config) => await get(base + 'getByAlias', { ...config, params: { alias } }),
+  //getByQuery: async (query, config) => await get(base + 'getByQuery', { ...config, params: { query } }),
+  //save: async (model, config) => await post(base + 'save', model, { ...config }),
+  //saveActiveState: async (model, config) => await post(base + 'saveActiveState', model, { ...config }),
+  //delete: async alias => await del(base + 'delete', { params: { alias } })
+};
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/integrations/index.ts b/zero.Backoffice.UI/app/modules/integrations/index.ts
new file mode 100644
index 00000000..5cf56925
--- /dev/null
+++ b/zero.Backoffice.UI/app/modules/integrations/index.ts
@@ -0,0 +1,7 @@
+import api from './api';
+import plugin from './plugin';
+
+export {
+  api as integrationApi,
+  plugin as integrationPlugin
+};
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/integrations/integration.vue b/zero.Backoffice.UI/app/modules/integrations/integration.vue
new file mode 100644
index 00000000..0ecc1002
--- /dev/null
+++ b/zero.Backoffice.UI/app/modules/integrations/integration.vue
@@ -0,0 +1,49 @@
+<template>
+  <ui-form ref="form" class="translation" v-slot="form" @submit="onSubmit" @load="onLoad" :route="route">
+    <ui-form-header v-model:value="model" prefix="@translation.list" title="@translation.name" :disabled="disabled" :is-create="!id" :state="form.state" :can-delete="meta.canDelete" @delete="onDelete" />
+    <ui-editor config="translations:edit" v-model="model" :meta="meta" :disabled="disabled" :scope="true">
+      <template v-slot:below>
+        <ui-editor-infos v-model="model" :disabled="disabled" />
+      </template>
+    </ui-editor>
+  </ui-form>
+</template>
+
+
+<script>
+  import api from './api';
+
+  export default {
+    props: ['id'],
+
+    data: () => ({
+      meta: {},
+      model: { },
+      route: 'translations-edit',
+      disabled: false
+    }),
+
+    methods: {
+
+      async onLoad(form)
+      {
+        const response = await form.load(() => this.id ? api.getById(this.id, undefined, { system: this.$route.query.scope == 'system' }) : api.getEmpty(this.$route.query['zero.flavor']));
+        this.model = response;
+      },
+
+
+      async onSubmit(form)
+      {
+        const response = this.id ? await api.update(this.model) : await api.create(this.model);
+        await form.handle(response);
+      },
+
+
+      onDelete(item, opts)
+      {
+        opts.hide();
+        this.$refs.form.onDelete(api.delete.bind(this, this.id));
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/integrations/integrations.vue b/zero.Backoffice.UI/app/modules/integrations/integrations.vue
new file mode 100644
index 00000000..ee6166a0
--- /dev/null
+++ b/zero.Backoffice.UI/app/modules/integrations/integrations.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="translations">
+    <ui-header-bar title="@translation.list" :count="count" :back-button="true">
+      <ui-table-filter :attach="$refs.table" />
+      <ui-add-button :route="createRoute" alias="translations" />
+    </ui-header-bar>
+    <div class="ui-blank-box">
+      <ui-table ref="table" config="translations" @count="count = $event" />
+    </div>
+  </div>
+</template>
+
+
+<script lang="ts">
+  export default {
+    data: () => ({
+      count: 0,
+      createRoute: 'translations-edit'
+    })
+  
+  }
+</script>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/integrations/plugin.ts b/zero.Backoffice.UI/app/modules/integrations/plugin.ts
new file mode 100644
index 00000000..c6423264
--- /dev/null
+++ b/zero.Backoffice.UI/app/modules/integrations/plugin.ts
@@ -0,0 +1,17 @@
+import { ZeroPlugin, ZeroPluginOptions } from '../../core';
+import { defineAsyncComponent } from 'vue';
+
+export default {
+  name: "zero.integrations",
+
+  install(app: ZeroPluginOptions)
+  {
+    //app.vue.component('ui-languagepicker', defineAsyncComponent(() => import('./ui-languagepicker.vue')));
+
+    app.route({ name: 'integrations', path: '/settings/integrations', component: () => import('./integrations.vue') });
+    app.route({ name: 'integrations-edit', path: '/settings/integrations/edit/:id?', component: () => import('./integration.vue'), props: true });
+
+    app.schema('integrations', () => import('./schemas/list'));
+    app.schema('integrations:edit', () => import('./schemas/editor'));
+  }
+} as ZeroPlugin;
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/integrations/schemas/editor.ts b/zero.Backoffice.UI/app/modules/integrations/schemas/editor.ts
new file mode 100644
index 00000000..af6817f6
--- /dev/null
+++ b/zero.Backoffice.UI/app/modules/integrations/schemas/editor.ts
@@ -0,0 +1,21 @@
+
+import { ZeroEditor } from '../../../editor/editor';
+
+const editor = new ZeroEditor();
+
+editor.resourcePrefix = '@translation.fields.';
+
+const set = editor.fieldset();
+
+set.field('key').text({ maxLength: 300 });
+set.field('display').state({
+  items: [
+    { label: '@translation.display.text', value: 0 },
+    { label: '@translation.display.html', value: 1 }
+  ]
+});
+
+editor.field('value').setHidden(x => x.display === 0).rte();
+editor.field('value').setHidden(x => x.display === 1).textarea();
+
+export default editor;
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/integrations/schemas/list.ts b/zero.Backoffice.UI/app/modules/integrations/schemas/list.ts
new file mode 100644
index 00000000..f7990cff
--- /dev/null
+++ b/zero.Backoffice.UI/app/modules/integrations/schemas/list.ts
@@ -0,0 +1,16 @@
+
+import List from '../../../schemas/list/list';
+import api from '../api';
+
+const list = new List('translations');
+const prefix = '@translation.fields.';
+
+list.templateLabel = x => prefix + x;
+list.link = 'translations-edit';
+
+list.onFetch(filter => api.getByQuery(filter));
+
+list.column('key', { width: 420 }).name();
+list.column('value').text();
+
+export default list;
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/settings/plugin.ts b/zero.Backoffice.UI/app/modules/settings/plugin.ts
index 0f636527..513cf4cb 100644
--- a/zero.Backoffice.UI/app/modules/settings/plugin.ts
+++ b/zero.Backoffice.UI/app/modules/settings/plugin.ts
@@ -1,17 +1,10 @@
 import { ZeroPlugin, ZeroPluginOptions } from '../../core';
-import { defineAsyncComponent } from 'vue';
-
-const Page = () => import('./settings.vue');
 
 export default {
   name: "zero.settings",
 
   install(app: ZeroPluginOptions)
   {
-    //app.vue.component('ui-countrypicker', defineAsyncComponent(Picker));
-    app.route({ path: '/settings', component: Page });
-
-    //app.editor('country', null);
-    //app.editorField('')
+    app.route({ name: 'settings', path: '/settings', component: () => import('./settings.vue') });
   }
 } as ZeroPlugin;
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/settings/settings.vue b/zero.Backoffice.UI/app/modules/settings/settings.vue
index 3d8a3bfc..8e186524 100644
--- a/zero.Backoffice.UI/app/modules/settings/settings.vue
+++ b/zero.Backoffice.UI/app/modules/settings/settings.vue
@@ -6,6 +6,7 @@
         <router-link :to="item.url || '/'" v-for="item in group.items" :key="item.name" class="settings-group-item">
           <span class="settings-group-item-icon">
             <ui-icon :symbol="item.icon || 'fth-settings'" :size="18" />
+            <span v-if="item.alias === 'applications'" class="settings-group-item-count">{{appCount}}</span>
           </span>
           <p class="settings-group-item-text">
             <strong v-localize="item.name"></strong>
@@ -24,12 +25,14 @@
 
 <script>
   import { useUiStore } from '../../ui/store';
+  import { useAppStore } from '../applications/store';
 
   export default {
     name: 'app-settings',
 
     data: () => ({
       page: true,
+      appCount: 0,
       groups: [],
       tokens: {
         'zero_version': '0.0.1',
@@ -40,6 +43,7 @@
     mounted()
     {
       this.groups = useUiStore().settingGroups;
+      this.appCount = useAppStore().applications.length;
     }
   }
 </script>
@@ -89,6 +93,7 @@
     box-shadow: var(--shadow-short);
     color: var(--color-text);
     transition: color 0.2s ease;
+    position: relative;
   }
 
   a.settings-group-item:hover .settings-group-item-icon
@@ -109,4 +114,22 @@
       color: var(--color-text);
     }
   }
+
+  .settings-group-item-count
+  {
+    display: inline-block;
+    font-size: 11px;
+    font-weight: 700;
+    background: var(--color-accent);
+    color: var(--color-accent-fg);
+    height: 22px;
+    width: 22px;
+    line-height: 22px;
+    padding: 0 0;
+    text-align: center;
+    border-radius: 16px;
+    position: absolute;
+    top: -4px;
+    right: -4px;
+  }
 </style>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/modules/translations/translation.vue b/zero.Backoffice.UI/app/modules/translations/translation.vue
index 0ecc1002..bd46422a 100644
--- a/zero.Backoffice.UI/app/modules/translations/translation.vue
+++ b/zero.Backoffice.UI/app/modules/translations/translation.vue
@@ -1,6 +1,6 @@
 <template>
   <ui-form ref="form" class="translation" v-slot="form" @submit="onSubmit" @load="onLoad" :route="route">
-    <ui-form-header v-model:value="model" prefix="@translation.list" title="@translation.name" :disabled="disabled" :is-create="!id" :state="form.state" :can-delete="meta.canDelete" @delete="onDelete" />
+    <ui-form-header v-model:value="model" prefix="@translation.list" title="@translation.name" :disabled="disabled" :is-create="!id" :state="form.state" :active-disabled="true" :can-delete="meta.canDelete" @delete="onDelete" />
     <ui-editor config="translations:edit" v-model="model" :meta="meta" :disabled="disabled" :scope="true">
       <template v-slot:below>
         <ui-editor-infos v-model="model" :disabled="disabled" />
diff --git a/zero.Backoffice.UI/app/notfound.vue b/zero.Backoffice.UI/app/notfound.vue
new file mode 100644
index 00000000..df08b40e
--- /dev/null
+++ b/zero.Backoffice.UI/app/notfound.vue
@@ -0,0 +1,173 @@
+<template>
+  <div class="page page-error">
+    <ui-icon class="page-error-icon" symbol="fth-cloud-snow" :size="82" />
+    <p class="page-error-text">
+      <strong class="page-error-headline">Not found</strong><br>
+      The requested resource could not be found
+      <br>
+      <code>{{path}}</code>
+    </p>
+    <ui-button class="page-error-button" type="light onbg" :label="detailsText" @click="details = !details" />
+    <template v-if="details">
+      <br><br>
+      <div class="page-error-routes">
+        <span>#</span>
+        <span>Name</span>
+        <span>Path</span>
+        <template v-for="(route, index) in routes" :key="index">
+          <span>{{index + 1}}.</span>
+          <b>{{route.name}} <em v-if="route.parent">[parent:{{route.parent}}]</em></b>
+          <span>{{route.path}}</span>
+        </template>
+      </div>
+    </template>
+  </div>
+</template>
+
+
+<script>
+  import { defineComponent } from "vue";
+
+  export default defineComponent({
+
+    data: () => ({
+      path: null,
+      routes: [],
+      details: false
+    }),
+
+    watch: {
+      '$route': function (val)
+      {
+        this.rebuild();
+      }
+    },
+
+    computed: {
+      detailsText()
+      {
+        return this.details ? 'Hide' : 'Defined routes';
+      }
+    },
+
+    mounted()
+    {
+      this.rebuild();
+    },
+
+    methods: {
+
+      rebuild()
+      {
+        this.path = this.$route.path;
+        this.routes = [];
+
+        let routes = [];
+
+        console.info(this.$router.getRoutes().reverse());
+
+        this.$router.getRoutes().reverse().forEach(route =>
+        {
+          if (!routes.find(x => x.path == route.path && x.name == route.name && x.parent))
+          {
+            routes.push({
+              path: route.path,
+              name: route.name,
+              parent: null
+            });
+          }
+
+          if (route.children)
+          {
+            route.children.forEach(child =>
+            {
+              routes.push({
+                path: route.path + '/' + child.path,
+                name: child.name,
+                parent: route.name
+              });
+            });
+          }
+        });
+
+        this.routes = routes.sort((a, b) => a.path > b.path ? 1 : -1);
+      }
+    }
+  })
+</script>
+
+<style lang="scss">
+  .page-error
+  {
+    width: 100%;
+    min-height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    color: var(--color-text);
+    text-align: center;
+    padding: var(--padding);
+    overflow-y: auto;
+  }
+
+  .page-error-icon
+  {
+    color: var(--color-text);
+    margin-bottom: 20px;
+  }
+
+  .page-error-text
+  {
+    font-size: var(--font-size);
+    color: var(--color-text-dim);
+    line-height: 1.4em;
+  }
+
+  .page-error-headline
+  {
+    display: inline-block;
+    margin-bottom: 10px;
+    font-size: var(--font-size-l);
+    color: var(--color-text);
+  }
+
+  .page-error-button
+  {
+    margin-top: var(--padding);
+  }
+
+  .page-error-routes
+  {
+    display: grid;
+    grid-template-columns: auto auto 1fr;
+    width: 100%;
+    max-width: 100%;
+    text-align: left;
+    border-top: 1px solid var(--color-line-onbg);
+    border-left: 1px solid var(--color-line-onbg);
+    margin-top: 30px;
+
+    span, b
+    {
+      border: 1px solid var(--color-line-onbg);
+      border-left: none;
+      border-top: none;
+      padding: 8px 10px 6px;
+      font-family: Consolas;
+      font-size: 12px;
+
+      &:nth-child(3n+1)
+      {
+        color: var(--color-text-dim);
+      }
+    }
+
+    em
+    {
+      font-style: normal;
+      font-size: 10px;
+      color: var(--color-text-dim);
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/ui/app-navigation.vue b/zero.Backoffice.UI/app/ui/app-navigation.vue
index 7a7fdf35..776b6909 100644
--- a/zero.Backoffice.UI/app/ui/app-navigation.vue
+++ b/zero.Backoffice.UI/app/ui/app-navigation.vue
@@ -10,11 +10,11 @@
       <!--<ui-button icon="fth-search" :stroke="2.5" type="blank" class="app-nav-search" @click="openSearch" />--> 
     </div>
 
-    <ui-dropdown v-if="applications.length > 0" class="app-nav-switch">
+    <ui-dropdown v-if="currentApplication && appStore.applications.length > 0" class="app-nav-switch">
       <template v-slot:button>
         <ui-button type="light block" :label="currentApplication.name" caret="right" />
       </template>
-      <ui-dropdown-button v-for="app in applications" :value="app" :key="app.id" :label="app.name" :selected="app.id === appId" @click="applicationChanged" :prevent="true" />
+      <ui-dropdown-button v-for="app in appStore.applications" :value="app" :key="app.id" :label="app.name" :selected="app.id === appId" @click="applicationChanged" :prevent="true" />
       <ui-dropdown-separator />
       <!--<ui-dropdown-button label="Add new application" icon="fth-plus" @click="addApplication" />-->
       <ui-dropdown-button label="Manage apps" icon="fth-edit-2" @click="manageApplications" />
@@ -64,7 +64,7 @@
   import { defineComponent } from 'vue';
   import { useAccountStore } from '../account/store';
   import { useUiStore } from '../ui/store';
-  import { applicationApi } from '../modules/applications';
+  import { useAppStore } from '../modules/applications/store';
   import accountApi from '../account/api';
   import EventHub from '../services/eventhub';
 
@@ -77,6 +77,7 @@
     data: () => ({
       account: null,
       ui: null,
+      appStore: null,
       appId: null,
       applications: [],
       sections: [],
@@ -86,16 +87,19 @@
       themeSwitchTimeout: null
     }),
 
-    async created()
+    created()
     {
       this.ui = useUiStore();
       this.account = useAccountStore();
-      this.applications = (await applicationApi.getByQuery({ pageSize: 100 })).data;
-      this.currentApplication = this.applications[0];
+      this.appStore = useAppStore();
+    },
+
+
+    mounted()
+    {
+      console.info(this.appStore);
+      this.currentApplication = this.appStore.applications[0];
       this.appId = this.currentApplication.id;
-      //this.compact = localStorage.getItem(compactCacheKey) === 'true';s
-      //this.darkTheme = localStorage.getItem(themeCacheKey) === 'dark';
-      //this.buildUser(AuthApi.user);
     },
 
 
diff --git a/zero.Backoffice.UI/old_app/pages/settings/settings.vue b/zero.Backoffice.UI/old_app/pages/settings/settings.vue
deleted file mode 100644
index 8f055bd2..00000000
--- a/zero.Backoffice.UI/old_app/pages/settings/settings.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <div class="settings">
-    <div class="settings-group" v-if="false && apps.length > 0">
-      <h2 class="ui-headline settings-group-headline" v-localize="'@application.list'"></h2>
-      <applications-items v-model="apps" />
-    </div>
-    <div class="settings-group" v-for="group in groups">
-      <h2 class="ui-headline settings-group-headline" v-localize="group.name"></h2>
-      <div class="settings-group-items">
-        <router-link :to="item.url || '/'" v-for="item in group.items" :key="item.name" class="settings-group-item">
-          <span class="settings-group-item-icon">
-            <ui-icon :symbol="item.icon || 'fth-settings'" :size="18" />
-          </span>
-          <p class="settings-group-item-text">
-            <strong v-localize="item.name"></strong>
-            <template v-if="item.description">
-              <br>
-              <ui-localize :value="item.description" :tokens="tokens" />
-            </template>
-          </p>
-        </router-link>
-      </div>
-    </div>
-    <router-view name="footer"></router-view>
-  </div>
-</template>
-
-
-<script>
-  import ApplicationsItems from 'zero/pages/settings/applications-items.vue'
-  import SettingsApi from 'zero/api/settings.js';
-
-  export default {
-    name: 'app-settings',
-
-    components: { ApplicationsItems },
-
-    data: () => ({
-      page: true,
-      groups: [],
-      apps: [],
-      tokens: {
-        'zero_version': zero.version,
-        'plugin_count': zero.pluginCount
-      }
-    }),
-
-    mounted()
-    {
-      SettingsApi.getAreas().then(response =>
-      {
-        this.groups = response.groups;
-        this.apps = response.applications;
-      });
-    }
-  }
-</script>
-
-
-<style lang="scss">
-  .settings
-  {
-    min-height: 100%;
-    position: relative;
-    padding: 40px 80px;
-    width: 100%;
-    max-width: 2000px;
-    display: flex;
-    flex-direction: column;
-    gap: 80px 40px;
-  }
-
-  .settings-group-items
-  {
-    display: grid;
-    gap: 20px;
-    grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
-    align-items: stretch;
-    margin-top: var(--padding-m);
-  }
-
-  a.settings-group-item
-  {
-    color: var(--color-text);
-    font-size: var(--font-size);
-    display: grid;
-    grid-template-columns: auto 1fr;
-    gap: 20px;
-    align-items: center;
-  }
-
-  .settings-group-item-icon
-  {
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-    width: 54px;
-    height: 54px;
-    background: var(--color-box);
-    border-radius: var(--radius);
-    box-shadow: var(--shadow-short);
-    color: var(--color-text);
-    transition: color 0.2s ease;
-  }
-
-  a.settings-group-item:hover .settings-group-item-icon
-  {
-    color: var(--color-text);
-  }
-
-  .settings-group-item-text
-  {
-    line-height: 1.3;
-    color: var(--color-text-dim);
-    margin: 0;
-
-    strong
-    {
-      display: inline-block;
-      margin-bottom: 5px;
-      color: var(--color-text);
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/old_app/pages/settings/translation.vue b/zero.Backoffice.UI/old_app/pages/settings/translation.vue
deleted file mode 100644
index dcb28a87..00000000
--- a/zero.Backoffice.UI/old_app/pages/settings/translation.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-
-  <ui-form ref="form" v-if="!loading" class="translation" v-slot="form" @submit="onSubmit" @load="onLoad" :route="route">
-    <h2 class="ui-headline" v-localize="'@translation.name'"></h2>
-    <ui-editor config="translation" v-model="item" :meta="meta" :disabled="disabled" />
-    <div class="app-confirm-buttons">
-      <ui-button type="accent" v-if="!disabled" :submit="true" :state="form.state" :label="!item.id ? '@ui.create' :'@ui.update'"></ui-button>
-      <ui-button type="light" :label="config.closeLabel" :disabled="loading" @click="config.close"></ui-button>
-      <ui-button type="light" v-if="!disabled && model.id" label="@ui.delete" @click="onDelete" style="float:right;"></ui-button>
-    </div>
-  </ui-form>
-
-  <!--<ui-form v-if="!loading" ref="form" class="translation" v-slot="form" @submit="onSubmit" @load="onLoad" :route="route">
-    <h2 class="ui-headline" v-localize="'@translation.name'"></h2>
-    <div class="translation-items">
-      <div class="ui-split">
-        <ui-property label="@translation.fields.key" :required="true" :vertical="true" field="key">
-          <input v-model="item.key" type="text" class="ui-input" maxlength="300" :disabled="disabled" />
-        </ui-property>
-        <ui-property label="@translation.fields.display" :vertical="true" field="display">
-          <ui-state-button :disabled="disabled" :items="displayItems" v-model="item.display" />
-        </ui-property>
-      </div>
-      <br />
-      <ui-property label="@translation.fields.value" :required="true" :vertical="true" field="value">
-        <textarea v-if="item.display === 'text'" v-model="item.value" class="ui-input" :disabled="disabled"></textarea>
-        <ui-rte v-if="item.display === 'html'" v-model="item.value" :disabled="disabled" />
-      </ui-property>
-    </div>
-    <div class="app-confirm-buttons">
-      <ui-button type="primary" v-if="!disabled" :submit="true" :state="form.state" label="@ui.save"></ui-button>
-      <ui-button type="light" :label="config.closeLabel" :disabled="loading" @click="config.close"></ui-button>
-      <ui-button type="light" v-if="!disabled && model.id" label="@ui.delete" @click="onDelete" style="float:right;"></ui-button>
-    </div>
-  </ui-form>-->
-</template>
-
-
-<script>
-  import TranslationsApi from 'zero/api/translations.js';
-
-  export default {
-
-    props: {
-      model: Object,
-      config: Object
-    },
-
-    data: () => ({
-      loading: false,
-      meta: {},
-      item: { key: null, value: null },
-      disabled: false,
-      route: zero.alias.settings.translations + '-edit',
-      displayItems: [
-        { label: '@translation.display.text', value: 'text' },
-        { label: '@translation.display.html', value: 'html' }
-      ]
-    }),
-
-    methods: {
-
-      onLoad(form)
-      {
-        form.load(!this.model.id ? TranslationsApi.getEmpty() : TranslationsApi.getById(this.model.id)).then(response =>
-        {
-          this.disabled = !response.meta.canEdit;
-          this.meta = response.meta;
-          this.item = response.entity;
-          this.loading = false;
-        });
-      },
-
-
-      onSubmit(form)
-      {
-        form.handle(TranslationsApi.save(this.item)).then(res =>
-        {
-          this.config.confirm(res);
-        });
-      },
-
-
-      onDelete()
-      {
-        this.$refs.form.onDelete(TranslationsApi.delete.bind(this, this.item.id));
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  .translation
-  {
-    text-align: left;
-
-    .editor, .ui-tab
-    {
-      margin: 0;
-      padding: 0;
-    }
-
-    .editor
-    {
-      padding: var(--padding) 0 var(--padding-s);
-    }
-  }
-
-  .translation-items
-  {
-    margin-top: var(--padding);
-
-    .ui-property + .ui-property,
-    .ui-split + .ui-property
-    {
-      margin-top: 0;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/zero.Backoffice.UI/old_app/pages/settings/translations.vue b/zero.Backoffice.UI/old_app/pages/settings/translations.vue
deleted file mode 100644
index da5efb4a..00000000
--- a/zero.Backoffice.UI/old_app/pages/settings/translations.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <div class="translations">
-    <ui-header-bar title="@translation.list" :count="count" :back-button="true">
-      <ui-table-filter :attach="$refs.table" />
-      <ui-add-button :route="createRoute" blueprint-alias="translation" />
-    </ui-header-bar>
-    <div class="ui-blank-box">
-      <ui-table ref="table" config="translations" @count="count = $event" />
-    </div>
-  </div>
-</template>
-
-
-<script>
-  import Overlay from 'zero/helpers/overlay.js';
-
-  export default {
-    data: () => ({
-      count: 0,
-      createRoute: zero.alias.settings.translations + '-create'
-    }),
-
-    watch: {
-      '$route': function (route)
-      {
-        this.handleRouteChange();
-      }
-    },
-
-    created()
-    {
-      this.handleRouteChange();
-    },
-
-    methods: {
-      goBack()
-      {
-        this.$router.go(-1);
-      },
-
-      handleRouteChange()
-      {
-        if (this.$route.params.id)
-        {
-          this.edit(this.$route.params.id);
-        }
-        else if (this.$route.name === this.createRoute)
-        {
-          this.edit();
-        }
-        else
-        {
-          Overlay.close();
-        }
-      },
-
-      edit(id)
-      {
-        Overlay.open({
-          component: () => import('./translation.vue'),
-          width: 700,
-          model: { id }
-        }).then(res =>
-        {
-          this.$router.go(-1);
-        }, () =>
-        {
-          this.$router.go(-1);
-        });
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/zero.Backoffice/UIComposition/Settings/ApplicationSettings.cs b/zero.Backoffice/UIComposition/Settings/ApplicationSettings.cs
index cf2f9035..f0f87fb9 100644
--- a/zero.Backoffice/UIComposition/Settings/ApplicationSettings.cs
+++ b/zero.Backoffice/UIComposition/Settings/ApplicationSettings.cs
@@ -4,12 +4,10 @@ public class ApplicationSettings : SettingsGroup
 {
   public ApplicationSettings() : base("@settings.groups.application")
   {
-    //Add(Constants.Settings.Updates, "@settings.system.updates.name", "@settings.system.updates.text", "fth-check-circle");
     Add(Constants.Settings.Languages, "@settings.application.languages.name", "@settings.application.languages.text", "fth-globe");
     Add(Constants.Settings.Countries, "@settings.application.countries.name", "@settings.application.countries.text", "fth-map-pin");
     Add(Constants.Settings.Translations, "@settings.application.translations.name", "@settings.application.translations.text", "fth-type");
     Add(Constants.Settings.Mails, "@settings.application.mails.name", "@settings.application.mails.text", "fth-mail");
     Add(Constants.Settings.Integrations, "@settings.application.integrations.name", "@settings.application.integrations.text", "fth-sliders");
-    //Add(Constants.Settings.Logging, "@settings.system.logs.name", "@settings.system.logs.text", "fth-file-text");
   }
 }
\ No newline at end of file
diff --git a/zero.Backoffice/UIComposition/Settings/SystemSettings.cs b/zero.Backoffice/UIComposition/Settings/SystemSettings.cs
index 3e38d26a..6dec000e 100644
--- a/zero.Backoffice/UIComposition/Settings/SystemSettings.cs
+++ b/zero.Backoffice/UIComposition/Settings/SystemSettings.cs
@@ -7,7 +7,7 @@ public class SystemSettings : SettingsGroup
     //Add(Constants.Settings.Updates, "@settings.system.updates.name", "@settings.system.updates.text", "fth-check-circle");
     Add(Constants.Settings.Applications, "@settings.system.applications.name", "@settings.system.applications.text", "fth-layers");
     Add(Constants.Settings.Users, "@settings.system.users.name", "@settings.system.users.text", "fth-users");
-    Add(Constants.Settings.Plugins, "@settings.system.plugins.name", "@settings.system.plugins.text", "fth-package");
+    //Add(Constants.Settings.Plugins, "@settings.system.plugins.name", "@settings.system.plugins.text", "fth-package");
     //Add(Constants.Settings.Logging, "@settings.system.logs.name", "@settings.system.logs.text", "fth-file-text");
   }
 }
diff --git a/zero.Core/Configuration/Integrations/IntegrationsCollection.cs b/zero.Core/Configuration/Integrations/IntegrationsCollection.cs
index b0404d1b..4e727868 100644
--- a/zero.Core/Configuration/Integrations/IntegrationsCollection.cs
+++ b/zero.Core/Configuration/Integrations/IntegrationsCollection.cs
@@ -1,287 +1,281 @@
 //using Microsoft.Extensions.Logging;
 //using Raven.Client.Documents;
 //using Raven.Client.Documents.Linq;
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Threading.Tasks;
-//using zero.Core.Integrations;
 
-//namespace zero.Core.Collections
+//namespace zero.Core.Configuration;
+
+//public class IntegrationsCollection : EntityStore<Integration>, IIntegrationsCollection
 //{
-//  public class IntegrationsCollection : EntityStore<Integration>, IIntegrationsCollection
+//  /// <inheritdoc />
+//  public IReadOnlyCollection<IntegrationType> RegisteredTypes { get; private set; }
+
+//  protected ILogger<IntegrationsCollection> Logger { get; private set; }
+
+
+//  public IntegrationsCollection(IStoreContext<Integration> context, ILogger<IntegrationsCollection> logger) : base(context)
 //  {
-//    /// <inheritdoc />
-//    public IReadOnlyCollection<IntegrationType> RegisteredTypes { get; private set; }
-
-//    protected ILogger<IntegrationsCollection> Logger { get; private set; }
+//    Options = new(true);
+//    RegisteredTypes = Context.Options.Integrations.GetAllItems();
+//    Logger = logger;
+//  }
 
 
-//    public IntegrationsCollection(IStoreContext<Integration> context, ILogger<IntegrationsCollection> logger) : base(context)
+//  /// <inheritdoc />
+//  public Integration GetEmpty(string alias)
+//  {
+//    IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));
+
+//    if (type == null)
 //    {
-//      Options = new(true);
-//      RegisteredTypes = Context.Options.Integrations.GetAllItems();
-//      Logger = logger;
-//    }
-
-
-//    /// <inheritdoc />
-//    public Integration GetEmpty(string alias)
-//    {
-//      IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));
-
-//      if (type == null)
-//      {
-//        return null;
-//      }
-
-//      try
-//      {
-//        Integration model = Activator.CreateInstance(type.ContentType) as Integration;
-//        model.TypeAlias = type.Alias;
-//        return model;
-//      }
-//      catch
-//      {
-//        Logger.LogWarning("Could not create integration with type {alias}", alias);
-//      }
-
 //      return null;
 //    }
 
-
-//    /// <inheritdoc />
-//    public async Task<Integration> GetByAlias(string alias)
+//    try
 //    {
-//      IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));
-//      return await Load<Integration>(type);
+//      Integration model = Activator.CreateInstance(type.ContentType) as Integration;
+//      model.TypeAlias = type.Alias;
+//      return model;
+//    }
+//    catch
+//    {
+//      Logger.LogWarning("Could not create integration with type {alias}", alias);
 //    }
 
-
-//    /// <inheritdoc />
-//    public async Task<T> Get<T>(string alias = null) where T : Integration, new()
-//    {
-//      IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.ContentType == typeof(T) && (alias.IsNullOrEmpty() || x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase)));
-//      return await Load<T>(type);
-//    }
-
-
-//    /// <inheritdoc />
-//    public async Task<IList<Integration>> GetByTag(string tag)
-//    {
-//      IEnumerable<IntegrationType> types = RegisteredTypes.Where(x => x.Tags.Contains(tag, StringComparer.InvariantCultureIgnoreCase));
-
-//      if (!types.Any())
-//      {
-//        return new List<Integration>();
-//      }
-
-//      string[] aliases = types.Select(x => x.Alias).ToArray();
-//      return await Session.Query<Integration>().Where(x => x.TypeAlias.In(aliases)).ToListAsync();
-//    }
-
-
-//    /// <inheritdoc />
-//    public async Task<bool> Any(string tag)
-//    {
-//      return (await GetByTag(tag)).Any(x => x.IsActive);
-//    }
-
-
-//    /// <inheritdoc />
-//    public override async Task<Paged<Integration>> Load(ListQuery<Integration> query)
-//    {
-//      List<Integration> result = new();
-//      List<Integration> models = await Session.Query<Integration>().ToListAsync();
-
-//      foreach (IntegrationType type in RegisteredTypes)
-//      {
-//        Integration model = models.FirstOrDefault(x => x.TypeAlias == type.Alias);
-
-//        if (model != null)
-//        {
-//          model.Name = type.Name;
-//          result.Add(model);
-//        }
-//      }
-
-//      return result.ToQueriedList(query);
-//    }
-
-
-//    /// <inheritdoc />
-//    public async Task<IList<IntegrationTypeWithStatus>> GetTypesWithStatus()
-//    {
-//      List<IntegrationTypeWithStatus> result = new();
-//      List<Integration> models = await Session.Query<Integration>().ToListAsync();
-
-//      foreach (IntegrationType type in RegisteredTypes)
-//      {
-//        Integration model = models.FirstOrDefault(x => x.TypeAlias == type.Alias);
-
-//        result.Add(new()
-//        {
-//          Type = type,
-//          Id = model?.Id,
-//          IsActive = model?.IsActive ?? false,
-//          IsConfigured = model != null
-//        });
-//      }
-
-//      return result.OrderByDescending(x => x.IsActive).ThenByDescending(x => x.IsConfigured).ThenByDescending(x => x.Type.Name).ToList();
-//    }
-
-
-//    /// <inheritdoc />
-//    public override async Task<EntityResult<Integration>> Save(Integration model)
-//    {
-//      if (model == null)
-//      {
-//        return EntityResult<Integration>.Fail("@integration.errors.notfound");
-//      }
-
-//      IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(model.TypeAlias, StringComparison.InvariantCultureIgnoreCase));
-
-//      if (type == null)
-//      {
-//        return EntityResult<Integration>.Fail("@integration.errors.typenotfound");
-//      }
-
-//      string existingId = await Session.Query<Integration>().Where(x => x.TypeAlias == type.Alias).Select(x => x.Id).FirstOrDefaultAsync();
-
-//      if (!existingId.IsNullOrEmpty() && existingId != model.Id)
-//      {
-//        return EntityResult<Integration>.Fail("@integration.errors.multiplenotallowed");
-//      }
-
-//      model.Alias = type.Alias;
-//      model.Name = null;
-
-//      EntityResult<Integration> result = await base.Save(model);
-
-//      if (result.IsSuccess)
-//      {
-//        result.Model.Name = type.Name;
-//      }
-
-//      return result;
-//    }
-
-
-//    /// <inheritdoc />
-//    public async Task<EntityResult<Integration>> Activate(string alias)
-//    {
-//      Integration model = await GetByAlias(alias);
-//      if (model != null)
-//      { 
-//        model.IsActive = true;
-//      }
-//      return await Save(model);
-//    }
-
-
-//    /// <inheritdoc />
-//    public async Task<EntityResult<Integration>> Deactivate(string alias)
-//    {
-//      Integration model = await GetByAlias(alias);
-//      if (model != null)
-//      {
-//        model.IsActive = false;
-//      }
-//      return await Save(model);
-//    }
-
-
-//    /// <inheritdoc />
-//    public async Task<EntityResult<Integration>> DeleteByAlias(string alias)
-//    {
-//      return await base.Delete(await GetByAlias(alias));
-//    }
-
-
-//    /// <summary>
-//    /// Get integration data from database
-//    /// </summary>
-//    protected async Task<T> Load<T>(IntegrationType type) where T : Integration, new()
-//    {
-//      if (type == null)
-//      {
-//        return default;
-//      }
-
-//      T entity = await Session.Query<T>().FirstOrDefaultAsync(x => x.TypeAlias == type.Alias);
-
-//      if (entity != null)
-//      {
-//        entity.Name = type.Name;
-//        entity.TypeAlias = type.Alias;
-//      }
-
-//      return WhenActive(entity) as T;
-//    }
+//    return null;
 //  }
 
 
-//  public interface IIntegrationsCollection
+//  /// <inheritdoc />
+//  public async Task<Integration> GetByAlias(string alias)
 //  {
-//    /// <summary>
-//    /// Get all registered integration types
-//    /// </summary>
-//    IReadOnlyCollection<IntegrationType> RegisteredTypes { get; }
+//    IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));
+//    return await Load<Integration>(type);
+//  }
 
-//    /// <summary>
-//    /// Get new integration model for the specified integration type alias
-//    /// </summary>
-//    Integration GetEmpty(string alias);
 
-//    /// <summary>
-//    /// Get integration by an alias
-//    /// </summary>
-//    Task<Integration> GetByAlias(string alias);
+//  /// <inheritdoc />
+//  public async Task<T> Get<T>(string alias = null) where T : Integration, new()
+//  {
+//    IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.ContentType == typeof(T) && (alias.IsNullOrEmpty() || x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase)));
+//    return await Load<T>(type);
+//  }
 
-//    /// <summary>
-//    /// Get an integration by type and optional alias
-//    /// </summary>
-//    Task<T> Get<T>(string alias = null) where T : Integration, new();
 
-//    /// <summary>
-//    /// Get all integrations by a certain tag
-//    /// </summary>
-//    Task<IList<Integration>> GetByTag(string tag);
+//  /// <inheritdoc />
+//  public async Task<IList<Integration>> GetByTag(string tag)
+//  {
+//    IEnumerable<IntegrationType> types = RegisteredTypes.Where(x => x.Tags.Contains(tag, StringComparer.InvariantCultureIgnoreCase));
 
-//    /// <summary>
-//    /// Check if any integrations of certain tag are activated
-//    /// </summary>
-//    Task<bool> Any(string tag);
+//    if (!types.Any())
+//    {
+//      return new List<Integration>();
+//    }
 
-//    /// <summary>
-//    /// Get all integrations with the specified query
-//    /// </summary>
-//    Task<Paged<Integration>> Load(ListQuery<Integration> query);
+//    string[] aliases = types.Select(x => x.Alias).ToArray();
+//    return await Session.Query<Integration>().Where(x => x.TypeAlias.In(aliases)).ToListAsync();
+//  }
 
-//    /// <summary>
-//    /// Get all integration types with their configuration status
-//    /// </summary>
-//    Task<IList<IntegrationTypeWithStatus>> GetTypesWithStatus();
 
-//    /// <summary>
-//    /// Saves an integration
-//    /// </summary>
-//    Task<EntityResult<Integration>> Save(Integration model);
+//  /// <inheritdoc />
+//  public async Task<bool> Any(string tag)
+//  {
+//    return (await GetByTag(tag)).Any(x => x.IsActive);
+//  }
 
-//    /// <summary>
-//    /// Activates a configured integration
-//    /// </summary>
-//    Task<EntityResult<Integration>> Activate(string alias);
 
-//    /// <summary>
-//    /// Disables a configured integration
-//    /// </summary>
-//    Task<EntityResult<Integration>> Deactivate(string alias);
+//  /// <inheritdoc />
+//  public override async Task<Paged<Integration>> Load(ListQuery<Integration> query)
+//  {
+//    List<Integration> result = new();
+//    List<Integration> models = await Session.Query<Integration>().ToListAsync();
 
-//    /// <summary>
-//    /// Deletes configuration of an integration and disables it
-//    /// </summary>
-//    Task<EntityResult<Integration>> DeleteByAlias(string alias);
+//    foreach (IntegrationType type in RegisteredTypes)
+//    {
+//      Integration model = models.FirstOrDefault(x => x.TypeAlias == type.Alias);
+
+//      if (model != null)
+//      {
+//        model.Name = type.Name;
+//        result.Add(model);
+//      }
+//    }
+
+//    return result.ToQueriedList(query);
+//  }
+
+
+//  /// <inheritdoc />
+//  public async Task<IList<IntegrationTypeWithStatus>> GetTypesWithStatus()
+//  {
+//    List<IntegrationTypeWithStatus> result = new();
+//    List<Integration> models = await Session.Query<Integration>().ToListAsync();
+
+//    foreach (IntegrationType type in RegisteredTypes)
+//    {
+//      Integration model = models.FirstOrDefault(x => x.TypeAlias == type.Alias);
+
+//      result.Add(new()
+//      {
+//        Type = type,
+//        Id = model?.Id,
+//        IsActive = model?.IsActive ?? false,
+//        IsConfigured = model != null
+//      });
+//    }
+
+//    return result.OrderByDescending(x => x.IsActive).ThenByDescending(x => x.IsConfigured).ThenByDescending(x => x.Type.Name).ToList();
+//  }
+
+
+//  /// <inheritdoc />
+//  public override async Task<Result<Integration>> Save(Integration model)
+//  {
+//    if (model == null)
+//    {
+//      return Result<Integration>.Fail("@integration.errors.notfound");
+//    }
+
+//    IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(model.TypeAlias, StringComparison.InvariantCultureIgnoreCase));
+
+//    if (type == null)
+//    {
+//      return Result<Integration>.Fail("@integration.errors.typenotfound");
+//    }
+
+//    string existingId = await Session.Query<Integration>().Where(x => x.TypeAlias == type.Alias).Select(x => x.Id).FirstOrDefaultAsync();
+
+//    if (!existingId.IsNullOrEmpty() && existingId != model.Id)
+//    {
+//      return Result<Integration>.Fail("@integration.errors.multiplenotallowed");
+//    }
+
+//    model.Alias = type.Alias;
+//    model.Name = null;
+
+//    Result<Integration> result = await base.Save(model);
+
+//    if (result.IsSuccess)
+//    {
+//      result.Model.Name = type.Name;
+//    }
+
+//    return result;
+//  }
+
+
+//  /// <inheritdoc />
+//  public async Task<Result<Integration>> Activate(string alias)
+//  {
+//    Integration model = await GetByAlias(alias);
+//    if (model != null)
+//    {
+//      model.IsActive = true;
+//    }
+//    return await Save(model);
+//  }
+
+
+//  /// <inheritdoc />
+//  public async Task<Result<Integration>> Deactivate(string alias)
+//  {
+//    Integration model = await GetByAlias(alias);
+//    if (model != null)
+//    {
+//      model.IsActive = false;
+//    }
+//    return await Save(model);
+//  }
+
+
+//  /// <inheritdoc />
+//  public async Task<Result<Integration>> DeleteByAlias(string alias)
+//  {
+//    return await base.Delete(await GetByAlias(alias));
+//  }
+
+
+//  /// <summary>
+//  /// Get integration data from database
+//  /// </summary>
+//  protected async Task<T> Load<T>(IntegrationType type) where T : Integration, new()
+//  {
+//    if (type == null)
+//    {
+//      return default;
+//    }
+
+//    T entity = await Session.Query<T>().FirstOrDefaultAsync(x => x.TypeAlias == type.Alias);
+
+//    if (entity != null)
+//    {
+//      entity.Name = type.Name;
+//      entity.TypeAlias = type.Alias;
+//    }
+
+//    return WhenActive(entity) as T;
 //  }
 //}
+
+
+//public interface IIntegrationsCollection
+//{
+//  /// <summary>
+//  /// Get all registered integration types
+//  /// </summary>
+//  IReadOnlyCollection<IntegrationType> RegisteredTypes { get; }
+
+//  /// <summary>
+//  /// Get new integration model for the specified integration type alias
+//  /// </summary>
+//  Integration GetEmpty(string alias);
+
+//  /// <summary>
+//  /// Get integration by an alias
+//  /// </summary>
+//  Task<Integration> GetByAlias(string alias);
+
+//  /// <summary>
+//  /// Get an integration by type and optional alias
+//  /// </summary>
+//  Task<T> Get<T>(string alias = null) where T : Integration, new();
+
+//  /// <summary>
+//  /// Get all integrations by a certain tag
+//  /// </summary>
+//  Task<IList<Integration>> GetByTag(string tag);
+
+//  /// <summary>
+//  /// Check if any integrations of certain tag are activated
+//  /// </summary>
+//  Task<bool> Any(string tag);
+
+//  /// <summary>
+//  /// Get all integrations with the specified query
+//  /// </summary>
+//  Task<Paged<Integration>> Load(ListQuery<Integration> query);
+
+//  /// <summary>
+//  /// Get all integration types with their configuration status
+//  /// </summary>
+//  Task<IList<IntegrationTypeWithStatus>> GetTypesWithStatus();
+
+//  /// <summary>
+//  /// Saves an integration
+//  /// </summary>
+//  Task<Result<Integration>> Save(Integration model);
+
+//  /// <summary>
+//  /// Activates a configured integration
+//  /// </summary>
+//  Task<Result<Integration>> Activate(string alias);
+
+//  /// <summary>
+//  /// Disables a configured integration
+//  /// </summary>
+//  Task<Result<Integration>> Deactivate(string alias);
+
+//  /// <summary>
+//  /// Deletes configuration of an integration and disables it
+//  /// </summary>
+//  Task<Result<Integration>> DeleteByAlias(string alias);
+//}