diff --git a/src/PublicShareSidebarTrigger.vue b/src/PublicShareSidebarTrigger.vue
index 4241f5fe4eb..de4758a6025 100644
--- a/src/PublicShareSidebarTrigger.vue
+++ b/src/PublicShareSidebarTrigger.vue
@@ -28,7 +28,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'click'): void
+	click: []
 }>()
 
 const ariaLabel = computed(() => {
diff --git a/src/components/AdminSettings/SignalingServers.vue b/src/components/AdminSettings/SignalingServers.vue
index 86115c750bf..d7275bebe3b 100644
--- a/src/components/AdminSettings/SignalingServers.vue
+++ b/src/components/AdminSettings/SignalingServers.vue
@@ -116,9 +116,9 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(e: 'update:servers', value: InitialState['spreed']['signaling_servers']['servers']): void
-	(e: 'update:secret', value: InitialState['spreed']['signaling_servers']['secret']): void
-	(e: 'update:hideWarning', value: InitialState['spreed']['signaling_servers']['hideWarning']): void
+	'update:servers': [value: InitialState['spreed']['signaling_servers']['servers']]
+	'update:secret': [value: InitialState['spreed']['signaling_servers']['secret']]
+	'update:hideWarning': [value: InitialState['spreed']['signaling_servers']['hideWarning']]
 }>()
 
 const isCacheConfigured = loadState('spreed', 'has_cache_configured')
diff --git a/src/components/CalendarEventsDialog.vue b/src/components/CalendarEventsDialog.vue
index 710bba50c7e..37de117a182 100644
--- a/src/components/CalendarEventsDialog.vue
+++ b/src/components/CalendarEventsDialog.vue
@@ -44,9 +44,6 @@ const props = defineProps<{
 	token: string
 	container?: string
 }>()
-const emit = defineEmits<{
-	(event: 'close'): void
-}>()
 
 const hideTriggers = (triggers: string[]) => [...triggers, 'click']
 
diff --git a/src/components/ImportEmailsDialog.vue b/src/components/ImportEmailsDialog.vue
index d9ee57165c5..822088decf5 100644
--- a/src/components/ImportEmailsDialog.vue
+++ b/src/components/ImportEmailsDialog.vue
@@ -23,7 +23,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'close'): void
+	close: []
 }>()
 
 const loading = ref(false)
diff --git a/src/components/LeftSidebar/ConversationsList/ConversationsSearchListVirtual.vue b/src/components/LeftSidebar/ConversationsList/ConversationsSearchListVirtual.vue
index 71ebb741357..1a1a7667aac 100644
--- a/src/components/LeftSidebar/ConversationsList/ConversationsSearchListVirtual.vue
+++ b/src/components/LeftSidebar/ConversationsList/ConversationsSearchListVirtual.vue
@@ -18,7 +18,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'select', item: Conversation): void
+	select: [item: Conversation]
 }>()
 
 const itemHeight = AVATAR.SIZE.DEFAULT + 2 * 4 + 2 * 2
diff --git a/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue b/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
index d6dbc8e92e9..48b515b685e 100644
--- a/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
+++ b/src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
@@ -31,9 +31,9 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'abort-search'): void
-	(event: 'create-new-conversation', searchText: string): void
-	(event: 'create-and-join-conversation', item: TypeConversation | ParticipantSearchResult): void
+	abortSearch: []
+	createNewConversation: [searchText: string]
+	createAndJoinConversation: [item: TypeConversation | ParticipantSearchResult]
 }>()
 
 const isCirclesEnabled = loadState('spreed', 'circles_enabled')
@@ -249,13 +249,13 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
 					:ref="`conversation-${item.data.object.token}`"
 					:item="item.data.object"
 					:compact="isCompact"
-					@click="emit('abort-search')" />
+					@click="emit('abortSearch')" />
 				<NcListItem
 					v-else-if="item.data.type === 'action'"
 					:name="searchText"
 					:compact="isCompact"
 					data-nav-id="conversation_create_new"
-					@click="emit('create-new-conversation', searchText)">
+					@click="emit('createNewConversation', searchText)">
 					<template #icon>
 						<IconChatPlusOutline :size="iconSize" />
 					</template>
@@ -268,7 +268,7 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
 					:item="item.data.object"
 					is-search-result
 					:compact="isCompact"
-					@click="emit('abort-search')" />
+					@click="emit('abortSearch')" />
 				<NcAppNavigationCaption
 					v-else-if="item.data.type === 'caption'"
 					:name="item.data.name"
@@ -286,7 +286,7 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
 					:data-nav-id="`user_${item.data.id}`"
 					:name="item.data.object.label"
 					:compact="isCompact"
-					@click="emit('create-and-join-conversation', item.data.object)">
+					@click="emit('createAndJoinConversation', item.data.object)">
 					<template #icon>
 						<!-- @vue-expect-error: incomplete props from v-bind -->
 						<AvatarWrapper
