diff --git a/src/components/Link.tsx b/src/components/Link.tsx
index 5b86781e6..46ef43164 100644
--- a/src/components/Link.tsx
+++ b/src/components/Link.tsx
@@ -1,13 +1,13 @@
 'use client';
 
-import { LinkProps } from '@radix-ui/themes';
+import { LinkProps, Link as RadixLink } from '@radix-ui/themes';
 import { useRouter } from 'next/navigation';
 
 export function Link({ href, onClick, ...props }: LinkProps) {
   const router = useRouter();
 
   return (
-    <Link
+    <RadixLink
       href={href}
       onClick={(event) => {
         event.preventDefault();
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index ac8379ea2..8d8c07ffc 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -18,7 +18,6 @@ import {
   Spinner,
   Text,
 } from '@radix-ui/themes';
-import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 import { Suspense, useState } from 'react';
 import { REGIONS, UNLOCALIZED_REGION_NAMES } from '../../constants/regions';
@@ -28,6 +27,7 @@ import { BlitzkitWide } from '../../icons/BlitzkitWide';
 import { PatreonIcon } from '../../icons/Patreon';
 import { theme } from '../../stitches.config';
 import { useApp } from '../../stores/app';
+import { Link } from '../Link';
 import { LoggedIn } from './components/LoggedIn';
 import * as styles from './index.css';
 
@@ -81,8 +81,9 @@ export default function Navbar() {
               return (
                 <Link
                   key={tool.id}
-                  data-accent-color="gray"
-                  className={`rt-Text rt-reset rt-Link rt-r-size-2 rt-underline-${selected ? 'always' : 'hover'}`}
+                  color="gray"
+                  size="2"
+                  underline={selected ? 'always' : 'hover'}
                   href={`/tools/${tool.id}`}
                 >
                   {tool.title}
@@ -188,7 +189,6 @@ export default function Navbar() {
             <Link
               key={tool.id}
               href={`/tools/${tool.id}`}
-              target={tool.href ? '_blank' : undefined}
               className={styles.toolCard}
               style={{
                 backgroundImage: `url(/assets/banners/${tool.id}.webp)`,