diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index 707983ab..40ae1854 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -24,7 +24,6 @@
 	"dependencies": {
 		"@capacitor-community/electron": "^5.0.0",
 		"bgutils-js": "^3.2.0",
-		"capacitor-nodejs": "https://github.com/hampoelz/capacitor-nodejs/releases/download/v1.0.0-beta.9/capacitor-nodejs.tgz",
 		"chokidar": "~5.0.0",
 		"electron-is-dev": "~2.0.0",
 		"electron-serve": "~3.0.0",
diff --git a/materialious/electron/src/rt/electron-plugins.js b/materialious/electron/src/rt/electron-plugins.js
index 5f312366..b33b2826 100644
--- a/materialious/electron/src/rt/electron-plugins.js
+++ b/materialious/electron/src/rt/electron-plugins.js
@@ -1,6 +1,4 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const CapacitorNodejs = require('../../../node_modules/capacitor-nodejs/electron/dist/plugin.js');
 
 module.exports = {
-  CapacitorNodejs,
 }
\ No newline at end of file
diff --git a/materialious/src/lib/components/Author.svelte b/materialious/src/lib/components/Author.svelte
index bc7f8407..b64cdc9e 100644
--- a/materialious/src/lib/components/Author.svelte
+++ b/materialious/src/lib/components/Author.svelte
@@ -89,7 +89,6 @@
 						class:primary={!favoritedChannel}
 						class:surface-container-highest={favoritedChannel}
 						onclick={toggleFavourited}
-						class="square"
 					>
 						<i>star</i>
 						<div class="tooltip">
diff --git a/materialious/src/lib/components/Search.svelte b/materialious/src/lib/components/Search.svelte
index fba8c216..7c5569fc 100644
--- a/materialious/src/lib/components/Search.svelte
+++ b/materialious/src/lib/components/Search.svelte
@@ -123,12 +123,12 @@
 	}}
 	role="presentation"
 >
-	<div class="field prefix fill no-margin search">
+	<div class="field prefix fill no-margin search round">
 		<i class="front" tabindex="-1">search</i>
 		<input tabindex="0" id="search-box" placeholder={$_('searchPlaceholder')} bind:value={search} />
 		{#if showSearchBox}
-			<menu class="min suggestions-container">
-				<div class="field large prefix suffix no-margin fixed">
+			<menu class="min suggestions-container fill">
+				<div class="field large prefix fill suffix no-margin fixed round">
 					<i class="front" role="presentation" onclick={() => dispatch('searchCancelled')}
 						>arrow_back</i
 					>
@@ -208,10 +208,6 @@
 		background-color: transparent;
 	}
 
