diff --git a/src/lib/components/atoms/TerminalWindow.svelte b/src/lib/components/atoms/TerminalWindow.svelte
deleted file mode 100644
index daaca16..0000000
--- a/src/lib/components/atoms/TerminalWindow.svelte
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="terminal-container">
-hhh
-</div>
-
-<style>
-    .terminal-container {
-        padding: 1rem;
-        height: 500px;
-        width: 700px;
-        background-color: var(--grey-six);
-        position: fixed;
-        z-index: -2;
-		backdrop-filter: blur(10px);
-		-webkit-backdrop-filter: blur(10px);    
-        right: 100px;
-        border-radius: 1rem;
-        border: 1px solid var(--grey-three)
-    }
-
-    @media (max-width: 1700px) {
-		.terminal-container {
-			position: fixed;
-			height: 100vh;
-            overflow: hidden;
-			top: 115px;
-			right: 6rem;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/src/lib/components/atoms/TreeMenuButton.svelte b/src/lib/components/atoms/TreeMenuButton.svelte
index 6dac8a5..5cd92da 100644
--- a/src/lib/components/atoms/TreeMenuButton.svelte
+++ b/src/lib/components/atoms/TreeMenuButton.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
-	export let current: string | boolean;
+	export let selectedPkg: string | boolean;
 	export let name: string;
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <div
 	class="package"
-	class:selected={current === name}
+	class:selected={selectedPkg === name}
 	on:click={() =>
-		(current = current === name ? false : name) && window.scrollTo({ top: 0, behavior: 'smooth' })}
+		(selectedPkg = selectedPkg === name ? false : name) &&
+		window.scrollTo({ top: 0, behavior: 'smooth' })}
 >
 	<h5>{name}</h5>
 </div>
diff --git a/src/lib/components/molecules/ContributorHost.svelte b/src/lib/components/molecules/ContributorHost.svelte
index 4fff872..09b3070 100644
--- a/src/lib/components/molecules/ContributorHost.svelte
+++ b/src/lib/components/molecules/ContributorHost.svelte
@@ -2,7 +2,7 @@
 	import type { Contributor } from 'src/data/types';
 	import ContributorButton from '../atoms/ContributorPerson.svelte';
 
-	export let contribs: Contributor[];
+	export let contributors: Contributor[];
 	export let repo: string;
 
 	let repo_name = repo
@@ -12,6 +12,7 @@
 		.replace(/api/g, 'API')
 		.replace(/(?:^|\s)\S/g, (x) => x.toUpperCase());
 
+	// Yes
 	let usersIwantToExplodeSoBadly = ['semantic-release-bot'];
 </script>
 
@@ -24,7 +25,7 @@
 <hr />
 
 <div class="contrib-host">
-	{#each contribs as { login, avatar_url, html_url }}
+	{#each contributors as { login, avatar_url, html_url }}
 		{#if !usersIwantToExplodeSoBadly.includes(login)}
 			<ContributorButton name={login} pfp={avatar_url} url={html_url} />
 		{/if}
diff --git a/src/lib/components/molecules/PatchCell.svelte b/src/lib/components/molecules/PatchCell.svelte
index f81c310..0036012 100644
--- a/src/lib/components/molecules/PatchCell.svelte
+++ b/src/lib/components/molecules/PatchCell.svelte
@@ -4,7 +4,6 @@
 	import type { CompatiblePackage, Patch } from 'src/data/types';
 
 	export let patch: Patch;
-	export let current;
 	const hasPatchOptions = !!patch.options.length;
 	let expanded: boolean = false;
 </script>
@@ -109,7 +108,7 @@
 		transition: all 2s var(--bezier-one);
 		background-color: var(--grey-six);
 		padding: 1.25rem;
-		border-radius: 8px;
+		border-radius: 12px;
 	}
 
 	.patch-container:active {
diff --git a/src/routes/contributors/+page.svelte b/src/routes/contributors/+page.svelte
index 7fe6520..2566ea1 100644
--- a/src/routes/contributors/+page.svelte
+++ b/src/routes/contributors/+page.svelte
@@ -21,9 +21,9 @@
 			<h4>Want to show up here? <span><a href="https://github.com/revanced" target="_blank" rel="noreferrer">Become a contributor</a></span></h4>
 		</div>
 		<div class="contrib-grid">
-			{#each $repositories as { contributors: contribs, name }}
+			{#each $repositories as { contributors, name: repo }}
 				<div in:fly={{ y: 10, easing: quintOut, duration: 750 }}>
-					<ContributorHost {contribs} repo={name} />
+					<ContributorHost {contributors} {repo} />
 				</div>
 			{/each}
 		</div>
diff --git a/src/routes/patches/+page.svelte b/src/routes/patches/+page.svelte
index f4f2162..afa8758 100644
--- a/src/routes/patches/+page.svelte
+++ b/src/routes/patches/+page.svelte
@@ -13,26 +13,24 @@
 
 	$: ({ patches, packages } = $api_patches);
 
-	let current: boolean = false;
+	let selectedPkg: boolean = false;
 	let searchTerm: string;
 	let searchTermFiltered: string;
 	let timeout: any = null;
 
-	const debounce = () => {
-		clearTimeout(timeout);
-		timeout = setTimeout(() => {
-			searchTermFiltered = searchTerm
-				?.replace(/\./g, '')
-				.replace(/\s/g, '')
-				.replace(/-/g, '')
-				.toLowerCase();
-		}, 500);
-	};
+	function filterByPackage(selectedPkg: string | boolean, packageList: any) {
+		for (let i = 0; i < packageList.length; i++) {
+			if (packageList[i].name === selectedPkg) {
+				return true;
+			}
+		}
+	}
 
 	function search(patch: Patch) {
-		function checkPkgName(findTerm: string | boolean, array: any) {
-			for (let i = 0; i < array.length; i++) {
-				if (array[i].name.replace(/\./g, '').includes(findTerm)) {
+		function checkPkgName(selectedPkg: string | boolean, packageList: any) {
+			// Basically the same function as before lol
+			for (let i = 0; i < packageList.length; i++) {
+				if (packageList[i].name.replace(/\./g, '').includes(selectedPkg)) {
 					return true;
 				}
 			}
@@ -45,14 +43,18 @@
 		);
 	}
 
-	function filterByPackage(findTerm: string | boolean, array: any) {
-		for (let i = 0; i < array.length; i++) {
-			if (array[i].name === findTerm) {
-				return true;
-			}
-		}
-		return false;
-	}
+	// Make sure we don't have filter the patches after every key press
+	const debounce = () => {
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			// Filter search term for better results (i.e. "  Unl O-ck" and "unlock" gives the same results)
+			searchTermFiltered = searchTerm
+				?.replace(/\./g, '')
+				.replace(/\s/g, '')
+				.replace(/-/g, '')
+				.toLowerCase();
+		}, 500);
+	};
 </script>
 
 <svelte:head>
@@ -64,10 +66,12 @@
 <main>
 	<aside in:fly={{ y: 10, easing: quintOut, duration: 750, delay: 100 }}>
 		<TreeMenu>
+			<!-- Must bind both variables: we get searchTerm from the text input, -->
+			<!-- and searchTermFiltered gets cleared with the clear button -->
 			<Search bind:searchTerm bind:searchTermFiltered title="Search patches" on:keyup={debounce} />
 			<span>
 				{#each packages as pkg}
-					<TreeMenuButton bind:current name={pkg} />
+					<TreeMenuButton bind:selectedPkg name={pkg} />
 				{/each}
 			</span>
 		</TreeMenu>
@@ -75,11 +79,14 @@
 
 	<div class="patches-container">
 		{#each patches as patch}
-			{#key current || searchTermFiltered}
-				{#if filterByPackage(current, patch.compatiblePackages) || !current}
+			<!-- Trigger new animations when package or search changes (I love Svelte) -->
+			{#key selectedPkg || searchTermFiltered}
+				<!-- Show patch if it supports the selected package, or if no package has been selected -->
+				{#if filterByPackage(selectedPkg, patch.compatiblePackages) || !selectedPkg}
+					<!-- ...same with search -->
 					{#if search(patch) || !searchTermFiltered}
 						<div in:fly={{ x: 10, easing: quintOut, duration: 750, delay: 100 }}>
-							<PatchCell bind:current {patch} />
+							<PatchCell {patch} />
 						</div>
 					{/if}
 				{/if}
@@ -94,7 +101,7 @@
 		margin-inline: auto;
 		display: grid;
 		grid-template-columns: 300px 3fr;
-		width: min(98%, 90rem);
+		width: min(98%, 82rem);
 		gap: 1.5rem;
 	}