diff --git a/websites/Z/Zoro/iframe.ts b/websites/A/AniWatch/iframe.ts
similarity index 100%
rename from websites/Z/Zoro/iframe.ts
rename to websites/A/AniWatch/iframe.ts
diff --git a/websites/A/AniWatch/metadata.json b/websites/A/AniWatch/metadata.json
new file mode 100644
index 000000000000..5beb12396d75
--- /dev/null
+++ b/websites/A/AniWatch/metadata.json
@@ -0,0 +1,29 @@
+{
+	"$schema": "https://schemas.premid.app/metadata/1.9",
+	"author": {
+		"id": "819696394180100106",
+		"name": ".vahya"
+	},
+	"service": "AniWatch",
+	"description": {
+		"en": "AniWatch.to - A site to watch anime online for Free"
+	},
+	"url": "aniwatch.to",
+	"version": "1.0.0",
+	"logo": "https://i.imgur.com/LvFXasi.png",
+	"thumbnail": "https://i.imgur.com/TAc6lvS.png",
+	"color": "#ffdd95",
+	"category": "anime",
+	"tags": [
+		"anime"
+	],"iframe": true,
+	"iFrameRegExp": ".*",
+	"settings": [
+		{
+			"id": "buttons",
+			"title": "Show Buttons",
+			"icon": "fas fa-compress-arrows-alt",
+			"value": true
+		}
+	]
+}
\ No newline at end of file
diff --git a/websites/A/AniWatch/presence.ts b/websites/A/AniWatch/presence.ts
new file mode 100644
index 000000000000..06c99003a216
--- /dev/null
+++ b/websites/A/AniWatch/presence.ts
@@ -0,0 +1,268 @@
+const presence = new Presence({
+		clientId: "1127962521609973881",
+	}),
+	browsingTimestamp = Math.floor(Date.now() / 1000);
+
+let data: {
+	currTime: number;
+	duration: number;
+	paused: boolean;
+} = null;
+
+const enum Assets {
+	AniWatchLogo = "https://i.imgur.com/0x3NWRV.png",
+	Settings = "https://i.imgur.com/AuOsdzi.png",
+	Notifications = "https://i.imgur.com/TjzBYj9.png",
+}
+
+presence.on(
+	"iFrameData",
+	async (recievedData: {
+		currTime: number;
+		duration: number;
+		paused: boolean;
+	}) => {
+		data = recievedData;
+	}
+);
+
+presence.on("UpdateData", async () => {
+	const presenceData: PresenceData = {
+			largeImageKey: Assets.AniWatchLogo,
+			startTimestamp: browsingTimestamp,
+		},
+		{ pathname, href } = document.location,
+		buttons = await presence.getSetting<boolean>("buttons");
+
+	if (pathname === "/" || pathname === "/home")
+		presenceData.details = "Exploring AniWatch.to";
+	else if (
+		/\/(most-favorite|most-popular|movie|recently-added|recently-updated|tv|top-airing|top-upcoming|ona|ova|special|(genre\/.*))/.test(
+			pathname
+		)
+	) {
+		const heading = document.querySelector<HTMLHeadElement>("h2.cat-heading");
+		if (heading) presenceData.details = `Looking at ${heading.textContent}`;
+	} else if (pathname.startsWith("/news")) {
+		presenceData.details = "Looking at Anime news";
+		if (pathname !== "/news") {
+			const title = document.querySelector<HTMLHeadingElement>("h2.news-title");
+			if (title) presenceData.state = title.textContent;
+		}
+	} else if (pathname.startsWith("/community/user")) {
+		const profile = document.querySelector<HTMLSpanElement>(
+			"#main-wrapper > div.container > div > div.ai_-welcome.text-center > span"
+		);
+		if (profile) presenceData.details = `Viewing User: ${profile.textContent}`;
+		presenceData.smallImageKey = Assets.Viewing;
+	} else if (pathname.startsWith("/producer")) {
+		const name = document.querySelector(
+			"#main-content > section > div.block_area-header.block_area-header-tabs > div.float-left.bah-heading.mr-4 > h2"
+		)?.textContent;
+
+		presenceData.details = name;
+		if (buttons) {
+			presenceData.buttons = [
+				{
+					label: "Go to Production Page",
+					url: href,
+				},
+			];
+		}
+	} else if (
+		pathname.startsWith("/people") ||
+		pathname.startsWith("/character")
+	) {
+		const name = document.querySelector<HTMLHeadingElement>("h4.name"),
+			isCharacterPage = pathname.startsWith("/character");
+		if (name) {
+			presenceData.details = `Looking at ${
+				!isCharacterPage ? "people" : "characters"
+			}`;
+			presenceData.state = name.textContent;
+		}
+		presenceData.smallImageKey = Assets.Viewing;
+		if (buttons) {
+			presenceData.buttons = [
+				{
+					label: `Go to ${
+						name || isCharacterPage ? "Character" : "People"
+					} Page`,
+					url: href,
+				},
+			];
+		}
+	} else if (pathname.startsWith("/az-list")) {
+		presenceData.details = "Looking at Anime list";
+		if (pathname !== "/az-list") {
+			presenceData.state = `Titles starting with ${
+				pathname.substring(9) === "other"
+					? "Other characters"
+					: `${pathname.substring(9)}`
+			}`;
+		}
+		presenceData.smallImageKey = Assets.Search;
+	} else if (pathname.startsWith("/watch2gether/")) {
+		if (pathname === "/watch2gether/")
+			presenceData.details = "Looking for anime rooms";
+		else {
+			const filmName =
+					document.querySelector<HTMLHeadingElement>("h2.film-name"),
+				thumbnail = document.querySelector<HTMLImageElement>(
+					".anis-watch-detail > .anis-content > .anisc-poster > .film-poster > img.film-poster-img"
+				)?.src;
+
+			presenceData.largeImageKey = thumbnail;
+			presenceData.details = "In a room";
+			if (filmName) presenceData.state = `Watching ${filmName.textContent}`;
+			if (data && !data.paused) {
+				[, presenceData.endTimestamp] = presence.getTimestamps(
+					data.currTime,
+					data.duration
+				);
+			}
+			if (buttons) {
+				presenceData.buttons = [
+					{
+						label: "Join Room",
+						url: href,
+					},
+				];
+			}
+		}
+	} else if (pathname.startsWith("/watch")) {
+		const title = document.querySelector<HTMLDataListElement>(
+				"li.breadcrumb-item.dynamic-name.active"
+			),
+			episode = document.querySelector<HTMLSpanElement>(
+				"a.ep-item.active div.ssli-order"
+			),
+			thumbnail = document.querySelector<HTMLImageElement>(
+				".anis-watch-detail > .anis-content > .anisc-poster > .film-poster > img.film-poster-img"
+			)?.src;
+
+		presenceData.largeImageKey = thumbnail;
+		if (title) presenceData.details = title.textContent;
+		if (episode) presenceData.state = `Episode ${episode.textContent}`;
+		if (data && !data.paused) {
+			[, presenceData.endTimestamp] = presence.getTimestamps(
+				data.currTime,
+				data.duration
+			);
+			presenceData.smallImageKey = Assets.Play;
+		} else if (data) presenceData.smallImageKey = Assets.Pause;
+
+		if (buttons) {
+			presenceData.buttons = [
+				{
+					label: "Watch Episode",
+					url: href,
+				},
+			];
+		}
+	} else if (pathname.startsWith("/event/")) {
+		const title = document.querySelector<HTMLDivElement>("div.title"),
+			description = document.querySelector<HTMLDivElement>("div.description");
+		if (title) presenceData.details = `Event: ${title.textContent}`;
+		if (description) presenceData.state = description.textContent;
+	} else if (pathname.startsWith("/community")) {
+		presenceData.details = "Community Post";
+		presenceData.state = document.title;
+		presenceData.smallImageKey = Assets.Question;
+	} else {
+		switch (pathname) {
+			case "/search": {
+				presenceData.details = "Searching";
+
+				const query = document.querySelector(
+					"#main-content > section > div.block_area-header.block_area-header-tabs > div.float-left.bah-heading.mr-4 > h2 > i"
+				)?.textContent;
+
+				presenceData.state = query;
+				presenceData.smallImageKey = Assets.Search;
+				break;
+			}
+			case "/events": {
+				presenceData.details = "Looking at events";
+				break;
+			}
+			case "/contact": {
+				presenceData.details = "Contact Us";
+				break;
+			}
+			case "/dmca": {
+				presenceData.details = "DMCA";
+				break;
+			}
+			case "/terms": {
+				presenceData.details = "Terms of Service";
+				break;
+			}
+			case "/user/profile": {
+				const username = document
+					.querySelector(
+						"#main-wrapper > div.profile-header > div.container > div.ph-title"
+					)
+					.textContent.substring(3);
+				presenceData.details = `Viewing profile ${username}`;
+				presenceData.smallImageKey = Assets.Viewing;
+				break;
+			}
+			case "/user/settings": {
+				presenceData.details = "Changing Settings";
+				presenceData.smallImageKey = Assets.Settings;
+				break;
+			}
+			case "/user/notification": {
+				presenceData.details = "Looking at Notifications";
+				presenceData.smallImageKey = Assets.Notifications;
+				break;
+			}
+			case "/user/watch-list": {
+				presenceData.details = "Checking WatchList";
+				presenceData.smallImageKey = Assets.Reading;
+
+				const title = document.querySelector(
+					"#main-wrapper > div.profile-content > div.container > div > div.fav-tabs.mb-4 > ul > li > a.active"
+				);
+
+				presenceData.state = title.textContent;
+				break;
+			}
+			case "/user/continue-watching": {
+				presenceData.details = "Continue Watching";
+				presenceData.smallImageKey = Assets.Reading;
+				break;
+			}
+			case "/user/mal": {
+				presenceData.details = "MAL Import/Export";
+				presenceData.smallImageKey = Assets.Downloading;
+				break;
+			}
+			default: {
+				const title = document.querySelector<HTMLHeadingElement>(
+					"h2.film-name.dynamic-name"
+				);
+				if (title) {
+					const thumbnail = document.querySelector<HTMLImageElement>(
+						"#ani_detail > div > div > div.anis-content > div.anisc-poster > div > img"
+					)?.src;
+
+					presenceData.largeImageKey = thumbnail;
+					presenceData.details = "Checking Synopsis";
+					presenceData.state = title.textContent;
+					if (buttons) {
+						presenceData.buttons = [
+							{
+								label: "Check Synopsis",
+								url: href,
+							},
+						];
+					}
+				}
+			}
+		}
+	}
+
+	presence.setActivity(presenceData);
+});
diff --git a/websites/Z/Zoro/metadata.json b/websites/Z/Zoro/metadata.json
deleted file mode 100644
index d51a51fa8e07..000000000000
--- a/websites/Z/Zoro/metadata.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"$schema": "https://schemas.premid.app/metadata/1.9",
-	"author": {
-		"name": "वाह्य",
-		"id": "819696394180100106"
-	},
-	"service": "Zoro",
-	"description": {
-		"en": "Zoro.to is a free site to watch anime and you can even download subbed or dubbed anime in ultra HD quality without any registration or payment"
-	},
-	"url": [
-		"zoro.to",
-		"sanji.to",
-		"zoro.moe",
-		"zoro.sx",
-		"zoro.pm"
-	],
-	"version": "1.1.26",
-	"logo": "https://cdn.rcd.gg/PreMiD/websites/Z/Zoro/assets/logo.png",
-	"thumbnail": "https://cdn.rcd.gg/PreMiD/websites/Z/Zoro/assets/thumbnail.png",
-	"color": "#cae962",
-	"category": "anime",
-	"tags": [
-		"anime",
-		"stream"
-	],
-	"iframe": true,
-	"iFrameRegExp": ".*",
-	"settings": [
-		{
-			"id": "buttons",
-			"title": "Show Buttons",
-			"icon": "fas fa-compress-arrows-alt",
-			"value": true
-		}
-	]
-}
\ No newline at end of file
diff --git a/websites/Z/Zoro/presence.ts b/websites/Z/Zoro/presence.ts
deleted file mode 100644
index 265c0a9cb941..000000000000
--- a/websites/Z/Zoro/presence.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-const presence = new Presence({
-		clientId: "859440340683325491",
-	}),
-	browsingTimestamp = Math.floor(Date.now() / 1000);
-
-let data: {
-	currTime: number;
-	duration: number;
-	paused: boolean;
-} = null;
-
-presence.on(
-	"iFrameData",
-	async (recievedData: {
-		currTime: number;
-		duration: number;
-		paused: boolean;
-	}) => {
-		data = recievedData;
-	}
-);
-
-presence.on("UpdateData", async () => {
-	const presenceData: PresenceData = {
-			largeImageKey:
-				"https://cdn.rcd.gg/PreMiD/websites/Z/Zoro/assets/logo.png",
-			startTimestamp: browsingTimestamp,
-		},
-		{ pathname, href, search } = document.location,
-		buttons = await presence.getSetting<boolean>("buttons");
-
-	if (pathname === "/" || pathname === "/home")
-		presenceData.details = "Exploring Zoro.to";
-	else if (
-		/\/(most-favorite|most-popular|movie|recently-added|recently-updated|tv|top-airing|top-upcoming|ona|ova|special|(genre\/.*))/.test(
-			pathname
-		)
-	) {
-		const heading = document.querySelector<HTMLHeadElement>("h2.cat-heading");
-		if (heading) presenceData.details = `Looking at ${heading.textContent}`;
-	} else if (pathname.startsWith("/news")) {
-		presenceData.details = "Looking at Anime news";
-		if (pathname !== "/news") {
-			const title = document.querySelector<HTMLHeadingElement>("h2.news-title");
-			if (title) presenceData.state = title.textContent;
-		}
-	} else if (pathname === "/search") {
-		presenceData.details = "Searching";
-		presenceData.state = search.substring(9);
-	} else if (pathname.startsWith("/user")) {
-		const profile = document.querySelector<HTMLDivElement>("div.ph-title"),
-			link = document
-				.querySelector<HTMLUListElement>("ul.nav.nav-tabs.pre-tabs")
-				.querySelector<HTMLAnchorElement>("a.nav-link.active");
-		if (profile) presenceData.details = `Viewing User: ${profile.textContent}`;
-		if (link) presenceData.state = `At ${link.textContent}`;
-	} else if (
-		pathname.startsWith("people") ||
-		pathname.startsWith("character")
-	) {
-		const name = document.querySelector<HTMLHeadingElement>("h4.name");
-		if (name) {
-			presenceData.details = `Looking at ${
-				pathname.startsWith("/people") ? "People" : "Character"
-			}`;
-			presenceData.state = name.textContent;
-		}
-	} else if (pathname.startsWith("/az-list")) {
-		presenceData.details = "Looking at Anime list";
-		if (pathname !== "/az-list") {
-			presenceData.state = `Titles starting with ${
-				pathname.substring(9) === "other"
-					? "Other characters"
-					: `${pathname.substring(9)}`
-			}`;
-		}
-	} else if (pathname.startsWith("/watch2gether/")) {
-		if (pathname === "/watch2gether/")
-			presenceData.details = "Looking for anime rooms";
-		else {
-			const filmName =
-				document.querySelector<HTMLHeadingElement>("h2.film-name");
-			presenceData.details = "In a room";
-			if (filmName) presenceData.state = `Watching ${filmName.textContent}`;
-			if (data && !data.paused) {
-				[, presenceData.endTimestamp] = presence.getTimestamps(
-					data.currTime,
-					data.duration
-				);
-			}
-			if (buttons) {
-				presenceData.buttons = [
-					{
-						label: "Join Room",
-						url: href,
-					},
-				];
-			}
-		}
-	} else if (pathname.startsWith("/watch")) {
-		const title = document.querySelector<HTMLDataListElement>(
-				"li.breadcrumb-item.dynamic-name.active"
-			),
-			episode = document.querySelector<HTMLSpanElement>(
-				"a.ep-item.active div.ssli-order"
-			);
-		if (title) presenceData.details = title.textContent;
-		if (episode) presenceData.state = `Episode ${episode.textContent}`;
-		if (data && !data.paused) {
-			[, presenceData.endTimestamp] = presence.getTimestamps(
-				data.currTime,
-				data.duration
-			);
-		}
-		if (buttons) {
-			presenceData.buttons = [
-				{
-					label: "Watch Episode",
-					url: href,
-				},
-			];
-		}
-	} else if (pathname === "/events") presenceData.details = "Looking at events";
-	else if (pathname.startsWith("/event/")) {
-		const title = document.querySelector<HTMLDivElement>("div.title"),
-			description = document.querySelector<HTMLDivElement>("div.description");
-		if (title) presenceData.details = `Event: ${title.textContent}`;
-		if (description) presenceData.state = description.textContent;
-	} else {
-		const title = document.querySelector<HTMLHeadingElement>(
-			"h2.film-name.dynamic-name"
-		);
-		if (title) {
-			presenceData.details = "Checking Synopsis";
-			presenceData.state = title.textContent;
-			if (buttons) {
-				presenceData.buttons = [
-					{
-						label: "Check Synopsis",
-						url: href,
-					},
-				];
-			}
-		}
-	}
-
-	if (presenceData.details) presence.setActivity(presenceData);
-	else presence.setActivity();
-});