diff --git a/src/components/NcActionButton/index.js b/src/components/NcActionButton/index.js
index 966ae6a1f6..f7db80e02d 100644
--- a/src/components/NcActionButton/index.js
+++ b/src/components/NcActionButton/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionButton from './NcActionButton.vue'
 
-export default NcActionButton
+export { default } from './NcActionButton.vue'
diff --git a/src/components/NcActionCaption/index.js b/src/components/NcActionCaption/index.js
index a8a1faae96..9b7b3912c1 100644
--- a/src/components/NcActionCaption/index.js
+++ b/src/components/NcActionCaption/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionCaption from './NcActionCaption.vue'
 
-export default NcActionCaption
+export { default } from './NcActionCaption.vue'
diff --git a/src/components/NcActionCheckbox/index.js b/src/components/NcActionCheckbox/index.js
index 16ea10db95..cdea518da9 100644
--- a/src/components/NcActionCheckbox/index.js
+++ b/src/components/NcActionCheckbox/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionCheckbox from './NcActionCheckbox.vue'
 
-export default NcActionCheckbox
+export { default } from './NcActionCheckbox.vue'
diff --git a/src/components/NcActionInput/index.js b/src/components/NcActionInput/index.js
index 581af0d61c..0919a6f8df 100644
--- a/src/components/NcActionInput/index.js
+++ b/src/components/NcActionInput/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionInput from './NcActionInput.vue'
 
-export default NcActionInput
+export { default } from './NcActionInput.vue'
diff --git a/src/components/NcActionLink/index.js b/src/components/NcActionLink/index.js
index 6a670e4e70..32ee90657d 100644
--- a/src/components/NcActionLink/index.js
+++ b/src/components/NcActionLink/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionLink from './NcActionLink.vue'
 
-export default NcActionLink
+export { default } from './NcActionLink.vue'
diff --git a/src/components/NcActionRadio/index.js b/src/components/NcActionRadio/index.js
index a7e9122e93..fa74b16108 100644
--- a/src/components/NcActionRadio/index.js
+++ b/src/components/NcActionRadio/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionRadio from './NcActionRadio.vue'
 
-export default NcActionRadio
+export { default } from './NcActionRadio.vue'
diff --git a/src/components/NcActionRouter/index.js b/src/components/NcActionRouter/index.js
index b14b99e95e..60d3d9b738 100644
--- a/src/components/NcActionRouter/index.js
+++ b/src/components/NcActionRouter/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionRouter from './NcActionRouter.vue'
 
-export default NcActionRouter
+export { default } from './NcActionRouter.vue'
diff --git a/src/components/NcActionSeparator/index.js b/src/components/NcActionSeparator/index.js
index db9e31562c..019bcffc71 100644
--- a/src/components/NcActionSeparator/index.js
+++ b/src/components/NcActionSeparator/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionSeparator from './NcActionSeparator.vue'
 
-export default NcActionSeparator
+export { default } from './NcActionSeparator.vue'
diff --git a/src/components/NcActionText/index.js b/src/components/NcActionText/index.js
index c020999887..2f533e3138 100644
--- a/src/components/NcActionText/index.js
+++ b/src/components/NcActionText/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionText from './NcActionText.vue'
 
-export default NcActionText
+export { default } from './NcActionText.vue'
diff --git a/src/components/NcActionTextEditable/index.js b/src/components/NcActionTextEditable/index.js
index 5eea239cc9..c10ba89382 100644
--- a/src/components/NcActionTextEditable/index.js
+++ b/src/components/NcActionTextEditable/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActionTextEditable from './NcActionTextEditable.vue'
 
-export default NcActionTextEditable
+export { default } from './NcActionTextEditable.vue'
diff --git a/src/components/NcActions/index.js b/src/components/NcActions/index.js
index d883bb0d94..0207000af4 100644
--- a/src/components/NcActions/index.js
+++ b/src/components/NcActions/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcActions from './NcActions.vue'
 
