diff --git a/src/components/MainWrapper.tsx b/src/components/MainWrapper.tsx
deleted file mode 100644
index 5e5fd71fa..000000000
--- a/src/components/MainWrapper.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-const MainWrapper: React.FC = styled.main`
-    width: 100%;
-
-    @media (min-width: 1024px) {
-        width: 50%;
-    }
-`;
-
-export default MainWrapper;
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index e479ffd09..0bca5cacf 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { Helmet } from 'react-helmet';
 import { StaticQuery, graphql } from 'gatsby';
-import { ThemeProvider, Container } from '@lapidist/components';
+import {
+    ThemeProvider,
+    Container as BaseContainer
+} from '@lapidist/components';
 import styled from 'styled-components';
 
 interface StaticQueryProps {
@@ -13,9 +16,8 @@ interface StaticQueryProps {
     };
 }
 
-const IndexWrapper: React.FC = styled.div`
+const Container: React.FC = styled(BaseContainer)`
     max-width: 1440px;
-    margin: 0 auto;
 `;
 
 const IndexLayout: React.FC = ({ children }): JSX.Element => (
@@ -63,9 +65,18 @@ const IndexLayout: React.FC = ({ children }): JSX.Element => (
                     />
                 </Helmet>
                 <ThemeProvider>
-                    <IndexWrapper>
-                        <Container padding={10}>{children}</Container>
-                    </IndexWrapper>
+                    <Container
+                        styles={{
+                            padding: 6,
+                            breakpoints: {
+                                md: {
+                                    padding: 12
+                                }
+                            }
+                        }}
+                    >
+                        {children}
+                    </Container>
                 </ThemeProvider>
             </>
         )}
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index f175ad9a1..306e0096e 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
-import { Link } from '@lapidist/components';
+import { Container, Link } from '@lapidist/components';
 import IndexLayout from '../layouts';
-import DesktopWrapper from '../components/MainWrapper';
 import LinkWrapper from '../components/LinkWrapper';
 import PageTitle from '../components/PageTitle';
 
@@ -10,11 +9,20 @@ const NotFoundPage = (): JSX.Element => (
         <header>
             <PageTitle>Page Not Found</PageTitle>
         </header>
-        <DesktopWrapper>
+        <Container
+            styles={{
+                width: 'full',
+                breakpoints: {
+                    md: {
+                        width: '1/2'
+                    }
+                }
+            }}
+        >
             <LinkWrapper>
                 <Link title="Return Home" href="/" />
             </LinkWrapper>
-        </DesktopWrapper>
+        </Container>
     </IndexLayout>
 );
 
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index d164bdd52..b43364c46 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
-import { Link, Logo } from '@lapidist/components';
+import { Container, Link, Logo } from '@lapidist/components';
 import IndexLayout from '../layouts';
-import MainWrapper from '../components/MainWrapper';
 import LinkWrapper from '../components/LinkWrapper';
 import PageTitle from '../components/PageTitle';
 import TextWrapper from '../components/TextWrapper';
@@ -18,7 +17,16 @@ const IndexPage = (): JSX.Element => (
                 Brett Dorrans
             </PageTitle>
         </header>
-        <MainWrapper>
+        <Container
+            styles={{
+                width: 'full',
+                breakpoints: {
+                    md: {
+                        width: '1/2'
+                    }
+                }
+            }}
+        >
             <TextWrapper textColor={{ colorGroup: 'grey', colorShade: 'base' }}>
                 I&apos;m a Senior Software Engineer based in Glasgow, Scotland.
                 Scotland. I have been building software and strong client
@@ -33,7 +41,7 @@ const IndexPage = (): JSX.Element => (
                 </Link>
                 <Link href="mailto:hello@lapidist.net">Email</Link>
             </LinkWrapper>
-        </MainWrapper>
+        </Container>
     </IndexLayout>
 );