diff --git a/src/components/Discover/Search.vue b/src/components/Discover/Search.vue
index 967827c..75213cc 100644
--- a/src/components/Discover/Search.vue
+++ b/src/components/Discover/Search.vue
@@ -62,12 +62,10 @@ export default {
 			required: true,
 		},
 	},
-	data() {
-		return {
-			feeds: [],
-			loading: false,
-		}
-	},
+	data: () => ({
+		feeds: [],
+		loading: false,
+	}),
 	computed: {
 		...mapState(useSubscriptions, ['subs']),
 	},
diff --git a/src/components/Discover/Toplist.vue b/src/components/Discover/Toplist.vue
index 576fecb..cf0124d 100644
--- a/src/components/Discover/Toplist.vue
+++ b/src/components/Discover/Toplist.vue
@@ -30,12 +30,10 @@ export default {
 			required: true,
 		},
 	},
-	data() {
-		return {
-			loading: true,
-			tops: [],
-		}
-	},
+	data: () => ({
+		loading: true,
+		tops: [],
+	}),
 	computed: {
 		title() {
 			switch (this.type) {
diff --git a/src/components/Feed/Episodes.vue b/src/components/Feed/Episodes.vue
index 74d867c..f51876e 100644
--- a/src/components/Feed/Episodes.vue
+++ b/src/components/Feed/Episodes.vue
@@ -158,14 +158,12 @@ export default {
 		PlaylistRemoveIcon,
 		StopIcon,
 	},
-	data() {
-		return {
-			episodes: [],
-			loading: true,
-			loadingAction: false,
-			modalEpisode: null,
-		}
-	},
+	data: () => ({
+		episodes: [],
+		loading: true,
+		loadingAction: false,
+		modalEpisode: null,
+	}),
 	computed: {
 		...mapState(usePlayer, ['episode']),
 		...mapState(useSettings, ['filters']),
diff --git a/src/components/Player/Infos.vue b/src/components/Player/Infos.vue
index 8473392..6fd4da1 100644
--- a/src/components/Player/Infos.vue
+++ b/src/components/Player/Infos.vue
@@ -32,11 +32,9 @@ export default {
 		Modal,
 		NcModal,
 	},
-	data() {
-		return {
-			modal: false,
-		}
-	},
+	data: () => ({
+		modal: false,
+	}),
 	computed: {
 		...mapState(usePlayer, ['episode', 'podcastUrl']),
 		hash() {
diff --git a/src/components/Player/Volume.vue b/src/components/Player/Volume.vue
index 545d6df..cb7ef90 100644
--- a/src/components/Player/Volume.vue
+++ b/src/components/Player/Volume.vue
@@ -46,11 +46,9 @@ export default {
 		VolumeMediumIcon,
 		VolumeMuteIcon,
 	},
-	data() {
-		return {
-			volumeMuted: 0,
-		}
-	},
+	data: () => ({
+		volumeMuted: 0,
+	}),
 	computed: {
 		...mapState(usePlayer, ['volume']),
 	},
diff --git a/src/components/Settings/Import.vue b/src/components/Settings/Import.vue
index 7ea07cc..3b15fac 100644
--- a/src/components/Settings/Import.vue
+++ b/src/components/Settings/Import.vue
@@ -44,12 +44,10 @@ export default {
 		NcAppNavigationItem,
 		NcModal,
 	},
-	data() {
-		return {
-			loading: false,
-			modal: false,
-		}
-	},
+	data: () => ({
+		loading: false,
+		modal: false,
+	}),
 	methods: {
 		generateUrl,
 		async importOpml(event) {
diff --git a/src/components/Sidebar/Item.vue b/src/components/Sidebar/Item.vue
index 576b3c9..f51c108 100644
--- a/src/components/Sidebar/Item.vue
+++ b/src/components/Sidebar/Item.vue
@@ -69,13 +69,11 @@ export default {
 			required: true,
 		},
 	},
-	data() {
-		return {
-			failed: false,
-			loading: true,
-			feed: null,
-		}
-	},
+	data: () => ({
+		failed: false,
+		loading: true,
+		feed: null,
+	}),
 	computed: {
 		...mapState(useSubscriptions, ['favorites']),
 		hash() {
diff --git a/src/components/Sidebar/Subscriptions.vue b/src/components/Sidebar/Subscriptions.vue
index 514a09b..182a826 100644
--- a/src/components/Sidebar/Subscriptions.vue
+++ b/src/components/Sidebar/Subscriptions.vue
@@ -48,11 +48,9 @@ export default {
 		PlusIcon,
 		Settings,
 	},
-	data() {
-		return {
-			loading: true,
-		}
-	},
+	data: () => ({
+		loading: true,
+	}),
 	computed: {
 		...mapState(useSubscriptions, ['subs']),
 	},
diff --git a/src/views/Discover.vue b/src/views/Discover.vue
index 4d9c899..3df87ba 100644
--- a/src/views/Discover.vue
+++ b/src/views/Discover.vue
@@ -30,11 +30,9 @@ export default {
 		Search,
 		Toplist,
 	},
-	data() {
-		return {
-			search: '',
-		}
-	},
+	data: () => ({
+		search: '',
+	}),
 }
 </script>
 
diff --git a/src/views/Feed.vue b/src/views/Feed.vue
index 4cfbb9e..89fbff7 100644
--- a/src/views/Feed.vue
+++ b/src/views/Feed.vue
@@ -41,13 +41,11 @@ export default {
 		Loading,
 		NcEmptyContent,
 	},
-	data() {
-		return {
-			failed: false,
-			loading: true,
-			feed: null,
-		}
-	},
+	data: () => ({
+		failed: false,
+		loading: true,
+		feed: null,
+	}),
 	computed: {
 		url() {
 			return decodeUrl(this.$route.params.url)