-export default NcActions
+export { default } from './NcActions.vue'
diff --git a/src/components/NcAppContent/index.js b/src/components/NcAppContent/index.js
index 753309e163..d88fd701e6 100644
--- a/src/components/NcAppContent/index.js
+++ b/src/components/NcAppContent/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppContent from './NcAppContent.vue'
 
-export default NcAppContent
+export { default } from './NcAppContent.vue'
diff --git a/src/components/NcAppContentDetails/index.js b/src/components/NcAppContentDetails/index.js
index fb6f88dcc1..7d92c16002 100644
--- a/src/components/NcAppContentDetails/index.js
+++ b/src/components/NcAppContentDetails/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppContentDetails from './NcAppContentDetails.vue'
 
-export default NcAppContentDetails
+export { default } from './NcAppContentDetails.vue'
diff --git a/src/components/NcAppContentList/index.js b/src/components/NcAppContentList/index.js
index 04cb9204af..05f9c50084 100644
--- a/src/components/NcAppContentList/index.js
+++ b/src/components/NcAppContentList/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppContentList from './NcAppContentList.vue'
 
-export default NcAppContentList
+export { default } from './NcAppContentList.vue'
diff --git a/src/components/NcAppNavigation/index.js b/src/components/NcAppNavigation/index.js
index 8626a2f09f..336ea0a7de 100644
--- a/src/components/NcAppNavigation/index.js
+++ b/src/components/NcAppNavigation/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppNavigation from './NcAppNavigation.vue'
 