@@ -302,7 +302,7 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
 					:data-nav-id="`group_${item.data.id}`"
 					:name="item.data.object.label"
 					:compact="isCompact"
-					@click="emit('create-and-join-conversation', item.data.object)">
+					@click="emit('createAndJoinConversation', item.data.object)">
 					<template #icon>
 						<ConversationIcon
 							:key="`group_${item.data.id}`"
@@ -318,7 +318,7 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
 					:data-nav-id="`circle_${item.data.id}`"
 					:name="item.data.object.label"
 					:compact="isCompact"
-					@click="emit('create-and-join-conversation', item.data.object)">
+					@click="emit('createAndJoinConversation', item.data.object)">
 					<template #icon>
 						<ConversationIcon
 							:key="`circle_${item.data.id}`"
@@ -334,7 +334,7 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
 					:data-nav-id="`federated_${item.data.id}`"
 					:name="item.data.object.label"
 					:compact="isCompact"
-					@click="emit('create-and-join-conversation', item.data.object)">
+					@click="emit('createAndJoinConversation', item.data.object)">
 					<template #icon>
 						<!-- @vue-expect-error: incomplete props from v-bind -->
 						<AvatarWrapper
diff --git a/src/components/MediaSettings/MediaDevicesSelector.vue b/src/components/MediaSettings/MediaDevicesSelector.vue
index 3dc080366d9..0b7dacb242e 100644
--- a/src/components/MediaSettings/MediaDevicesSelector.vue
+++ b/src/components/MediaSettings/MediaDevicesSelector.vue
@@ -28,8 +28,8 @@ const props = withDefaults(defineProps<{
 })
 
 const emit = defineEmits<{
-	(event: 'refresh'): void
-	(event: 'update:deviceId', value: string | null | undefined): void
+	refresh: []
+	'update:deviceId': [value: string | null]
 }>()
 
 const deviceOptions = computed<NcSelectOption[]>(() => {
diff --git a/src/components/MediaSettings/MediaSettingsTabs.vue b/src/components/MediaSettings/MediaSettingsTabs.vue
index 90a0900b552..d675fa94801 100644
--- a/src/components/MediaSettings/MediaSettingsTabs.vue
+++ b/src/components/MediaSettings/MediaSettingsTabs.vue
@@ -23,7 +23,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'update:active', value?: string): void
+	'update:active': [value?: string]
 }>()
 
 /** Whether the tab panel is open */
diff --git a/src/components/MediaSettings/TransitionExpand.vue b/src/components/MediaSettings/TransitionExpand.vue
index 1379a85f679..c460dab304b 100644
--- a/src/components/MediaSettings/TransitionExpand.vue
+++ b/src/components/MediaSettings/TransitionExpand.vue
@@ -10,16 +10,16 @@ defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'after-enter'): void
-	(event: 'after-leave'): void
+	afterEnter: []
+	afterLeave: []
 }>()
 </script>
 
 <template>
 	<Transition
 		:name="`expand-${direction}`"
-		@after-enter="emit('after-enter')"
-		@after-leave="emit('after-leave')">
+		@after-enter="emit('afterEnter')"
+		@after-leave="emit('afterLeave')">
 		<div v-show="show" class="expand-wrapper">
 			<div class="expand-wrapper__content">
 				<slot />
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/ScheduledMessageActions.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/ScheduledMessageActions.vue
index 89fa96a19fc..2f772dd48b1 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/ScheduledMessageActions.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/ScheduledMessageActions.vue
@@ -38,8 +38,8 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'update:isActionMenuOpen', value: boolean): void
-	(event: 'edit'): void
+	'update:isActionMenuOpen': [value: boolean]
+	edit: []
 }>()
 
 const getMessagesListScroller = inject('getMessagesListScroller', () => undefined)
diff --git a/src/components/PollViewer/PollDraftHandler.vue b/src/components/PollViewer/PollDraftHandler.vue
index f824bbc0551..cd966963da2 100644
--- a/src/components/PollViewer/PollDraftHandler.vue
+++ b/src/components/PollViewer/PollDraftHandler.vue
@@ -56,8 +56,9 @@ const props = defineProps<{
 	editorOpened?: boolean
 	container?: string
 }>()
+
 const emit = defineEmits<{
-	(event: 'close'): void
+	close: []
 }>()
 
 const pollsStore = usePollsStore()
diff --git a/src/components/PollViewer/PollEditor.vue b/src/components/PollViewer/PollEditor.vue
index 31c4ff29bd9..a715295e88e 100644
--- a/src/components/PollViewer/PollEditor.vue
+++ b/src/components/PollViewer/PollEditor.vue
@@ -149,9 +149,11 @@ const props = defineProps<{
 	canCreatePollDrafts: boolean
 	container?: string
 }>()
+
 const emit = defineEmits<{
-	(event: 'close'): void
+	close: []
 }>()
+
 defineExpose({
 	fillPollEditorFromDraft,
 })
diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 61cb38e8c20..ca95f6a933e 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -126,7 +126,9 @@
 				<template #icon>
 					<NcIconSvgWrapper :svg="IconPermMediaOutline" :size="20" inline />
 				</template>
-				<SharedItemsTab :active="activeTab === 'shared-items'" @update:state="handleUpdateState" />
+				<SharedItemsTab
+					:active="activeTab === 'shared-items'"
+					@show-threads-tab="handleUpdateState('threads')" />
 			</NcAppSidebarTab>
 		</template>
 	</NcAppSidebar>
diff --git a/src/components/RightSidebar/RightSidebarContent.vue b/src/components/RightSidebar/RightSidebarContent.vue
index c70cd9f692f..ed12b2608da 100644
--- a/src/components/RightSidebar/RightSidebarContent.vue
+++ b/src/components/RightSidebar/RightSidebarContent.vue
@@ -52,8 +52,8 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'update:state', value: SidebarContentState): void
-	(event: 'update:mode', value: 'compact' | 'preview' | 'full'): void
+	'update:state': [value: SidebarContentState]
+	'update:mode': [value: 'compact' | 'preview' | 'full']
 }>()
 
 const supportsAvatar = hasTalkFeature('local', 'avatar')
diff --git a/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue b/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
index ffaa67366d5..7dbae597b95 100644
--- a/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
+++ b/src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
@@ -42,8 +42,9 @@ import CancelableRequest from '../../../utils/cancelableRequest.js'
 const props = defineProps<{
 	isActive: boolean
 }>()
+
 const emit = defineEmits<{
-	(event: 'close'): void
+	close: []
 }>()
 
 const searchMessagesTab = ref<HTMLElement | null>(null)
diff --git a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
index 237abc19e28..6067ebf531e 100644
--- a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
+++ b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
@@ -46,7 +46,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	(event: 'update:state', value: 'threads'): void
+	showThreadsTab: []
 }>()
 
 const token = useGetToken()
@@ -135,7 +135,7 @@ function openPollDraftHandler() {
 						v-if="hasMoreThreads"
 						variant="tertiary"
 						class="shared-items-tab__more-button shared-items-tab__more-button--threads"
-						@click="emit('update:state', 'threads')">
+						@click="emit('showThreadsTab')">
 						<template #icon>
 							<IconDotsHorizontal :size="24" />
 						</template>
diff --git a/src/components/RightSidebar/Threads/ThreadsTab.vue b/src/components/RightSidebar/Threads/ThreadsTab.vue
index 38edddbafc1..7997dd4d8f5 100644
--- a/src/components/RightSidebar/Threads/ThreadsTab.vue
+++ b/src/components/RightSidebar/Threads/ThreadsTab.vue
@@ -14,7 +14,7 @@ import { EventBus } from '../../../services/EventBus.ts'
 import { useChatExtrasStore } from '../../../stores/chatExtras.ts'
 
 const emit = defineEmits<{
-	(event: 'close'): void
+	close: []
 }>()
 
 const chatExtrasStore = useChatExtrasStore()
diff --git a/src/components/UIShared/ConfirmDialog.vue b/src/components/UIShared/ConfirmDialog.vue
index 926b828b670..f4ccff52bcd 100644
--- a/src/components/UIShared/ConfirmDialog.vue
+++ b/src/components/UIShared/ConfirmDialog.vue
@@ -54,7 +54,7 @@ const props = defineProps<NcDialogProps & {
 }>()
 
 const emit = defineEmits<{
-	(event: 'close', value?: unknown): void
+	close: [value?: unknown]
 }>()
 
 const inputValue = ref(props.inputProps?.value ?? '')
diff --git a/src/components/UIShared/ContactSelectionBubble.vue b/src/components/UIShared/ContactSelectionBubble.vue
index b4c94b4f047..09e4766f3a4 100644
--- a/src/components/UIShared/ContactSelectionBubble.vue
+++ b/src/components/UIShared/ContactSelectionBubble.vue
@@ -3,7 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-<script setup lang="ts">
+<script setup lang="ts" generic="T extends Participant | ParticipantSearchResult">
 import type { Ref } from 'vue'
 import type { Participant, ParticipantSearchResult } from '../../types/index.ts'
 
@@ -14,12 +14,15 @@ import AvatarWrapper from '../AvatarWrapper/AvatarWrapper.vue'
 import { AVATAR } from '../../constants.ts'
 
 const props = defineProps<{
-	participant: Participant | ParticipantSearchResult
+	participant: T
 }>()
-const emit = defineEmits(['update'])
 
-// Defines list of locked participants (can not be removed manually
-const lockedParticipants = inject<Ref<(Participant | ParticipantSearchResult)[]>>('lockedParticipants', ref([]))
+const emit = defineEmits<{
+	update: [participant: T]
+}>()
+
+// Defines list of locked participants (can not be removed manually)
+const lockedParticipants = inject<Ref<T[]>>('lockedParticipants', ref([]))
 
 const isLocked = computed(() => lockedParticipants.value.some((item) => {
 	if ('actorId' in props.participant) {