-	.suggestions-container {
-		border-radius: 0 !important;
-	}
-
 	@media screen and (max-width: 1140px) {
 		.search {
 			width: 100%;
diff --git a/materialious/src/lib/components/SyncParty.svelte b/materialious/src/lib/components/SyncParty.svelte
index 20599beb..11aff461 100644
--- a/materialious/src/lib/components/SyncParty.svelte
+++ b/materialious/src/lib/components/SyncParty.svelte
@@ -192,7 +192,7 @@
 				onclick={async () => {
 					await shareURL(`${syncOrigin}${resolve(`/?sync=${createShareBase64()}`, {})}`);
 				}}
-				class="square round"
+				class="round"
 			>
 				<i>content_copy</i>
 			</button>
diff --git a/materialious/src/lib/components/player/Timeline.svelte b/materialious/src/lib/components/player/Timeline.svelte
index 06392478..78db1d2d 100644
--- a/materialious/src/lib/components/player/Timeline.svelte
+++ b/materialious/src/lib/components/player/Timeline.svelte
@@ -320,7 +320,7 @@
 		display: block;
 		margin-bottom: 0.1rem;
 		height: 100px;
-		border-radius: 0.25rem;
+		border-radius: 1rem 1rem 0 0;
 	}
 
 	.timeline.tooltip {
@@ -332,6 +332,7 @@
 		will-change: transform;
 		padding: 0;
 		display: block;
+		border-radius: 1rem;
 	}
 
 	.tooltip.thumb {
@@ -349,8 +350,8 @@
 		transform: translateY(-50%);
 		z-index: 1;
 		pointer-events: none;
-		border-top-right-radius: 0.25rem;
-		border-bottom-right-radius: 0.25rem;
+		border-top-right-radius: 2.5rem;
+		border-bottom-right-radius: 2.5rem;
 		opacity: 0.5;
 	}
 
@@ -361,7 +362,7 @@
 		left: 0;
 		height: var(--player-timeline-height);
 		background-color: var(--secondary);
-		border-radius: 0.25rem;
+		border-radius: 2.5rem;
 		z-index: 2;
 		pointer-events: none;
 		opacity: 0.5;
diff --git a/materialious/src/lib/components/settings/DeArrow.svelte b/materialious/src/lib/components/settings/DeArrow.svelte
index aec7cd74..f6e0adb1 100644
--- a/materialious/src/lib/components/settings/DeArrow.svelte
+++ b/materialious/src/lib/components/settings/DeArrow.svelte
@@ -22,7 +22,7 @@
 			<input bind:value={deArrowUrl} name="dearrow-instance" type="text" />
 			<label for="dearrow-instance">{$_('layout.instanceUrl')}</label>
 		</div>
-		<button class="square">
+		<button>
 			<i>done</i>
 		</button>
 	</nav>
@@ -35,7 +35,7 @@
 			<input bind:value={deArrowThumbnailUrl} name="dearrow-thumbnail-instance" type="text" />
 			<label for="dearrow-thumbnail-instance">{$_('layout.deArrow.thumbnailInstanceUrl')}</label>
 		</div>
-		<button class="square">
+		<button>
 			<i>done</i>
 		</button>
 	</nav>
diff --git a/materialious/src/lib/components/settings/Interface.svelte b/materialious/src/lib/components/settings/Interface.svelte
index 8a79e274..72c90204 100644
--- a/materialious/src/lib/components/settings/Interface.svelte
+++ b/materialious/src/lib/components/settings/Interface.svelte
@@ -167,7 +167,7 @@
 						>
 					{/if}
 				</div>
-				<button class="square">
+				<button>
 					<i>done</i>
 				</button>
 			</nav>
diff --git a/materialious/src/lib/components/settings/RYD.svelte b/materialious/src/lib/components/settings/RYD.svelte
index 17ded493..e8f8ae04 100644
--- a/materialious/src/lib/components/settings/RYD.svelte
+++ b/materialious/src/lib/components/settings/RYD.svelte
@@ -20,7 +20,7 @@
 			<input tabindex="0" bind:value={returnYTInstance} name="returnyt-instance" type="text" />
 			<label tabindex="-1" for="returnyt-instance">{$_('layout.instanceUrl')}</label>
 		</div>
-		<button class="square">
+		<button>
 			<i>done</i>
 		</button>
 	</nav>
diff --git a/materialious/src/lib/components/settings/SponsorBlock.svelte b/materialious/src/lib/components/settings/SponsorBlock.svelte
index da4bbe76..b11f3cf3 100644
--- a/materialious/src/lib/components/settings/SponsorBlock.svelte
+++ b/materialious/src/lib/components/settings/SponsorBlock.svelte
@@ -58,7 +58,7 @@
 			/>
 			<label tabindex="-1" for="sponsorblock-instance">{$_('layout.instanceUrl')}</label>
 		</div>
-		<button class="square">
+		<button>
 			<i>done</i>
 		</button>
 	</nav>
diff --git a/materialious/src/lib/components/watch/Transcript.svelte b/materialious/src/lib/components/watch/Transcript.svelte
index 4bee98f0..d1bf7582 100644
--- a/materialious/src/lib/components/watch/Transcript.svelte
+++ b/materialious/src/lib/components/watch/Transcript.svelte
@@ -96,7 +96,7 @@
 		</div>
 		{#if transcriptCues.length > 0}
 			<div class="space"></div>
-			<div class="max field suffix prefix small no-margin surface-container-highest">
+			<div class="max field suffix prefix small round no-margin surface-container-highest">
 				<i class="front">search</i><input
 					bind:value={search}
 					oninput={searchTranscript}
diff --git a/materialious/src/lib/css/global.css b/materialious/src/lib/css/global.css
index 045e2bab..da90ad09 100644
--- a/materialious/src/lib/css/global.css
+++ b/materialious/src/lib/css/global.css
@@ -37,11 +37,6 @@ article {
 	border: 0.5px solid var(--primary);
 }
 
-button,
-.button {
-	border-radius: 0.5rem !important;
-}
-
 .thumbnail-corner {
 	padding: 0.1em 0.4em;
 }
@@ -122,13 +117,17 @@ menu {
 }
 
 .tooltip {
-	background-color: var(--surface) !important;
-	border: 0.1px solid var(--primary) !important;
+	background-color: var(--surface-container-highest) !important;
 	box-shadow: none !important;
-	border-radius: 0.25rem !important;
 	color: var(--on-surface) !important;
 }
 
+button,
+.button,
+.round {
+	border-radius: 0.5rem !important;
+}
+
 .altcha {
 	border: none !important;
 }
@@ -142,7 +141,7 @@ menu.player-settings {
 .player-slider {
 	height: var(--player-timeline-height);
 	margin: 0 auto;
-	border-radius: 0.25rem;
+	border-radius: 2.5rem;
 }
 
 .player-slider.full-width {
@@ -157,7 +156,7 @@ menu.player-settings {
 	background: var(--secondary-container);
 	height: 100%;
 	position: relative;
-	border-radius: 0.25rem;
+	border-radius: 2.5rem;
 }
 
 .player-slider .range {
@@ -165,7 +164,7 @@ menu.player-settings {
 	background: var(--inverse-primary);
 	inset: 0;
 	right: var(--percentage-inv);
-	border-radius: 0.25rem;
+	border-radius: 2.5rem;
 	opacity: 0.5;
 }
 
diff --git a/materialious/src/routes/(app)/playlists/+page.svelte b/materialious/src/routes/(app)/playlists/+page.svelte
index d0d3b5a4..8a5e411f 100644
--- a/materialious/src/routes/(app)/playlists/+page.svelte
+++ b/materialious/src/routes/(app)/playlists/+page.svelte
@@ -51,7 +51,7 @@
 					<nav class="right-align padding">
 						<button
 							onclick={async () => await removePlaylistItem(playlist.playlistId)}
-							class="tertiary square"
+							class="tertiary"
 						>
 							<i>delete</i>
 						</button>
diff --git a/materialious/src/routes/(app)/subscriptions/manage/+page.svelte b/materialious/src/routes/(app)/subscriptions/manage/+page.svelte
index 26741f3d..a7a56023 100644
--- a/materialious/src/routes/(app)/subscriptions/manage/+page.svelte
+++ b/materialious/src/routes/(app)/subscriptions/manage/+page.svelte
@@ -55,7 +55,8 @@
 						</h6></a
 					>
 					<div class="max"></div>
-					<button onclick={async () => unsubscribe(sub.authorId)} class="border">Unsubscribe</button
+					<button onclick={async () => unsubscribe(sub.authorId)} class="surface-container-highest"
+						>Unsubscribe</button
 					>
 				</nav>
 			</article>