-export default NcAppNavigation
+export { default } from './NcAppNavigation.vue'
diff --git a/src/components/NcAppNavigationCaption/index.js b/src/components/NcAppNavigationCaption/index.js
index 34d0889c38..8f19c90f5f 100644
--- a/src/components/NcAppNavigationCaption/index.js
+++ b/src/components/NcAppNavigationCaption/index.js
@@ -1,3 +1,23 @@
-import NcAppNavigationCaption from './NcAppNavigationCaption.vue'
+/**
+ * @copyright 2022 Raimund Schlüßler <raimund.schluessler@mailbox.org>
+ *
+ * @author Christopher Ng <chrng8@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
-export default NcAppNavigationCaption
+export { default } from './NcAppNavigationCaption.vue'
diff --git a/src/components/NcAppNavigationCounter/index.js b/src/components/NcAppNavigationCounter/index.js
index 90ce1a91f0..175d497b20 100644
--- a/src/components/NcAppNavigationCounter/index.js
+++ b/src/components/NcAppNavigationCounter/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcAppNavigationCounter from './NcAppNavigationCounter.vue'
-
-export default NcAppNavigationCounter
+export { default } from './NcAppNavigationCounter.vue'
diff --git a/src/components/NcAppNavigationIconBullet/index.js b/src/components/NcAppNavigationIconBullet/index.js
index e9579c9673..b217be0fce 100644
--- a/src/components/NcAppNavigationIconBullet/index.js
+++ b/src/components/NcAppNavigationIconBullet/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcAppNavigationIconBullet from './NcAppNavigationIconBullet.vue'
 
-export default NcAppNavigationIconBullet
+export { default } from './NcAppNavigationIconBullet.vue'
diff --git a/src/components/NcAppNavigationItem/index.js b/src/components/NcAppNavigationItem/index.js
index b23d0a3ecf..0759d41987 100644
--- a/src/components/NcAppNavigationItem/index.js
+++ b/src/components/NcAppNavigationItem/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcAppNavigationItem from './NcAppNavigationItem.vue'
 
-export default NcAppNavigationItem
+export { default } from './NcAppNavigationItem.vue'
diff --git a/src/components/NcAppNavigationNew/index.js b/src/components/NcAppNavigationNew/index.js
index cd0daa4c8c..a6b23ae51e 100644
--- a/src/components/NcAppNavigationNew/index.js
+++ b/src/components/NcAppNavigationNew/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppNavigationNew from './NcAppNavigationNew.vue'
 
-export default NcAppNavigationNew
+export { default } from './NcAppNavigationNew.vue'
diff --git a/src/components/NcAppNavigationNewItem/index.js b/src/components/NcAppNavigationNewItem/index.js
index af4a0218dc..a4dfcbb319 100644
--- a/src/components/NcAppNavigationNewItem/index.js
+++ b/src/components/NcAppNavigationNewItem/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcAppNavigationNewItem from './NcAppNavigationNewItem.vue'
 
-export default NcAppNavigationNewItem
+export { default } from './NcAppNavigationNewItem.vue'
diff --git a/src/components/NcAppNavigationSettings/index.js b/src/components/NcAppNavigationSettings/index.js
index 8521f2be50..a290feb251 100644
--- a/src/components/NcAppNavigationSettings/index.js
+++ b/src/components/NcAppNavigationSettings/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppNavigationSettings from './NcAppNavigationSettings.vue'
 
-export default NcAppNavigationSettings
+export { default } from './NcAppNavigationSettings.vue'
diff --git a/src/components/NcAppNavigationSpacer/index.js b/src/components/NcAppNavigationSpacer/index.js
index 2bf3348e7e..85f8822aab 100644
--- a/src/components/NcAppNavigationSpacer/index.js
+++ b/src/components/NcAppNavigationSpacer/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppNavigationSpacer from './NcAppNavigationSpacer.vue'
 
-export default NcAppNavigationSpacer
+export { default } from './NcAppNavigationSpacer.vue'
diff --git a/src/components/NcAppSettingsDialog/index.js b/src/components/NcAppSettingsDialog/index.js
index e327f4c807..27419edb3a 100644
--- a/src/components/NcAppSettingsDialog/index.js
+++ b/src/components/NcAppSettingsDialog/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcAppSettingsDialog from './NcAppSettingsDialog.vue'
-
-export default NcAppSettingsDialog
+export { default } from './NcAppSettingsDialog.vue'
diff --git a/src/components/NcAppSettingsSection/index.js b/src/components/NcAppSettingsSection/index.js
index ed6cb817e0..11855427f2 100644
--- a/src/components/NcAppSettingsSection/index.js
+++ b/src/components/NcAppSettingsSection/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcAppSettingsSection from './NcAppSettingsSection.vue'
-
-export default NcAppSettingsSection
+export { default } from './NcAppSettingsSection.vue'
diff --git a/src/components/NcAppSidebar/index.js b/src/components/NcAppSidebar/index.js
index dd36fc62c4..7e6f54c530 100644
--- a/src/components/NcAppSidebar/index.js
+++ b/src/components/NcAppSidebar/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppSidebar from './NcAppSidebar.vue'
 
-export default NcAppSidebar
+export { default } from './NcAppSidebar.vue'
diff --git a/src/components/NcAppSidebarTab/index.js b/src/components/NcAppSidebarTab/index.js
index d7df0184f9..8890cfb986 100644
--- a/src/components/NcAppSidebarTab/index.js
+++ b/src/components/NcAppSidebarTab/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcAppSidebarTab from './NcAppSidebarTab.vue'
 
-export default NcAppSidebarTab
+export { default } from './NcAppSidebarTab.vue'
diff --git a/src/components/NcAvatar/index.js b/src/components/NcAvatar/index.js
index 0463e29494..0378f427d5 100644
--- a/src/components/NcAvatar/index.js
+++ b/src/components/NcAvatar/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcAvatar from './NcAvatar.vue'
-
-export default NcAvatar
+export { default } from './NcAvatar.vue'
diff --git a/src/components/NcBreadcrumb/index.js b/src/components/NcBreadcrumb/index.js
index 9374d4122f..f35a2aa494 100644
--- a/src/components/NcBreadcrumb/index.js
+++ b/src/components/NcBreadcrumb/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcBreadcrumb from './NcBreadcrumb.vue'
-
-export default NcBreadcrumb
+export { default } from './NcBreadcrumb.vue'
diff --git a/src/components/NcBreadcrumbs/index.js b/src/components/NcBreadcrumbs/index.js
index 1e5180fec3..6f9e936963 100644
--- a/src/components/NcBreadcrumbs/index.js
+++ b/src/components/NcBreadcrumbs/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcBreadcrumbs from './NcBreadcrumbs.vue'
-
-export default NcBreadcrumbs
+export { default } from './NcBreadcrumbs.vue'
diff --git a/src/components/NcButton/index.js b/src/components/NcButton/index.js
index 0a76184c79..5a5a07bc16 100644
--- a/src/components/NcButton/index.js
+++ b/src/components/NcButton/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcButton from './NcButton.vue'
-
-export default NcButton
+export { default } from './NcButton.vue'
diff --git a/src/components/NcCheckboxRadioSwitch/index.js b/src/components/NcCheckboxRadioSwitch/index.js
index d82c18b395..894a2e1a1c 100644
--- a/src/components/NcCheckboxRadioSwitch/index.js
+++ b/src/components/NcCheckboxRadioSwitch/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcCheckboxRadioSwitch from './NcCheckboxRadioSwitch.vue'
-
-export default NcCheckboxRadioSwitch
+export { default } from './NcCheckboxRadioSwitch.vue'
diff --git a/src/components/NcColorPicker/index.js b/src/components/NcColorPicker/index.js
index 98c9453678..0f83424b55 100644
--- a/src/components/NcColorPicker/index.js
+++ b/src/components/NcColorPicker/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcColorPicker from './NcColorPicker.vue'
-
-export default NcColorPicker
+export { default } from './NcColorPicker.vue'
diff --git a/src/components/NcContent/index.js b/src/components/NcContent/index.js
index c5691f2df6..9946431c25 100644
--- a/src/components/NcContent/index.js
+++ b/src/components/NcContent/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcContent from './NcContent.vue'
 
-export default NcContent
+export { default } from './NcContent.vue'
diff --git a/src/components/NcCounterBubble/index.js b/src/components/NcCounterBubble/index.js
index 867a653f17..fea9ae5b68 100644
--- a/src/components/NcCounterBubble/index.js
+++ b/src/components/NcCounterBubble/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcCounterBubble from './NcCounterBubble.vue'
-
-export default NcCounterBubble
+export { default } from './NcCounterBubble.vue'
diff --git a/src/components/NcDashboardWidget/index.js b/src/components/NcDashboardWidget/index.js
index eaed48be71..9280f81975 100644
--- a/src/components/NcDashboardWidget/index.js
+++ b/src/components/NcDashboardWidget/index.js
@@ -1,3 +1,23 @@
-import NcDashboardWidget from './NcDashboardWidget.vue'
+/**
+ * @copyright 2022 Raimund Schlüßler <raimund.schluessler@mailbox.org>
+ *
+ * @author Christopher Ng <chrng8@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
-export default NcDashboardWidget
+export { default } from './NcDashboardWidget.vue'
diff --git a/src/components/NcDashboardWidgetItem/index.js b/src/components/NcDashboardWidgetItem/index.js
index 969031ae1d..53461d8bd9 100644
--- a/src/components/NcDashboardWidgetItem/index.js
+++ b/src/components/NcDashboardWidgetItem/index.js
@@ -1,3 +1,23 @@
-import NcDashboardWidgetItem from './NcDashboardWidgetItem.vue'
+/**
+ * @copyright 2022 Raimund Schlüßler <raimund.schluessler@mailbox.org>
+ *
+ * @author Christopher Ng <chrng8@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
-export default NcDashboardWidgetItem
+export { default } from './NcDashboardWidgetItem.vue'
diff --git a/src/components/NcEmojiPicker/index.js b/src/components/NcEmojiPicker/index.js
index 18ac959415..a92a0ee7c0 100644
--- a/src/components/NcEmojiPicker/index.js
+++ b/src/components/NcEmojiPicker/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcEmojiPicker from './NcEmojiPicker.vue'
 
-export default NcEmojiPicker
+export { default } from './NcEmojiPicker.vue'
diff --git a/src/components/NcEmptyContent/index.js b/src/components/NcEmptyContent/index.js
index 3f08b46c8d..4c617e500e 100644
--- a/src/components/NcEmptyContent/index.js
+++ b/src/components/NcEmptyContent/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcEmptyContent from './NcEmptyContent.vue'
 
-export default NcEmptyContent
+export { default } from './NcEmptyContent.vue'
diff --git a/src/components/NcHighlight/index.js b/src/components/NcHighlight/index.js
index 7ac6ce5884..b6417e527e 100644
--- a/src/components/NcHighlight/index.js
+++ b/src/components/NcHighlight/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcHighlight from './NcHighlight.vue'
-
-export default NcHighlight
+export { default } from './NcHighlight.vue'
diff --git a/src/components/NcInputField/index.js b/src/components/NcInputField/index.js
index 17e126b9ed..008668fca0 100644
--- a/src/components/NcInputField/index.js
+++ b/src/components/NcInputField/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcInputField from './NcInputField.vue'
-
-export default NcInputField
+export { default } from './NcInputField.vue'
diff --git a/src/components/NcListItem/index.js b/src/components/NcListItem/index.js
index a3246cf8b5..d0668d5352 100644
--- a/src/components/NcListItem/index.js
+++ b/src/components/NcListItem/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcListItem from './NcListItem.vue'
-
-export default NcListItem
+export { default } from './NcListItem.vue'
diff --git a/src/components/NcListItemIcon/index.js b/src/components/NcListItemIcon/index.js
index 555c32ccf4..5abb083b18 100644
--- a/src/components/NcListItemIcon/index.js
+++ b/src/components/NcListItemIcon/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcListItemIcon from './NcListItemIcon.vue'
-
-export default NcListItemIcon
+export { default } from './NcListItemIcon.vue'
diff --git a/src/components/NcLoadingIcon/index.js b/src/components/NcLoadingIcon/index.js
index c6c78cf21b..7531ccb280 100644
--- a/src/components/NcLoadingIcon/index.js
+++ b/src/components/NcLoadingIcon/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcLoadingIcon from './NcLoadingIcon.vue'
-
-export default NcLoadingIcon
+export { default } from './NcLoadingIcon.vue'
diff --git a/src/components/NcMultiselectTags/index.js b/src/components/NcMultiselectTags/index.js
index 492eed005b..45ee903e62 100644
--- a/src/components/NcMultiselectTags/index.js
+++ b/src/components/NcMultiselectTags/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcMultiselectTags from './NcMultiselectTags.vue'
 
-export default NcMultiselectTags
+export { default } from './NcMultiselectTags.vue'
diff --git a/src/components/NcNoteCard/index.js b/src/components/NcNoteCard/index.js
index e9d7ce8d99..0b7dc699b5 100644
--- a/src/components/NcNoteCard/index.js
+++ b/src/components/NcNoteCard/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcNoteCard from './NcNoteCard.vue'
 
-export default NcNoteCard
+export { default } from './NcNoteCard.vue'
diff --git a/src/components/NcPasswordField/index.js b/src/components/NcPasswordField/index.js
index cecc1e39ee..41d1336cfa 100644
--- a/src/components/NcPasswordField/index.js
+++ b/src/components/NcPasswordField/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcPasswordField from './NcPasswordField.vue'
-
-export default NcPasswordField
+export { default } from './NcPasswordField.vue'
diff --git a/src/components/NcPopover/index.js b/src/components/NcPopover/index.js
index 857b94866b..7babfcc1cd 100644
--- a/src/components/NcPopover/index.js
+++ b/src/components/NcPopover/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcPopover from './NcPopover.vue'
-
-export default NcPopover
+export { default } from './NcPopover.vue'
diff --git a/src/components/NcPopoverMenu/index.js b/src/components/NcPopoverMenu/index.js
index 5c8f18876d..5fd4f36364 100644
--- a/src/components/NcPopoverMenu/index.js
+++ b/src/components/NcPopoverMenu/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcPopoverMenu from './NcPopoverMenu.vue'
 
-export default NcPopoverMenu
+export { default } from './NcPopoverMenu.vue'
diff --git a/src/components/NcProgressBar/index.js b/src/components/NcProgressBar/index.js
index f1f07a1d18..7ddd84d99c 100644
--- a/src/components/NcProgressBar/index.js
+++ b/src/components/NcProgressBar/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcProgressBar from './NcProgressBar.vue'
-
-export default NcProgressBar
+export { default } from './NcProgressBar.vue'
diff --git a/src/components/NcRichContenteditable/index.js b/src/components/NcRichContenteditable/index.js
index b89bdde247..0ad10c0e8a 100644
--- a/src/components/NcRichContenteditable/index.js
+++ b/src/components/NcRichContenteditable/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcRichContenteditable from './NcRichContenteditable.vue'
-
-export default NcRichContenteditable
+export { default } from './NcRichContenteditable.vue'
diff --git a/src/components/NcSettingsInputText/index.js b/src/components/NcSettingsInputText/index.js
index db62477b07..b260e46115 100644
--- a/src/components/NcSettingsInputText/index.js
+++ b/src/components/NcSettingsInputText/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcSettingsInputText from './NcSettingsInputText.vue'
 
-export default NcSettingsInputText
+export { default } from './NcSettingsInputText.vue'
diff --git a/src/components/NcSettingsSection/index.js b/src/components/NcSettingsSection/index.js
index 4616ef47f8..7b994cc889 100644
--- a/src/components/NcSettingsSection/index.js
+++ b/src/components/NcSettingsSection/index.js
@@ -19,6 +19,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import NcSettingsSection from './NcSettingsSection.vue'
 
-export default NcSettingsSection
+export { default } from './NcSettingsSection.vue'
diff --git a/src/components/NcTextField/index.js b/src/components/NcTextField/index.js
index 482cc5a43e..0f3f0491db 100644
--- a/src/components/NcTextField/index.js
+++ b/src/components/NcTextField/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcTextField from './NcTextField.vue'
-
-export default NcTextField
+export { default } from './NcTextField.vue'
diff --git a/src/components/NcTimezonePicker/index.js b/src/components/NcTimezonePicker/index.js
index 73a2ea84b9..8b7d202f7e 100644
--- a/src/components/NcTimezonePicker/index.js
+++ b/src/components/NcTimezonePicker/index.js
@@ -18,6 +18,5 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import NcTimezonePicker from './NcTimezonePicker.vue'
 
-export default NcTimezonePicker
+export { default } from './NcTimezonePicker.vue'
diff --git a/src/components/NcUserBubble/index.js b/src/components/NcUserBubble/index.js
index 690b1db517..7b53f95ced 100644
--- a/src/components/NcUserBubble/index.js
+++ b/src/components/NcUserBubble/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcUserBubble from './NcUserBubble.vue'
-
-export default NcUserBubble
+export { default } from './NcUserBubble.vue'
diff --git a/src/components/NcVNodes/index.js b/src/components/NcVNodes/index.js
index 52b7474169..7af0363f30 100644
--- a/src/components/NcVNodes/index.js
+++ b/src/components/NcVNodes/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import NcVNodes from './NcVNodes.vue'
-
-export default NcVNodes
+export { default } from './NcVNodes.vue'
diff --git a/src/functions/usernameToColor/index.js b/src/functions/usernameToColor/index.js
index 4bcbab4e74..62d4f327af 100644
--- a/src/functions/usernameToColor/index.js
+++ b/src/functions/usernameToColor/index.js
@@ -20,6 +20,4 @@
  *
  */
 
-import usernameToColor from './usernameToColor.js'
-
-export default usernameToColor
+export { default } from './usernameToColor.js'