diff --git a/README.md b/README.md
index e2411700..592f2a4e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <p align="center" style="text-align:center">
   <img alt="Bison Logo" src="https://user-images.githubusercontent.com/14339/89243835-f47e7c80-d5d2-11ea-8d8d-36202227d0ec.png" />
-  <h1 align="center">The Full Stack Jamstack in-a-box.</h1>
+  <h1 align="center">The Full Stack Jamstack in-a-box</h1>
 </p>
 
 Bison is a starter repository created out of real-world apps at [Echobind](https://echobind.com). It represents our team's "Greenfield Web Stack" that we use when creating web apps for clients.
diff --git a/packages/create-bison-app/template/components/Footer.tsx b/packages/create-bison-app/template/components/Footer.tsx
index 8ad469b6..4970e312 100644
--- a/packages/create-bison-app/template/components/Footer.tsx
+++ b/packages/create-bison-app/template/components/Footer.tsx
@@ -1,6 +1,7 @@
-import { Center, Flex, Text, Link } from '@chakra-ui/layout';
+import { Center, Flex, Text } from '@chakra-ui/layout';
 
 import { Logo } from './Logo';
+import { Link } from './Link';
 
 export function Footer() {
   const year = new Date().getFullYear();
diff --git a/packages/create-bison-app/template/components/Link.tsx b/packages/create-bison-app/template/components/Link.tsx
new file mode 100644
index 00000000..a6f25a09
--- /dev/null
+++ b/packages/create-bison-app/template/components/Link.tsx
@@ -0,0 +1,109 @@
+import type { PropsWithChildren } from 'react';
+import type { LinkProps as NextLinkProps } from 'next/link';
+import React from 'react';
+import NextLink from 'next/link';
+import {
+  Button as ChakraButton,
+  ButtonProps as ChakraButtonProps,
+  BreadcrumbLink as ChakraBreadcrumbLink,
+  BreadcrumbLinkProps as ChakraBreadcrumbLinkProps,
+  Link as ChakraLink,
+  LinkProps as ChakraLinkProps,
+} from '@chakra-ui/react';
+
+export type NextLinkAs = NextLinkProps['as'];
+
+export type LinkProps<T> =
+  | PropsWithChildren<NextLinkProps & Omit<T, 'as'>>
+  | PropsWithChildren<Omit<NextLinkProps, 'as'> & T>;
+
+type ChakraLinkAs = ChakraLinkProps['as'];
+
+//  Has to be a new component because both chakra and next share the `as` keyword
+export const Link = ({
+  href,
+  as,
+  replace,
+  scroll,
+  shallow,
+  prefetch,
+  locale,
+  isExternal,
+  children,
+  ...chakraProps
+}: LinkProps<ChakraLinkProps>) => {
+  return isExternal ? (
+    <ChakraLink href={href} as={as as ChakraLinkAs} isExternal {...chakraProps}>
+      {children}
+    </ChakraLink>
+  ) : (
+    <NextLink
+      passHref={true}
+      href={href}
+      as={as as NextLinkAs}
+      replace={replace}
+      scroll={scroll}
+      shallow={shallow}
+      prefetch={prefetch}
+      locale={locale}
+    >
+      <ChakraLink {...chakraProps}>{children}</ChakraLink>
+    </NextLink>
+  );
+};
+
+export const ButtonLink = ({
+  href,
+  as,
+  replace,
+  scroll,
+  shallow,
+  prefetch,
+  locale,
+  children,
+  ...chakraProps
+}: LinkProps<ChakraButtonProps>) => {
+  return (
+    <NextLink
+      passHref={true}
+      href={href}
+      as={as as NextLinkAs}
+      replace={replace}
+      scroll={scroll}
+      shallow={shallow}
+      prefetch={prefetch}
+      locale={locale}
+    >
+      <ChakraButton as="a" {...chakraProps}>
+        {children}
+      </ChakraButton>
+    </NextLink>
+  );
+};
+
+export const BreadcrumbLink = ({
+  href,
+  as,
+  replace,
+  scroll,
+  shallow,
+  prefetch,
+  locale,
+  children,
+  ...chakraProps
+}: LinkProps<ChakraBreadcrumbLinkProps>) => {
+  return (
+    <NextLink
+      passHref={true}
+      href={href}
+      as={as as NextLinkAs}
+      replace={replace}
+      scroll={scroll}
+      shallow={shallow}
+      prefetch={prefetch}
+      locale={locale}
+    >
+      <ChakraBreadcrumbLink {...chakraProps}>{children}</ChakraBreadcrumbLink>
+    </NextLink>
+  );
+};
diff --git a/packages/create-bison-app/template/components/LoginForm.tsx b/packages/create-bison-app/template/components/LoginForm.tsx
index 7e27de9a..4bdd4f72 100644
--- a/packages/create-bison-app/template/components/LoginForm.tsx
+++ b/packages/create-bison-app/template/components/LoginForm.tsx
@@ -1,23 +1,13 @@
 import React, { useState } from 'react';
 import { useRouter } from 'next/router';
-import NextLink from 'next/link';
-import {
-  Link,
-  Flex,
-  Text,
-  FormControl,
-  FormLabel,
-  Input,
-  Stack,
-  Button,
-  Circle,
-} from '@chakra-ui/react';
+import { Flex, Text, FormControl, FormLabel, Input, Stack, Button, Circle } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { gql } from '@apollo/client';
 
 import { EMAIL_REGEX } from '../constants';
 import { useAuth } from '../context/auth';
 import { ErrorText } from '../components/ErrorText';
+import { Link } from './Link';
 import { setErrorsFromGraphQLErrors } from '../utils/setErrors';
 import { LoginMutationVariables, useLoginMutation } from '../types';
 
@@ -116,11 +106,9 @@ export function LoginForm() {
       <Flex marginTop={8} justifyContent="center">
         <Text color="gray.500">
           New User?{' '}
-          <NextLink href="/signup" passHref>
-            <Link href="#" color="gray.900">
-              Sign Up
-            </Link>
-          </NextLink>
+          <Link href="/signup" color="gray.900">
+            Sign Up
+          </Link>
         </Text>
       </Flex>
     </form>
diff --git a/packages/create-bison-app/template/components/Logo.tsx b/packages/create-bison-app/template/components/Logo.tsx
index 1203a697..277e12e6 100644
--- a/packages/create-bison-app/template/components/Logo.tsx
+++ b/packages/create-bison-app/template/components/Logo.tsx
@@ -1,13 +1,12 @@
 import React from 'react';
 import { Heading } from '@chakra-ui/react';
-import NextLink from 'next/link';
+
+import { Link } from './Link';
 
 export function Logo() {
   return (
-    <NextLink href="/" passHref>
-      <Heading as="a" size="md">
-        MyApp
-      </Heading>
-    </NextLink>
+    <Heading as={Link} href="/" size="md">
+      MyApp
+    </Heading>
   );
 }
diff --git a/packages/create-bison-app/template/components/Nav.tsx b/packages/create-bison-app/template/components/Nav.tsx
index 5f6850dc..410e970f 100644
--- a/packages/create-bison-app/template/components/Nav.tsx
+++ b/packages/create-bison-app/template/components/Nav.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import {
-  Link,
   Stack,
   useBreakpoint,
   Button,
@@ -9,7 +8,8 @@ import {
   MenuList,
   MenuItem,
 } from '@chakra-ui/react';
-import NextLink from 'next/link';
+
+import { Link } from './Link';
 
 export function Nav() {
   const breakpoint = useBreakpoint();
@@ -23,9 +23,7 @@ export function Nav() {
 
       <MenuList width="full">
         <MenuItem>
-          <NextLink href="/">
-            <Link href="">Link 1</Link>
-          </NextLink>
+          <Link href="/">Link 1</Link>
         </MenuItem>
 
         <MenuItem>
@@ -45,9 +43,7 @@ export function Nav() {
     </Menu>
   ) : (
     <Stack as="nav" direction="row" ml="auto" alignItems="center" fontSize="md" spacing={8}>
-      <NextLink href="/">
-        <Link href="">Link 1</Link>
-      </NextLink>
+      <Link href="/">Link 1</Link>
 
       <Link href="/#features">Link 2</Link>
       <Link href="/#tech">Link 3</Link>
diff --git a/packages/create-bison-app/template/components/SignupForm.tsx b/packages/create-bison-app/template/components/SignupForm.tsx
index e7e5b0dc..05f95674 100644
--- a/packages/create-bison-app/template/components/SignupForm.tsx
+++ b/packages/create-bison-app/template/components/SignupForm.tsx
@@ -1,16 +1,5 @@
 import React, { useState } from 'react';
-import NextLink from 'next/link';
-import {
-  Link,
-  Flex,
-  Text,
-  FormControl,
-  FormLabel,
-  Input,
-  Stack,
-  Button,
-  Circle,
-} from '@chakra-ui/react';
+import { Flex, Text, FormControl, FormLabel, Input, Stack, Button, Circle } from '@chakra-ui/react';
 import { gql } from '@apollo/client';
 import { useForm } from 'react-hook-form';
 import { useRouter } from 'next/router';
@@ -20,6 +9,7 @@ import { setErrorsFromGraphQLErrors } from '../utils/setErrors';
 import { SignupMutationVariables, useSignupMutation } from '../types';
 import { EMAIL_REGEX } from '../constants';
 
+import { Link } from './Link';
 import { ErrorText } from './ErrorText';
 
 export const SIGNUP_MUTATION = gql`
@@ -140,11 +130,9 @@ export function SignupForm() {
       <Flex marginTop={8} justifyContent="center">
         <Text color="gray.500">
           Have an account?{' '}
-          <NextLink href="/login" passHref>
-            <Link href="#" color="gray.900">
-              Sign In
-            </Link>
-          </NextLink>
+          <Link href="/login" color="gray.900">
+            Sign In
+          </Link>
         </Text>
       </Flex>
     </form>
diff --git a/packages/create-bison-app/template/layouts/LoggedOut.tsx b/packages/create-bison-app/template/layouts/LoggedOut.tsx
index f56a4c46..b57901c8 100644
--- a/packages/create-bison-app/template/layouts/LoggedOut.tsx
+++ b/packages/create-bison-app/template/layouts/LoggedOut.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { Box, Flex, Button } from '@chakra-ui/react';
-import NextLink from 'next/link';
+import { Box, Flex } from '@chakra-ui/react';
 
+import { ButtonLink } from '../components/Link';
 import { Logo } from '../components/Logo';
 import { Footer } from '../components/Footer';
 
@@ -16,11 +16,9 @@ export function LoggedOutLayout({ children }: Props) {
         <Flex p={4}>
           <Logo />
 
-          <NextLink href="/login" passHref>
-            <Button as="a" ml="auto" display={{ base: 'none', lg: 'inline-flex' }}>
-              Login
-            </Button>
-          </NextLink>
+          <ButtonLink href="/login" ml="auto" display={{ base: 'none', lg: 'inline-flex' }}>
+            Login
+          </ButtonLink>
         </Flex>
       </>