diff --git a/index.js b/index.js
index 9cbdc5f..2cc19fc 100644
--- a/index.js
+++ b/index.js
@@ -841,8 +841,6 @@ const app = new Vue({
 				);
 			}
 		});
-
-		window.eventBus = new Vue();
 	},
 	mounted() {
 		// watch color schemes for light and dark
diff --git a/pages/components/user-select.vue b/pages/components/user-select.vue
index c34ad9d..5939c3c 100644
--- a/pages/components/user-select.vue
+++ b/pages/components/user-select.vue
@@ -143,7 +143,7 @@ export default {
 		},
 		loadedUsers: {
 			handler(n) {
-				window.eventBus.$emit("newutor", this.userList);
+				this.$emit("newUser", this.userList);
 			},
 			deep: true,
 		},
diff --git a/pages/contribution/main.vue b/pages/contribution/main.vue
index 675d060..9c08010 100644
--- a/pages/contribution/main.vue
+++ b/pages/contribution/main.vue
@@ -60,6 +60,7 @@
 					class="my-0 pt-0"
 					small-chips
 					clearable
+					@newUser="(l) => { this.contributors = l }"
 				/>
 			</v-col>
 			<v-col cols="12" sm="6" class="pb-0 py-sm-0">
@@ -497,9 +498,6 @@ export default {
 		});
 		this.selectedContributors = this.queryToIds;
 		this.addPack(this.all_packs, this.all_packs_display, true);
-		window.eventBus.$on("newContributor", (l) => {
-			this.contributors = l;
-		});
 	},
 	mounted() {
 		this.getPacks();
diff --git a/pages/gallery/modal/main.vue b/pages/gallery/modal/main.vue
index 6655932..9e41ed4 100644
--- a/pages/gallery/modal/main.vue
+++ b/pages/gallery/modal/main.vue
@@ -37,20 +37,18 @@
 				>
 					<template v-for="group in grouped">
 						<div class="d-flex flex-row pb-2 pb-sm-0">
-							<template v-for="url in group">
-								<div class="gallery-dialog-texture-container px-2 pb-sm-2" :key="url.name">
-									<gallery-image
-										modal
-										:src="url.image"
-										:textureID="textureID"
-										:ignoreList="ignoreList"
-										@click="openFullscreenPreview(url.image)"
-									>
-										<p>{{ $root.lang().gallery.error_message.texture_not_done }}</p>
-									</gallery-image>
-									<h2>{{ packToName[url.name] }}</h2>
-								</div>
-							</template>
+							<div v-for="url in group" class="gallery-dialog-texture-container px-2 pb-sm-2" :key="url.name">
+								<gallery-image
+									modal
+									:src="url.image"
+									:textureID="textureID"
+									:ignoreList="ignoreList"
+									@click="openFullscreenPreview(url.image)"
+								>
+									<p>{{ $root.lang().gallery.error_message.texture_not_done }}</p>
+								</gallery-image>
+								<h2>{{ packToName[url.name] }}</h2>
+							</div>
 						</div>
 					</template>
 				</div>
diff --git a/resources/types.d.ts b/resources/types.d.ts
index f544afa..332cd41 100644
--- a/resources/types.d.ts
+++ b/resources/types.d.ts
@@ -53,8 +53,6 @@ declare global {
 	declare const apiURL: string;
 
 	interface Window {
-		eventBus: Vue;
-
 		// aliases
 		readonly colors: typeof colors;
 		colorToHex: typeof colorToHex;