diff --git a/zero.Web.UI/App/components/buttons/select-button.vue b/zero.Web.UI/App/components/buttons/select-button.vue
index aaba2b79..e095ee5d 100644
--- a/zero.Web.UI/App/components/buttons/select-button.vue
+++ b/zero.Web.UI/App/components/buttons/select-button.vue
@@ -16,7 +16,7 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media';
+  import MediaApi from 'zero/resources/media.js';
 
   export default {
     name: 'uiSelectButton',
diff --git a/zero.Web.UI/App/components/date.vue b/zero.Web.UI/App/components/date.vue
index 8787a6f0..3df6d4bd 100644
--- a/zero.Web.UI/App/components/date.vue
+++ b/zero.Web.UI/App/components/date.vue
@@ -5,7 +5,7 @@
 
 <script>
   import dayjs from 'dayjs';
-  import Strings from 'zero/services/strings';
+  import Strings from 'zero/services/strings.js';
 
   export default {
     name: 'uiDate',
diff --git a/zero.Web.UI/App/components/forms/alias.vue b/zero.Web.UI/App/components/forms/alias.vue
index 3d25d5cc..f270b7d8 100644
--- a/zero.Web.UI/App/components/forms/alias.vue
+++ b/zero.Web.UI/App/components/forms/alias.vue
@@ -10,7 +10,7 @@
 
 <script>
   import { map as _map } from 'underscore';
-  import UtilsApi from 'zero/resources/utils';
+  import UtilsApi from 'zero/resources/utils.js';
 
   export default {
     name: 'uiAlias',
diff --git a/zero.Web.UI/App/components/forms/error.vue b/zero.Web.UI/App/components/forms/error.vue
index aded7dfb..97334d26 100644
--- a/zero.Web.UI/App/components/forms/error.vue
+++ b/zero.Web.UI/App/components/forms/error.vue
@@ -7,7 +7,7 @@
 
 <script>
   import { isArray as _isArray } from 'underscore'
-  import Strings from 'zero/services/strings'
+  import Strings from 'zero/services/strings.js'
 
   export default {
     name: 'uiError',
diff --git a/zero.Web.UI/App/components/forms/media-old.vue b/zero.Web.UI/App/components/forms/media-old.vue
index 622c9a6d..e1c2be62 100644
--- a/zero.Web.UI/App/components/forms/media-old.vue
+++ b/zero.Web.UI/App/components/forms/media-old.vue
@@ -28,7 +28,7 @@
   import { each as _each, extend as _extend, debounce as _debounce, isArray as _isArray } from 'underscore';
   import Strings from 'zero/services/strings.js';
   import Overlay from 'zero/services/overlay.js';
-  import MediaOverlay from 'zero/pages/media/media-item';
+  import MediaOverlay from 'zero/pages/media/media-item.vue';
 
   const TYPES = {
     ALL: 'all',
diff --git a/zero.Web.UI/App/components/forms/rte.vue b/zero.Web.UI/App/components/forms/rte.vue
index 0062fe50..0e28479b 100644
--- a/zero.Web.UI/App/components/forms/rte.vue
+++ b/zero.Web.UI/App/components/forms/rte.vue
@@ -13,7 +13,7 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
+  import Strings from 'zero/services/strings.js';
   import Pell from './rte.pell.dependency.js';
 
   export default {
diff --git a/zero.Web.UI/App/components/header-bar.vue b/zero.Web.UI/App/components/header-bar.vue
index 2761b69b..eb295330 100644
--- a/zero.Web.UI/App/components/header-bar.vue
+++ b/zero.Web.UI/App/components/header-bar.vue
@@ -25,7 +25,7 @@
 
 
 <script>
-  import Overlay from 'zero/services/overlay';
+  import Overlay from 'zero/services/overlay.js';
 
   export default {
     name: 'uiHeaderBar',
diff --git a/zero.Web.UI/App/components/modules/edit-module.vue b/zero.Web.UI/App/components/modules/edit-module.vue
index d9e9df4b..dc97ebb2 100644
--- a/zero.Web.UI/App/components/modules/edit-module.vue
+++ b/zero.Web.UI/App/components/modules/edit-module.vue
@@ -24,7 +24,7 @@
 
 <script>
   import ModulesApi from 'zero/resources/modules.js';
-  import UiEditor from 'zero/editor/editor';
+  import UiEditor from 'zero/editor/editor.vue';
 
   export default {
 
diff --git a/zero.Web.UI/App/components/modules/modules-select.vue b/zero.Web.UI/App/components/modules/modules-select.vue
index 63834496..661786aa 100644
--- a/zero.Web.UI/App/components/modules/modules-select.vue
+++ b/zero.Web.UI/App/components/modules/modules-select.vue
@@ -31,7 +31,7 @@
 
 <script>
   import { groupBy as _groupBy, keys as _keys, each as _each } from 'underscore';
-  import Notification from 'zero/services/notification';
+  import Notification from 'zero/services/notification.js';
 
   export default {
     name: 'uiModulesSelect',
diff --git a/zero.Web.UI/App/components/modules/modules.vue b/zero.Web.UI/App/components/modules/modules.vue
index 72fb236b..0bb59a9c 100644
--- a/zero.Web.UI/App/components/modules/modules.vue
+++ b/zero.Web.UI/App/components/modules/modules.vue
@@ -10,7 +10,7 @@
 
 <script>
   import ModulesApi from 'zero/resources/modules.js';
-  import EditModuleOverlay from './edit-module';
+  import EditModuleOverlay from './edit-module.vue';
   import Overlay from 'zero/services/overlay.js';
   import Arrays from 'zero/services/arrays.js';
 
diff --git a/zero.Web.UI/App/components/overlays/dropdown-button.vue b/zero.Web.UI/App/components/overlays/dropdown-button.vue
index 4888159f..19f4f64b 100644
--- a/zero.Web.UI/App/components/overlays/dropdown-button.vue
+++ b/zero.Web.UI/App/components/overlays/dropdown-button.vue
@@ -18,7 +18,7 @@
 
 
 <script>
-  import { warn } from 'zero/services/debug';
+  import { warn } from 'zero/services/debug.js';
 
   export default {
     name: 'uiDropdownButton',
diff --git a/zero.Web.UI/App/components/overlays/dropdown.vue b/zero.Web.UI/App/components/overlays/dropdown.vue
index 03c569fe..3a695edc 100644
--- a/zero.Web.UI/App/components/overlays/dropdown.vue
+++ b/zero.Web.UI/App/components/overlays/dropdown.vue
@@ -11,7 +11,7 @@
 
 
 <script>
-  import Overlay from 'zero/services/overlay';
+  import Overlay from 'zero/services/overlay.js';
 
   export default {
     name: 'uiDropdown',
diff --git a/zero.Web.UI/App/components/permissions.vue b/zero.Web.UI/App/components/permissions.vue
index 7490b040..278d0046 100644
--- a/zero.Web.UI/App/components/permissions.vue
+++ b/zero.Web.UI/App/components/permissions.vue
@@ -18,7 +18,7 @@
 
 
 <script>
-  import UserRolesApi from 'zero/resources/userRoles';
+  import UserRolesApi from 'zero/resources/userRoles.js';
   import { filter as _filter } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/components/pickers/colorPicker/colorpicker.vue b/zero.Web.UI/App/components/pickers/colorPicker/colorpicker.vue
index 759c8716..877288a5 100644
--- a/zero.Web.UI/App/components/pickers/colorPicker/colorpicker.vue
+++ b/zero.Web.UI/App/components/pickers/colorPicker/colorpicker.vue
@@ -10,7 +10,7 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
+  import Strings from 'zero/services/strings.js';
   import { extend as _extend } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/components/pickers/countryPicker/countrypicker.vue b/zero.Web.UI/App/components/pickers/countryPicker/countrypicker.vue
index d5e4542c..5ce4068f 100644
--- a/zero.Web.UI/App/components/pickers/countryPicker/countrypicker.vue
+++ b/zero.Web.UI/App/components/pickers/countryPicker/countrypicker.vue
@@ -7,7 +7,7 @@
 
 <script>
   import CountriesApi from 'zero/resources/countries.js'
-  import { extend as _extend } from 'deps/underscore'
+  import { extend as _extend } from 'underscore'
 
   export default {
     name: 'uiCountrypicker',
diff --git a/zero.Web.UI/App/components/pickers/datePicker/datepicker.vue b/zero.Web.UI/App/components/pickers/datePicker/datepicker.vue
index f2e59b55..43419c96 100644
--- a/zero.Web.UI/App/components/pickers/datePicker/datepicker.vue
+++ b/zero.Web.UI/App/components/pickers/datePicker/datepicker.vue
@@ -12,8 +12,8 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
-  import DatepickerOverlay from './overlay';
+  import Strings from 'zero/services/strings.js';
+  import DatepickerOverlay from './overlay.vue';
   import { extend as _extend } from 'underscore';
   import dayjs from 'dayjs';
 
diff --git a/zero.Web.UI/App/components/pickers/dateRangePicker/daterangepicker.vue b/zero.Web.UI/App/components/pickers/dateRangePicker/daterangepicker.vue
index b3fb2a5e..3c39b87a 100644
--- a/zero.Web.UI/App/components/pickers/dateRangePicker/daterangepicker.vue
+++ b/zero.Web.UI/App/components/pickers/dateRangePicker/daterangepicker.vue
@@ -20,9 +20,9 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
+  import Strings from 'zero/services/strings.js';
   import { extend as _extend } from 'underscore';
-  import DaterangepickerOverlay from './overlay';
+  import DaterangepickerOverlay from './overlay.vue';
   import Overlay from 'zero/services/overlay.js';
   import dayjs from 'dayjs';
 
diff --git a/zero.Web.UI/App/components/pickers/iconPicker/iconpicker.vue b/zero.Web.UI/App/components/pickers/iconPicker/iconpicker.vue
index 53b6c2ea..7a5cfbb8 100644
--- a/zero.Web.UI/App/components/pickers/iconPicker/iconpicker.vue
+++ b/zero.Web.UI/App/components/pickers/iconPicker/iconpicker.vue
@@ -7,8 +7,8 @@
 
 
 <script>
-  import PickIconOverlay from './overlay';
-  import Overlay from 'zero/services/overlay';
+  import PickIconOverlay from './overlay.vue';
+  import Overlay from 'zero/services/overlay.js';
   import { extend as _extend } from 'underscore';
 
   const FEATHER_ICONS = ['fth-alert-octagon','fth-alert-circle','fth-activity','fth-alert-triangle','fth-align-center','fth-airplay','fth-align-justify','fth-align-left','fth-align-right','fth-arrow-down-left','fth-arrow-down-right','fth-anchor','fth-aperture','fth-arrow-left','fth-arrow-right','fth-arrow-down','fth-arrow-up-left','fth-arrow-up-right','fth-arrow-up','fth-award','fth-bar-chart','fth-at-sign','fth-bar-chart-2','fth-battery-charging','fth-bell-off','fth-battery','fth-bluetooth','fth-bell','fth-book','fth-briefcase','fth-camera-off','fth-calendar','fth-bookmark','fth-box','fth-camera','fth-check-circle','fth-check','fth-check-square','fth-cast','fth-chevron-down','fth-chevron-left','fth-chevron-right','fth-chevron-up','fth-chevrons-down','fth-chevrons-right','fth-chevrons-up','fth-chevrons-left','fth-circle','fth-clipboard','fth-chrome','fth-clock','fth-cloud-lightning','fth-cloud-drizzle','fth-cloud-rain','fth-cloud-off','fth-codepen','fth-cloud-snow','fth-compass','fth-copy','fth-corner-down-right','fth-corner-down-left','fth-corner-left-down','fth-corner-left-up','fth-corner-up-left','fth-corner-up-right','fth-corner-right-down','fth-corner-right-up','fth-cpu','fth-credit-card','fth-crosshair','fth-disc','fth-delete','fth-download-cloud','fth-download','fth-droplet','fth-edit-2','fth-edit','fth-edit-1','fth-external-link','fth-eye','fth-feather','fth-facebook','fth-file-minus','fth-eye-off','fth-fast-forward','fth-file-text','fth-film','fth-file','fth-file-plus','fth-folder','fth-filter','fth-flag','fth-globe','fth-grid','fth-heart','fth-home','fth-github','fth-image','fth-inbox','fth-layers','fth-info','fth-instagram','fth-layout','fth-link-2','fth-life-buoy','fth-link','fth-log-in','fth-list','fth-lock','fth-log-out','fth-loader','fth-mail','fth-maximize-2','fth-map','fth-map-pin','fth-menu','fth-message-circle','fth-message-square','fth-minimize-2','fth-mic-off','fth-minus-circle','fth-mic','fth-minus-square','fth-minus','fth-moon','fth-monitor','fth-more-vertical','fth-more-horizontal','fth-move','fth-music','fth-navigation-2','fth-navigation','fth-octagon','fth-package','fth-pause-circle','fth-pause','fth-percent','fth-phone-call','fth-phone-forwarded','fth-phone-missed','fth-phone-off','fth-phone-incoming','fth-phone','fth-phone-outgoing','fth-pie-chart','fth-play-circle','fth-play','fth-plus-square','fth-plus-circle','fth-plus','fth-pocket','fth-printer','fth-power','fth-radio','fth-repeat','fth-refresh-ccw','fth-rewind','fth-rotate-ccw','fth-refresh-cw','fth-rotate-cw','fth-save','fth-search','fth-server','fth-scissors','fth-share-2','fth-share','fth-shield','fth-settings','fth-skip-back','fth-shuffle','fth-sidebar','fth-skip-forward','fth-slack','fth-slash','fth-smartphone','fth-square','fth-speaker','fth-star','fth-stop-circle','fth-sun','fth-sunrise','fth-tablet','fth-tag','fth-sunset','fth-target','fth-thermometer','fth-thumbs-up','fth-thumbs-down','fth-toggle-left','fth-toggle-right','fth-trash-2','fth-trash','fth-trending-up','fth-trending-down','fth-triangle','fth-type','fth-twitter','fth-upload','fth-umbrella','fth-upload-cloud','fth-unlock','fth-user-check','fth-user-minus','fth-user-plus','fth-user-x','fth-user','fth-users','fth-video-off','fth-video','fth-voicemail','fth-volume-x','fth-volume-2','fth-volume-1','fth-volume','fth-watch','fth-wifi','fth-x-square','fth-wind','fth-x','fth-x-circle','fth-zap','fth-zoom-in','fth-zoom-out','fth-command','fth-cloud','fth-hash','fth-headphones','fth-underline','fth-italic','fth-bold','fth-crop','fth-help-circle','fth-paperclip','fth-shopping-cart','fth-tv','fth-wifi-off','fth-minimize','fth-maximize','fth-gitlab','fth-sliders','fth-star-on','fth-heart-on','fth-archive','fth-arrow-down-circle','fth-arrow-up-circle','fth-arrow-left-circle','fth-arrow-right-circle','fth-bar-chart-line-','fth-bar-chart-line','fth-book-open','fth-code','fth-database','fth-dollar-sign','fth-folder-plus','fth-gift','fth-folder-minus','fth-git-commit','fth-git-branch','fth-git-pull-request','fth-git-merge','fth-linkedin','fth-hard-drive','fth-more-vertical','fth-more-horizontal','fth-rss','fth-send','fth-shield-off','fth-shopping-bag','fth-terminal','fth-truck','fth-zap-off','fth-youtube','fth-google'];
diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue b/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
index e39ada65..8f01bc37 100644
--- a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
+++ b/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
@@ -26,8 +26,8 @@
 
 <script>
   import MediaApi from 'zero/resources/media.js'
-  import PickMediaOverlay from './overlay';
-  import Overlay from 'zero/services/overlay';
+  import PickMediaOverlay from './overlay.vue';
+  import Overlay from 'zero/services/overlay.js';
   import { each as _each, extend as _extend, debounce as _debounce, isArray as _isArray } from 'underscore';
   import Strings from 'zero/services/strings.js';
 
diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue b/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
index 1bf791fc..684de902 100644
--- a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
+++ b/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
@@ -41,8 +41,8 @@
   import MediaApi from 'zero/resources/media.js'
   import MediaFolderApi from 'zero/resources/media-folder.js';
   import Overlay from 'zero/services/overlay.js'
-  import AddFolderOverlay from 'zero/pages/media/overlays/folder'
-  import UploadStatusOverlay from 'zero/pages/media/overlays/upload-status'
+  import AddFolderOverlay from 'zero/pages/media/overlays/folder.vue'
+  import UploadStatusOverlay from 'zero/pages/media/overlays/upload-status.vue'
   import { debounce as _debounce, filter as _filter } from 'underscore'
 
   export default {
diff --git a/zero.Web.UI/App/components/pickers/pagePicker/pagepicker.vue b/zero.Web.UI/App/components/pickers/pagePicker/pagepicker.vue
index b4d719ff..4c59cd1e 100644
--- a/zero.Web.UI/App/components/pickers/pagePicker/pagepicker.vue
+++ b/zero.Web.UI/App/components/pickers/pagePicker/pagepicker.vue
@@ -15,9 +15,9 @@
 <script>
   import PageTreeApi from 'zero/resources/page-tree.js'
   import PagesApi from 'zero/resources/pages.js'
-  import PageOverlay from './overlay';
-  import Overlay from 'zero/services/overlay';
-  import { extend as _extend, isArray as _isArray, isEmpty as _isEmpty, clone as _clone } from 'deps/underscore';
+  import PageOverlay from './overlay.vue';
+  import Overlay from 'zero/services/overlay.js';
+  import { extend as _extend, isArray as _isArray, isEmpty as _isEmpty, clone as _clone } from 'underscore';
 
   export default {
     name: 'uiPagepicker',
diff --git a/zero.Web.UI/App/components/pickers/userPicker/userpicker.vue b/zero.Web.UI/App/components/pickers/userPicker/userpicker.vue
index 2cb11f54..10614947 100644
--- a/zero.Web.UI/App/components/pickers/userPicker/userpicker.vue
+++ b/zero.Web.UI/App/components/pickers/userPicker/userpicker.vue
@@ -7,7 +7,7 @@
 
 <script>
   import UsersApi from 'zero/resources/users.js'
-  import { extend as _extend } from 'deps/underscore'
+  import { extend as _extend } from 'underscore'
 
   export default {
     name: 'uiUserpicker',
diff --git a/zero.Web.UI/App/components/revisions.vue b/zero.Web.UI/App/components/revisions.vue
index 79dd9e05..99c0af21 100644
--- a/zero.Web.UI/App/components/revisions.vue
+++ b/zero.Web.UI/App/components/revisions.vue
@@ -17,7 +17,7 @@
 
 <script>
   import dayjs from 'dayjs';
-  import Strings from 'zero/services/strings';
+  import Strings from 'zero/services/strings.js';
   import MediaApi from 'zero/resources/media.js';
 
   export default {
diff --git a/zero.Web.UI/App/components/tables/table-filter-overlay.vue b/zero.Web.UI/App/components/tables/table-filter-overlay.vue
index 081915c2..b0e462e9 100644
--- a/zero.Web.UI/App/components/tables/table-filter-overlay.vue
+++ b/zero.Web.UI/App/components/tables/table-filter-overlay.vue
@@ -44,8 +44,8 @@
 
 
 <script>
-  import EditorComponent from 'zero/editor/editor-component';
-  import { find as _find } from 'deps/underscore';
+  import EditorComponent from 'zero/editor/editor-component.vue';
+  import { find as _find } from 'underscore';
 
   export default {
 
diff --git a/zero.Web.UI/App/components/tables/table-filter.vue b/zero.Web.UI/App/components/tables/table-filter.vue
index 53646489..0b589aef 100644
--- a/zero.Web.UI/App/components/tables/table-filter.vue
+++ b/zero.Web.UI/App/components/tables/table-filter.vue
@@ -32,9 +32,9 @@
 
 
 <script>
-  import Overlay from 'zero/services/overlay';
-  import Strings from 'zero/services/strings';
-  import FilterOverlay from './table-filter-overlay';
+  import Overlay from 'zero/services/overlay.js';
+  import Strings from 'zero/services/strings.js';
+  import FilterOverlay from './table-filter-overlay.vue';
   import { isArray as _isArray } from 'underscore';
 
   const KEY_PREFIX = 'zero.ui-table-filter.';
diff --git a/zero.Web.UI/App/components/tables/table-value.js b/zero.Web.UI/App/components/tables/table-value.js
index d5384919..d61c11a3 100644
--- a/zero.Web.UI/App/components/tables/table-value.js
+++ b/zero.Web.UI/App/components/tables/table-value.js
@@ -1,5 +1,5 @@
-import { warn } from 'zero/services/debug';
-import MediaApi from 'zero/resources/media';
+import { warn } from 'zero/services/debug.js';
+import MediaApi from 'zero/resources/media.js';
 
 export default function (el, binding)
 {
diff --git a/zero.Web.UI/App/components/tabs/tab.vue b/zero.Web.UI/App/components/tabs/tab.vue
index 198e3ecb..4f77d7e8 100644
--- a/zero.Web.UI/App/components/tabs/tab.vue
+++ b/zero.Web.UI/App/components/tabs/tab.vue
@@ -6,7 +6,7 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
+  import Strings from 'zero/services/strings.js';
 
   export default {
     name: 'uiTab',
diff --git a/zero.Web.UI/App/config/axios.config.js b/zero.Web.UI/App/config/axios.config.js
index f9d1272f..2f801393 100644
--- a/zero.Web.UI/App/config/axios.config.js
+++ b/zero.Web.UI/App/config/axios.config.js
@@ -1,5 +1,5 @@
 import Axios from 'axios';
-import Auth from 'zero/services/auth';
+import Auth from 'zero/services/auth.js';
 import Qs from 'qs';
 
 if (!__zero || !__zero.apiPath)
diff --git a/zero.Web.UI/App/config/router.config.js b/zero.Web.UI/App/config/router.config.js
index e6c330b3..1bf2c2ca 100644
--- a/zero.Web.UI/App/config/router.config.js
+++ b/zero.Web.UI/App/config/router.config.js
@@ -1,4 +1,4 @@
-import Localization from 'zero/services/localization';
+import Localization from 'zero/services/localization.js';
 import { isArray as _isArray } from 'underscore';
 
 
diff --git a/zero.Web.UI/App/directives/currency.js b/zero.Web.UI/App/directives/currency.js
index cd0712e1..7db7b302 100644
--- a/zero.Web.UI/App/directives/currency.js
+++ b/zero.Web.UI/App/directives/currency.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import Strings from 'zero/services/strings';
+import Strings from 'zero/services/strings.js';
 
 /// <summary>
 /// Outputs a currency
diff --git a/zero.Web.UI/App/directives/date.js b/zero.Web.UI/App/directives/date.js
index d0937961..5724f9ac 100644
--- a/zero.Web.UI/App/directives/date.js
+++ b/zero.Web.UI/App/directives/date.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import Strings from 'zero/services/strings';
+import Strings from 'zero/services/strings.js';
 
 /// <summary>
 /// Outputs a formatted date
diff --git a/zero.Web.UI/App/directives/filesize.js b/zero.Web.UI/App/directives/filesize.js
index 96c0dfbf..8ebca4ed 100644
--- a/zero.Web.UI/App/directives/filesize.js
+++ b/zero.Web.UI/App/directives/filesize.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import Strings from 'zero/services/strings';
+import Strings from 'zero/services/strings.js';
 
 /// <summary>
 /// Outputs a filesize
diff --git a/zero.Web.UI/App/directives/globals.js b/zero.Web.UI/App/directives/globals.js
index f18f37a1..7cc88182 100644
--- a/zero.Web.UI/App/directives/globals.js
+++ b/zero.Web.UI/App/directives/globals.js
@@ -1,9 +1,9 @@
 
-import './date';
-import './localize';
-import './resizable';
-import './dropdown';
-import './clickoutside';
-import './filesize';
-import './currency';
-import './sortable';
\ No newline at end of file
+import './date.js';
+import './localize.js';
+import './resizable.js';
+import './dropdown.js';
+import './clickoutside.js';
+import './filesize.js';
+import './currency.js';
+import './sortable.js';
\ No newline at end of file
diff --git a/zero.Web.UI/App/directives/localize.js b/zero.Web.UI/App/directives/localize.js
index cd1fa6c5..f4bec5bb 100644
--- a/zero.Web.UI/App/directives/localize.js
+++ b/zero.Web.UI/App/directives/localize.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import Localization from 'zero/services/localization';
+import Localization from 'zero/services/localization.js';
 
 /// <summary>
 /// Localizes the given property and sets the inner-text of the node to its result
diff --git a/zero.Web.UI/App/editor/editor-component-old.vue b/zero.Web.UI/App/editor/editor-component-old.vue
index 9e3c94e7..a8d3376d 100644
--- a/zero.Web.UI/App/editor/editor-component-old.vue
+++ b/zero.Web.UI/App/editor/editor-component-old.vue
@@ -7,9 +7,9 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
-  import Objects from 'zero/services/objects';
-  import Localization from 'zero/services/localization';
+  import Strings from 'zero/services/strings.js';
+  import Objects from 'zero/services/objects.js';
+  import Localization from 'zero/services/localization.js';
 
   const staticViews = ['line'];
 
diff --git a/zero.Web.UI/App/editor/editor-component.vue b/zero.Web.UI/App/editor/editor-component.vue
index f8b1e6db..c04c5d37 100644
--- a/zero.Web.UI/App/editor/editor-component.vue
+++ b/zero.Web.UI/App/editor/editor-component.vue
@@ -7,11 +7,11 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
-  import Objects from 'zero/services/objects';
+  import Strings from 'zero/services/strings.js';
+  import Objects from 'zero/services/objects.js';
   import Editor from 'zero/core/editor.js';
   import EditorField from 'zero/core/editor-field.js';
-  import Localization from 'zero/services/localization';
+  import Localization from 'zero/services/localization.js';
 
   export default {
     name: 'uiEditorComponent',
diff --git a/zero.Web.UI/App/editor/editor-overlay.vue b/zero.Web.UI/App/editor/editor-overlay.vue
index 450be617..360480f0 100644
--- a/zero.Web.UI/App/editor/editor-overlay.vue
+++ b/zero.Web.UI/App/editor/editor-overlay.vue
@@ -23,7 +23,7 @@
 
 
 <script>
-  import UiEditor from 'zero/editor/editor';
+  import UiEditor from 'zero/editor/editor.vue';
 
   export default {
 
diff --git a/zero.Web.UI/App/editor/fields/culturepicker.vue b/zero.Web.UI/App/editor/fields/culturepicker.vue
index f84ebb12..dbf05d59 100644
--- a/zero.Web.UI/App/editor/fields/culturepicker.vue
+++ b/zero.Web.UI/App/editor/fields/culturepicker.vue
@@ -8,7 +8,7 @@
 
 
 <script>
-  import LanguagesApi from 'zero/resources/languages';
+  import LanguagesApi from 'zero/resources/languages.js';
 
   export default {
     props: {
diff --git a/zero.Web.UI/App/editor/fields/language.vue b/zero.Web.UI/App/editor/fields/language.vue
index 66c3cf9d..0fef4a95 100644
--- a/zero.Web.UI/App/editor/fields/language.vue
+++ b/zero.Web.UI/App/editor/fields/language.vue
@@ -9,7 +9,7 @@
 
 
 <script>
-  import LanguagesApi from 'zero/resources/languages';
+  import LanguagesApi from 'zero/resources/languages.js';
 
   export default {
     props: {
diff --git a/zero.Web.UI/App/editor/fields/nested.vue b/zero.Web.UI/App/editor/fields/nested.vue
index 693076fc..70d6a8e2 100644
--- a/zero.Web.UI/App/editor/fields/nested.vue
+++ b/zero.Web.UI/App/editor/fields/nested.vue
@@ -11,9 +11,9 @@
 </template>
 
 <script>
-  import UiEditor from 'zero/editor/editor';
-  import UiEditorOverlay from 'zero/editor/editor-overlay';
-  import Overlay from 'zero/services/overlay';
+  import UiEditor from 'zero/editor/editor.vue';
+  import UiEditorOverlay from 'zero/editor/editor-overlay.vue';
+  import Overlay from 'zero/services/overlay.js';
   import Editor from 'zero/core/editor.js';
 
   export default {
diff --git a/zero.Web.UI/App/filters/globals.js b/zero.Web.UI/App/filters/globals.js
index 451ead79..9679afb1 100644
--- a/zero.Web.UI/App/filters/globals.js
+++ b/zero.Web.UI/App/filters/globals.js
@@ -1,2 +1,2 @@
 
-import './localize';
\ No newline at end of file
+import './localize.js';
\ No newline at end of file
diff --git a/zero.Web.UI/App/filters/localize.js b/zero.Web.UI/App/filters/localize.js
index 65f2b611..658a7e19 100644
--- a/zero.Web.UI/App/filters/localize.js
+++ b/zero.Web.UI/App/filters/localize.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import Localization from 'zero/services/localization';
+import Localization from 'zero/services/localization.js';
 
 /// <summary>
 /// Localizes the given property and sets the inner-text of the node to its result
diff --git a/zero.Web.UI/App/navigation.vue b/zero.Web.UI/App/navigation.vue
index cd4c7660..8f53d4ed 100644
--- a/zero.Web.UI/App/navigation.vue
+++ b/zero.Web.UI/App/navigation.vue
@@ -61,7 +61,7 @@
   import { map as _map, find as _find } from 'underscore';
   import AuthApi from 'zero/services/auth.js'
   import MediaApi from 'zero/resources/media.js'
-  import IconPicker from 'zero/components/pickers/iconPicker/iconpicker';
+  import IconPicker from 'zero/components/pickers/iconPicker/iconpicker.vue';
 
   export default {
     name: 'app-navigation',
diff --git a/zero.Web.UI/App/pages/dashboard/dashboard.vue b/zero.Web.UI/App/pages/dashboard/dashboard.vue
index 0c1ba14d..18b676e9 100644
--- a/zero.Web.UI/App/pages/dashboard/dashboard.vue
+++ b/zero.Web.UI/App/pages/dashboard/dashboard.vue
@@ -11,10 +11,9 @@
 </template>
 
 <script>
-  import DashboardElement from 'zero/dashboard/element';
 
   export default {
-    components: { DashboardElement },
+    
   }
 </script>
 
diff --git a/zero.Web.UI/App/pages/media/detail.vue b/zero.Web.UI/App/pages/media/detail.vue
index c09fdb2a..17db9679 100644
--- a/zero.Web.UI/App/pages/media/detail.vue
+++ b/zero.Web.UI/App/pages/media/detail.vue
@@ -32,8 +32,8 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media';
-  import UiEditor from 'zero/editor/editor';
+  import MediaApi from 'zero/resources/media.js';
+  import UiEditor from 'zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/media/media.vue b/zero.Web.UI/App/pages/media/media.vue
index 66c58b99..6ec0e087 100644
--- a/zero.Web.UI/App/pages/media/media.vue
+++ b/zero.Web.UI/App/pages/media/media.vue
@@ -58,12 +58,12 @@
   import MediaApi from 'zero/resources/media.js';
   import MediaFolderApi from 'zero/resources/media-folder.js';
   import Overlay from 'zero/services/overlay.js';
-  import FolderOverlay from './overlays/folder';
-  import MoveOverlay from './overlays/move';
-  import MediaItemOverlay from './media-overlay-item';
-  import MediaItem from './media-item';
-  import UploadStatusOverlay from './overlays/upload-status';
-  import EventHub from 'zero/services/eventhub';
+  import FolderOverlay from './overlays/folder.vue';
+  import MoveOverlay from './overlays/move.vue';
+  import MediaItemOverlay from './media-overlay-item.vue';
+  import MediaItem from './media-item.vue';
+  import UploadStatusOverlay from './overlays/upload-status.vue';
+  import EventHub from 'zero/services/eventhub.js';
   import Notification from 'zero/services/notification.js';
   import { each as _each, extend as _extend, debounce as _debounce, isArray as _isArray } from 'underscore';
 
diff --git a/zero.Web.UI/App/pages/pages/overlays/copy.vue b/zero.Web.UI/App/pages/pages/overlays/copy.vue
index 4f4f1565..99398c0d 100644
--- a/zero.Web.UI/App/pages/pages/overlays/copy.vue
+++ b/zero.Web.UI/App/pages/pages/overlays/copy.vue
@@ -23,7 +23,7 @@
 
 <script>
   import PageTreeApi from 'zero/resources/page-tree.js'
-  import PagesApi from 'zero/resources/pages';
+  import PagesApi from 'zero/resources/pages.js';
   import Notification from 'zero/services/notification.js'
 
   export default {
diff --git a/zero.Web.UI/App/pages/pages/overlays/move.vue b/zero.Web.UI/App/pages/pages/overlays/move.vue
index 1a81b728..55f14d68 100644
--- a/zero.Web.UI/App/pages/pages/overlays/move.vue
+++ b/zero.Web.UI/App/pages/pages/overlays/move.vue
@@ -18,7 +18,7 @@
 
 <script>
   import PageTreeApi from 'zero/resources/page-tree.js'
-  import PagesApi from 'zero/resources/pages';
+  import PagesApi from 'zero/resources/pages.js';
   import Notification from 'zero/services/notification.js'
 
   export default {
diff --git a/zero.Web.UI/App/pages/pages/overlays/sort.vue b/zero.Web.UI/App/pages/pages/overlays/sort.vue
index 8f84eddd..5649e352 100644
--- a/zero.Web.UI/App/pages/pages/overlays/sort.vue
+++ b/zero.Web.UI/App/pages/pages/overlays/sort.vue
@@ -23,7 +23,7 @@
 
 <script>
   import PageTreeApi from 'zero/resources/page-tree.js'
-  import PagesApi from 'zero/resources/pages';
+  import PagesApi from 'zero/resources/pages.js';
   import Arrays from 'zero/services/arrays.js'
   import Notification from 'zero/services/notification.js'
 
diff --git a/zero.Web.UI/App/pages/pages/page-info.vue b/zero.Web.UI/App/pages/pages/page-info.vue
index af11b876..4b567783 100644
--- a/zero.Web.UI/App/pages/pages/page-info.vue
+++ b/zero.Web.UI/App/pages/pages/page-info.vue
@@ -38,7 +38,7 @@
 
 
 <script>
-  import PagesApi from 'zero/resources/pages';
+  import PagesApi from 'zero/resources/pages.js';
 
   export default {
     props: {
diff --git a/zero.Web.UI/App/pages/pages/page.vue b/zero.Web.UI/App/pages/pages/page.vue
index 25f08ad4..18a0da9a 100644
--- a/zero.Web.UI/App/pages/pages/page.vue
+++ b/zero.Web.UI/App/pages/pages/page.vue
@@ -27,14 +27,14 @@
 
 
 <script>
-  import UiEditor from 'zero/editor/editor';
-  import PagesApi from 'zero/resources/pages';
-  import EventHub from 'zero/services/eventhub';
-  import InfoTab from './page-info';
+  import UiEditor from 'zero/editor/editor.vue';
+  import PagesApi from 'zero/resources/pages.js';
+  import EventHub from 'zero/services/eventhub.js';
+  import InfoTab from './page-info.vue';
   import Overlay from 'zero/services/overlay.js'
-  import MoveOverlay from './overlays/move'
-  import CopyOverlay from './overlays/copy'
-  import Strings from 'zero/services/strings';
+  import MoveOverlay from './overlays/move.vue'
+  import CopyOverlay from './overlays/copy.vue'
+  import Strings from 'zero/services/strings.js';
   import { find as _find, debounce as _debounce } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/pages/pages/pages.vue b/zero.Web.UI/App/pages/pages/pages.vue
index ff3006c1..602d20fa 100644
--- a/zero.Web.UI/App/pages/pages/pages.vue
+++ b/zero.Web.UI/App/pages/pages/pages.vue
@@ -36,13 +36,13 @@
   import PageTreeApi from 'zero/resources/page-tree.js'
   import PagesApi from 'zero/resources/pages.js'
   import Overlay from 'zero/services/overlay.js'
-  import CreateOverlay from './overlays/create'
-  import SortOverlay from './overlays/sort'
-  import MoveOverlay from './overlays/move'
-  import CopyOverlay from './overlays/copy'
-  import EventHub from 'zero/services/eventhub'
+  import CreateOverlay from './overlays/create.vue'
+  import SortOverlay from './overlays/sort.vue'
+  import MoveOverlay from './overlays/move.vue'
+  import CopyOverlay from './overlays/copy.vue'
+  import EventHub from 'zero/services/eventhub.js'
   import Notification from 'zero/services/notification.js'
-  import Strings from 'zero/services/strings';
+  import Strings from 'zero/services/strings.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/pages/recyclebin/recyclebin-actions.vue b/zero.Web.UI/App/pages/pages/recyclebin/recyclebin-actions.vue
index 956f88cf..c40b8a83 100644
--- a/zero.Web.UI/App/pages/pages/recyclebin/recyclebin-actions.vue
+++ b/zero.Web.UI/App/pages/pages/recyclebin/recyclebin-actions.vue
@@ -36,7 +36,7 @@
 
 <script>
   import RecycleBinApi from 'zero/resources/recycle-bin.js'
-  import PagesApi from 'zero/resources/pages';
+  import PagesApi from 'zero/resources/pages.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/pages/recyclebin/recyclebin.vue b/zero.Web.UI/App/pages/pages/recyclebin/recyclebin.vue
index df3ca09b..4710d291 100644
--- a/zero.Web.UI/App/pages/pages/recyclebin/recyclebin.vue
+++ b/zero.Web.UI/App/pages/pages/recyclebin/recyclebin.vue
@@ -16,8 +16,8 @@
 
   import RecycleBinApi from 'zero/resources/recycle-bin.js'
   import Overlay from 'zero/services/overlay.js'
-  import RecycleBinActionsOverlay from './recyclebin-actions'
-  import EventHub from 'zero/services/eventhub'
+  import RecycleBinActionsOverlay from './recyclebin-actions.vue'
+  import EventHub from 'zero/services/eventhub.js'
 
   export default {
     data: () => ({
diff --git a/zero.Web.UI/App/pages/settings/application-features.vue b/zero.Web.UI/App/pages/settings/application-features.vue
index b67558c4..ebf036b9 100644
--- a/zero.Web.UI/App/pages/settings/application-features.vue
+++ b/zero.Web.UI/App/pages/settings/application-features.vue
@@ -8,7 +8,7 @@
 
 
 <script>
-  import ApplicationsApi from 'zero/resources/applications';
+  import ApplicationsApi from 'zero/resources/applications.js';
 
   export default {
     props: {
diff --git a/zero.Web.UI/App/pages/settings/application.vue b/zero.Web.UI/App/pages/settings/application.vue
index 67efcffd..fa39e038 100644
--- a/zero.Web.UI/App/pages/settings/application.vue
+++ b/zero.Web.UI/App/pages/settings/application.vue
@@ -7,8 +7,8 @@
 
 
 <script>
-  import ApplicationsApi from 'zero/resources/applications';
-  import UiEditor from 'zero/editor/editor';
+  import ApplicationsApi from 'zero/resources/applications.js';
+  import UiEditor from 'zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/settings/applications.vue b/zero.Web.UI/App/pages/settings/applications.vue
index 6af52e5a..8ecb9845 100644
--- a/zero.Web.UI/App/pages/settings/applications.vue
+++ b/zero.Web.UI/App/pages/settings/applications.vue
@@ -9,7 +9,7 @@
 
 
 <script>
-  import ApplicationsItems from 'zero/pages/settings/applications-items'
+  import ApplicationsItems from 'zero/pages/settings/applications-items.vue'
   import ApplicationsApi from 'zero/resources/applications.js'
 
   export default {
diff --git a/zero.Web.UI/App/pages/settings/country.vue b/zero.Web.UI/App/pages/settings/country.vue
index a50c23d4..9e133347 100644
--- a/zero.Web.UI/App/pages/settings/country.vue
+++ b/zero.Web.UI/App/pages/settings/country.vue
@@ -7,8 +7,8 @@
 
 
 <script>
-  import CountriesApi from 'zero/resources/countries';
-  import UiEditor from 'zero/editor/editor';
+  import CountriesApi from 'zero/resources/countries.js';
+  import UiEditor from 'zero/editor/editor.vue';
 
   export default {
     components: { UiEditor },
diff --git a/zero.Web.UI/App/pages/settings/language.vue b/zero.Web.UI/App/pages/settings/language.vue
index 9af5abef..37baf7df 100644
--- a/zero.Web.UI/App/pages/settings/language.vue
+++ b/zero.Web.UI/App/pages/settings/language.vue
@@ -7,8 +7,8 @@
 
 
 <script>
-  import LanguagesApi from 'zero/resources/languages';
-  import UiEditor from 'zero/editor/editor';
+  import LanguagesApi from 'zero/resources/languages.js';
+  import UiEditor from 'zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/settings/role.vue b/zero.Web.UI/App/pages/settings/role.vue
index b3dd1e6c..e6c7f259 100644
--- a/zero.Web.UI/App/pages/settings/role.vue
+++ b/zero.Web.UI/App/pages/settings/role.vue
@@ -8,8 +8,8 @@
 
 <script>
   import { filter as _filter } from 'underscore';
-  import UserRolesApi from 'zero/resources/userRoles';
-  import UiEditor from 'zero/editor/editor';
+  import UserRolesApi from 'zero/resources/userRoles.js';
+  import UiEditor from 'zero/editor/editor.vue';
 
   export default {
     components: { UiEditor },
diff --git a/zero.Web.UI/App/pages/settings/settings.vue b/zero.Web.UI/App/pages/settings/settings.vue
index c155da62..56213e33 100644
--- a/zero.Web.UI/App/pages/settings/settings.vue
+++ b/zero.Web.UI/App/pages/settings/settings.vue
@@ -25,7 +25,7 @@
 
 
 <script>
-  import ApplicationsItems from 'zero/pages/settings/applications-items'
+  import ApplicationsItems from 'zero/pages/settings/applications-items.vue'
   import SettingsApi from 'zero/resources/settings.js';
 
   export default {
diff --git a/zero.Web.UI/App/pages/settings/translation.vue b/zero.Web.UI/App/pages/settings/translation.vue
index d7b57804..24fe3cfa 100644
--- a/zero.Web.UI/App/pages/settings/translation.vue
+++ b/zero.Web.UI/App/pages/settings/translation.vue
@@ -33,7 +33,7 @@
 <script>
   import TranslationsApi from 'zero/resources/translations.js';
   import Overlay from 'zero/services/overlay.js';
-  import Editor from 'zero/editor/editor';
+  import Editor from 'zero/editor/editor.vue';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/settings/translations.vue b/zero.Web.UI/App/pages/settings/translations.vue
index e042f928..db280821 100644
--- a/zero.Web.UI/App/pages/settings/translations.vue
+++ b/zero.Web.UI/App/pages/settings/translations.vue
@@ -13,7 +13,7 @@
 
 <script>
   import Overlay from 'zero/services/overlay.js';
-  import AddOverlay from './translation';
+  import AddOverlay from './translation.vue';
 
   export default {
     data: () => ({
diff --git a/zero.Web.UI/App/pages/settings/user.vue b/zero.Web.UI/App/pages/settings/user.vue
index a21d6e6c..7a4982f3 100644
--- a/zero.Web.UI/App/pages/settings/user.vue
+++ b/zero.Web.UI/App/pages/settings/user.vue
@@ -27,8 +27,8 @@
 
 <script>
   import { filter as _filter } from 'underscore';
-  import UsersApi from 'zero/resources/users';
-  import UiEditor from 'zero/editor/editor';
+  import UsersApi from 'zero/resources/users.js';
+  import UiEditor from 'zero/editor/editor.vue';
 
   export default {
     components: { UiEditor },
diff --git a/zero.Web.UI/App/pages/spaces/spaces.vue b/zero.Web.UI/App/pages/spaces/spaces.vue
index eefefdfd..4d2a2d8e 100644
--- a/zero.Web.UI/App/pages/spaces/spaces.vue
+++ b/zero.Web.UI/App/pages/spaces/spaces.vue
@@ -20,9 +20,9 @@
 </template>
 
 <script>
-  import SpaceEditor from 'zero/pages/spaces/views/editor';
-  import SpaceList from 'zero/pages/spaces/views/list';
-  import SpaceCustom from 'zero/pages/spaces/views/custom';
+  import SpaceEditor from 'zero/pages/spaces/views/editor.vue';
+  import SpaceList from 'zero/pages/spaces/views/list.vue';
+  import SpaceCustom from 'zero/pages/spaces/views/custom.vue';
   import SpacesApi from 'zero/resources/spaces.js';
 
   export default {
diff --git a/zero.Web.UI/App/pages/spaces/views/editor.vue b/zero.Web.UI/App/pages/spaces/views/editor.vue
index 042f9b09..077c1be2 100644
--- a/zero.Web.UI/App/pages/spaces/views/editor.vue
+++ b/zero.Web.UI/App/pages/spaces/views/editor.vue
@@ -8,7 +8,7 @@
 
 <script>
   import SpacesApi from 'zero/resources/spaces.js';
-  import UiEditor from 'zero/editor/editor';
+  import UiEditor from 'zero/editor/editor.vue';
   import Overlay from 'zero/services/overlay.js';
 
   export default {
diff --git a/zero.Web.UI/App/renderer/createListField.js b/zero.Web.UI/App/renderer/createListField.js
deleted file mode 100644
index 504fff73..00000000
--- a/zero.Web.UI/App/renderer/createListField.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { warn } from 'zero/services/debug';
-
-
-/**
- * Creates a new field for list rendering.
- * 
- * @param {string} name This is the name.
- * @param {object} opts These are the options.
- */
-let createListField = function (name, opts)
-{
-  return function ()
-  {
-    return {
-      onRender: () =>
-      {
-        // render nothing if not defined
-      },
-      asHTML: response =>
-      {
-        return {
-          __html: true,
-          response: response
-        }
-      }
-    };
-  };
-};
-
-
-export default createListField;
\ No newline at end of file
diff --git a/zero.Web.UI/App/renderer/createListRenderer.js b/zero.Web.UI/App/renderer/createListRenderer.js
deleted file mode 100644
index 42c2f791..00000000
--- a/zero.Web.UI/App/renderer/createListRenderer.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { warn } from 'zero/services/debug';
-
-
-let createListRenderer = function (name, opts)
-{
-  var config = {
-    labelTemplate: null,
-    link: null,
-    actions: [],
-    columns: {}
-  };
-
-
-  // generate a label
-  let label = func =>
-  {
-    if (typeof func === 'string')
-    {
-      config.labelTemplate = field => func + "fields." + field;
-    }
-    else if (typeof func === 'function')
-    {
-      config.labelTemplate = func;
-    }
-    else
-    {
-      warn(`createListRenderer: label() parameter has to be either a string (which renders [@my-string].fields.my-field) or a function which returns a string`);
-    }
-  };
-
-
-  // generate a link
-  let link = func =>
-  {
-    if (typeof func === 'string')
-    {
-      config.link = (item, $router) => $router.push({
-        name: func,
-        params: { id: item.id }
-      });
-    }
-    else if (typeof func === 'function')
-    {
-      config.link = func;
-    }
-    else
-    {
-      warn(`createListRenderer: link() parameter has to be either a string (which calls $router.push({ name: [my-string], params: { id: [item.id] } }) or a function which is called on click`);
-    }
-  };
-
-
-  // adds a list action
-  let action = function (key, label, icon, action)
-  {
-    config.actions.push({
-      key,
-      label,
-      icon,
-      action
-    });
-  };
-
-
-  // adds a column
-  let column = function (field)
-  {
-    return {
-      image: () => { },
-      text: () => { },
-      checkbox: () => { }
-    };
-  };
-
-
-  return { 
-    label,
-    link,
-    action,
-    column
-  };
-};
-
-
-export default createListRenderer;
\ No newline at end of file
diff --git a/zero.Web.UI/App/renderer/list-fields/text.js b/zero.Web.UI/App/renderer/list-fields/text.js
deleted file mode 100644
index de8340ab..00000000
--- a/zero.Web.UI/App/renderer/list-fields/text.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Localization from 'zero/services/localization';
-import createListField from 'zero/renderer/createListField';
-
-let field = createListField('text');
-
-field.onRender = (value, config) =>
-{
-  const hasFunc = typeof config.render === 'function';
-  const hasSharedIndicator = config.shared === true && config.model.appId === zero.sharedAppId;
-
-  let html = hasFunc ? config.render(config.model, config) : value;
-
-  if (config.localize === true)
-  {
-    html = Localization.localize(html, config.tokens || {});
-  }
-
-  if (hasSharedIndicator)
-  {
-    //html = html + ' <i class="ui-table-field-shared is-inline fth-radio"></i>';
-    html = html + ' <i class="ui-table-field-shared-2 is-inline">(shared)</i>';
-  }
-
-  if (config.as === 'html' || hasSharedIndicator)
-  {
-    return field.asHTML(html);
-  }
-
-  return html;
-};
-
-export default field;
\ No newline at end of file
diff --git a/zero.Web.UI/App/renderers/lists/languages.js b/zero.Web.UI/App/renderers/lists/languages.js
index 003735da..9d11ea48 100644
--- a/zero.Web.UI/App/renderers/lists/languages.js
+++ b/zero.Web.UI/App/renderers/lists/languages.js
@@ -1,6 +1,6 @@
 
 import List from 'zero/core/list.js';
-import LanguagesApi from 'zero/resources/languages';
+import LanguagesApi from 'zero/resources/languages.js';
 
 const list = new List('languages');
 const prefix = '@language.fields.';
diff --git a/zero.Web.UI/App/resources/media.js b/zero.Web.UI/App/resources/media.js
index 96fdf795..762d8a92 100644
--- a/zero.Web.UI/App/resources/media.js
+++ b/zero.Web.UI/App/resources/media.js
@@ -1,5 +1,5 @@
 import Axios from 'axios';
-import Strings from 'zero/services/strings';
+import Strings from 'zero/services/strings.js';
 
 const base = 'media/';
 
diff --git a/zero.Web.UI/App/resources/users.js b/zero.Web.UI/App/resources/users.js
index 1d676345..672325f1 100644
--- a/zero.Web.UI/App/resources/users.js
+++ b/zero.Web.UI/App/resources/users.js
@@ -1,5 +1,5 @@
 import Axios from 'axios';
-import AuthApi from 'zero/services/auth';
+import AuthApi from 'zero/services/auth.js';
 
 const base = 'users/';
 
diff --git a/zero.Web.UI/App/services/auth.js b/zero.Web.UI/App/services/auth.js
index 86c156bc..91c9f184 100644
--- a/zero.Web.UI/App/services/auth.js
+++ b/zero.Web.UI/App/services/auth.js
@@ -1,8 +1,8 @@
 import Vue from 'vue';
-import Overlay from 'zero/services/overlay';
+import Overlay from 'zero/services/overlay.js';
 import { find as _find, extend as _extend } from 'underscore';
 import Axios from 'axios';
-import PasswordChangeOverlay from 'zero/pages/password-change';
+import PasswordChangeOverlay from 'zero/pages/password-change.vue';
 
 export default new Vue({
 
diff --git a/zero.Web.UI/App/services/notification.js b/zero.Web.UI/App/services/notification.js
index 656d6c64..73e02922 100644
--- a/zero.Web.UI/App/services/notification.js
+++ b/zero.Web.UI/App/services/notification.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import Strings from 'zero/services/strings';
+import Strings from 'zero/services/strings.js';
 import { find as _find, extend as _extend } from 'underscore';
 
 export default new Vue({
diff --git a/zero.Web.UI/App/services/overlay.js b/zero.Web.UI/App/services/overlay.js
index c9e9c65f..29ca8951 100644
--- a/zero.Web.UI/App/services/overlay.js
+++ b/zero.Web.UI/App/services/overlay.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import AppConfirm from 'zero/components/overlays/confirm';
-import Strings from 'zero/services/strings';
+import AppConfirm from 'zero/components/overlays/confirm.vue';
+import Strings from 'zero/services/strings.js';
 import { find as _find, extend as _extend } from 'underscore';
 
 export default new Vue({
diff --git a/zero.Web.UI/app.js b/zero.Web.UI/app.js
deleted file mode 100644
index f2cbba77..00000000
--- a/zero.Web.UI/app.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Vue from 'vue';
-import VueRouter from 'vue-router';
-import Zero from 'zero/core/zero.js';
-import App from 'zero/app';
-import 'zero/components/globals';
-import 'zero/directives/globals';
-import 'zero/filters/globals';
-
-Vue.use(VueRouter);
-Vue.use(Zero);
-
-App.router = Zero.instance.router;
-
-var app = new Vue(App);
-
-app.$mount('#app');
\ No newline at end of file
diff --git a/zero.Web.UI/app/app.js b/zero.Web.UI/app/app.js
new file mode 100644
index 00000000..1865f58e
--- /dev/null
+++ b/zero.Web.UI/app/app.js
@@ -0,0 +1,16 @@
+import Vue from 'vue';
+import VueRouter from 'vue-router';
+import Zero from 'zero/core/zero.ts';
+import App from 'zero/app.vue';
+import 'zero/components/globals.js';
+import 'zero/directives/globals.js';
+import 'zero/filters/globals.js';
+
+Vue.use(VueRouter);
+Vue.use(Zero);
+
+App.router = Zero.instance.router;
+
+var app = new Vue(App);
+
+app.$mount('#app');
\ No newline at end of file
diff --git a/zero.Web.UI/App/core/editor-field.js b/zero.Web.UI/app/core/editor-field.ts
similarity index 100%
rename from zero.Web.UI/App/core/editor-field.js
rename to zero.Web.UI/app/core/editor-field.ts
diff --git a/zero.Web.UI/App/core/editor.js b/zero.Web.UI/app/core/editor.ts
similarity index 100%
rename from zero.Web.UI/App/core/editor.js
rename to zero.Web.UI/app/core/editor.ts
diff --git a/zero.Web.UI/App/core/list-action.js b/zero.Web.UI/app/core/list-action.ts
similarity index 75%
rename from zero.Web.UI/App/core/list-action.js
rename to zero.Web.UI/app/core/list-action.ts
index 9f4f8b86..915ead7b 100644
--- a/zero.Web.UI/App/core/list-action.js
+++ b/zero.Web.UI/app/core/list-action.ts
@@ -1,7 +1,7 @@
 
-import MediaApi from 'zero/resources/media';
-import Strings from 'zero/services/strings';
-import Localization from 'zero/services/localization';
+import MediaApi from 'zero/resources/media.js';
+import Strings from 'zero/services/strings.js';
+import Localization from 'zero/services/localization.js';
 
 class ListAction
 {
diff --git a/zero.Web.UI/App/core/list-column.js b/zero.Web.UI/app/core/list-column.ts
similarity index 96%
rename from zero.Web.UI/App/core/list-column.js
rename to zero.Web.UI/app/core/list-column.ts
index efed3c57..7db886e2 100644
--- a/zero.Web.UI/App/core/list-column.js
+++ b/zero.Web.UI/app/core/list-column.ts
@@ -1,7 +1,7 @@
 
-import MediaApi from 'zero/resources/media';
-import Strings from 'zero/services/strings';
-import Localization from 'zero/services/localization';
+import MediaApi from 'zero/resources/media.js';
+import Strings from 'zero/services/strings.js';
+import Localization from 'zero/services/localization.js';
 
 class ListColumn
 {
diff --git a/zero.Web.UI/App/core/list.js b/zero.Web.UI/app/core/list.ts
similarity index 100%
rename from zero.Web.UI/App/core/list.js
rename to zero.Web.UI/app/core/list.ts
diff --git a/zero.Web.UI/App/core/plugin.js b/zero.Web.UI/app/core/plugin.ts
similarity index 100%
rename from zero.Web.UI/App/core/plugin.js
rename to zero.Web.UI/app/core/plugin.ts
diff --git a/zero.Web.UI/App/core/zero.js b/zero.Web.UI/app/core/zero.ts
similarity index 93%
rename from zero.Web.UI/App/core/zero.js
rename to zero.Web.UI/app/core/zero.ts
index e53f59df..ad42f59b 100644
--- a/zero.Web.UI/App/core/zero.js
+++ b/zero.Web.UI/app/core/zero.ts
@@ -7,8 +7,8 @@ import ZeroPlugin from './plugin.zero.js';
 import EventHub from '../services/eventhub.js';
 import VueRouter from 'vue-router';
 import Vue from 'vue';
-import CommercePlugin from '../../../zero.Commerce/Plugins/zero.Commerce/plugin.js'; // TODO dynPath
-import TestPlugin from '../../../../Laola/Laola.Backoffice/Plugin/plugin.js'; // TODO dynPath
+//import CommercePlugin from '../../../zero.Commerce/Plugins/zero.Commerce/plugin.js'; // TODO dynPath
+//import TestPlugin from '../../../../Laola/Laola.Backoffice/Plugin/plugin.js'; // TODO dynPath
 import options from './options.js';
 import routerConfig from '../config/router.config.js'
 
@@ -34,8 +34,8 @@ class Zero
     this.#vue = vue;
 
     this.use(ZeroPlugin);
-    this.use(CommercePlugin);
-    this.use(TestPlugin);
+    //this.use(CommercePlugin);
+    //this.use(TestPlugin);
   }
 
 
diff --git a/zero.Web.UI/index.html b/zero.Web.UI/index.html
new file mode 100644
index 00000000..d276e7c8
--- /dev/null
+++ b/zero.Web.UI/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <link rel="icon" href="/favicon.ico" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Vite App</title>
+</head>
+<body>
+  <div id="app"></div>
+  <script type="module" src="app/app.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zero.Web.UI/package.json b/zero.Web.UI/package.json
index 83a310e1..cba1d1f2 100644
--- a/zero.Web.UI/package.json
+++ b/zero.Web.UI/package.json
@@ -3,32 +3,23 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "install": "",
-    "zero": "node zero.run.js",
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "build-dev": "vue-cli-service build --mode development",
-    "watch": "vue-cli-service build --mode development --watch"
+    "dev": "vite",
+    "build": "vite build"
   },
   "dependencies": {
-    "core-js": "^3.6.5",
-    "axios": "^0.19.2",
+    "axios": "^0.21.0",
     "dayjs": "^1.8.26",
     "flatpickr": "^4.6.3",
-    "lodash": "*",
+    "qs": "^6.9.4",
     "sortablejs": "^1.10.2",
     "underscore": "^1.10.2",
-    "vue": "^2.6.11",
-    "vue-router": "^3.2.0"
+    "vue": "^2.6.12",
+    "vue-router": "^3.4.8"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-router": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "npm-cmd": "^0.2.0",
     "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
-    "syncpack": "^5.6.10",
-    "vue-template-compiler": "^2.6.11"
+    "vite": "^1.0.0-rc.8",
+    "vite-plugin-vue2": "^0.2.1",
+    "vue-template-compiler": "^2.6.12"
   }
 }
diff --git a/zero.Web.UI/vite.config.js b/zero.Web.UI/vite.config.js
new file mode 100644
index 00000000..952fef80
--- /dev/null
+++ b/zero.Web.UI/vite.config.js
@@ -0,0 +1,50 @@
+const path = require('path');
+const { createVuePlugin } = require('vite-plugin-vue2');
+
+let zeroPlugins = [];
+//if (process.env.ZERO_PLUGINS)
+//{
+//  let plugins = JSON.parse(process.env.ZERO_PLUGINS);
+
+//  plugins.forEach(plugin =>
+//  {
+//    const pluginConfig = require(plugin.path);
+
+//    if (pluginConfig != null)
+//    {
+//      zeroPlugins.push(pluginConfig());
+//    }
+//  });
+//}
+
+const aliasResolver = {
+  alias(id)
+  {
+    if (id.indexOf('zero/') === 0 || id.indexOf('shop/') === 0)
+    {
+      return '/@' + id;
+    }
+  }
+  //requestToFile(publicPath, root)
+  //{
+  //  if (publicPath.indexOf('/@zero/') === 0)
+  //  {
+  //    return path.join(root, publicPath.replace('/@zero/', ''));
+  //  }
+  //  if (publicPath.indexOf('/@shop/') === 0)
+  //  {
+  //    return path.join(root, publicPath.replace('/@shop/', '../zero.Commerce/Plugins/zero.Commerce/'));
+  //  }
+  //}
+};
+
+export default {
+  port: process.env.PORT,
+  cors: true,
+  emitManifest: true,
+  plugins: [createVuePlugin(), ...zeroPlugins],
+  alias: {
+    '/@zero/': path.resolve(__dirname, 'app/')
+  },
+  resolvers: [aliasResolver]
+}
\ No newline at end of file