feat: move all @next files to non @next directory

119 files changed, 212 insertions, 676 deletions

diff --git a/packages/website/ts/@next/components/footer.tsx b/packages/website/ts/@next/components/footer.tsx
deleted file mode 100644
index b30a0cc5e..000000000
--- a/packages/website/ts/@next/components/footer.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import { Link as SmartLink } from '@0x/react-shared';
-import * as _ from 'lodash';
-import * as React from 'react';
-import MediaQuery from 'react-responsive';
-import styled from 'styled-components';
-
-import { Logo } from 'ts/@next/components/logo';
-import { Column, FlexWrap, WrapGrid } from 'ts/@next/components/newLayout';
-import { NewsletterForm } from 'ts/@next/components/newsletter_form';
-import { WebsitePaths } from 'ts/types';
-import { constants } from 'ts/utils/constants';
-
-interface LinkInterface {
-    text: string;
-    url: string;
-    shouldOpenInNewTab?: boolean;
-}
-
-interface LinkRows {
-    heading: string;
-    isOnMobile?: boolean;
-    links: LinkInterface[];
-}
-
-interface LinkListProps {
-    links: LinkInterface[];
-}
-
-const linkRows: LinkRows[] = [
-    {
-        heading: 'Products',
-        isOnMobile: true,
-        links: [
-            { url: WebsitePaths.Instant, text: '0x Instant' },
-            { url: WebsitePaths.LaunchKit, text: '0x Launch Kit' },
-        ],
-    },
-    {
-        heading: 'Developers',
-        links: [
-            { url: WebsitePaths.Docs, text: 'Documentation' },
-            { url: constants.URL_GITHUB_ORG, text: 'GitHub', shouldOpenInNewTab: true },
-            { url: constants.URL_PROTOCOL_SPECIFICATION, text: 'Protocol Spec', shouldOpenInNewTab: true },
-        ],
-    },
-    {
-        heading: 'About',
-        isOnMobile: true,
-        links: [
-            { url: WebsitePaths.AboutMission, text: 'Mission' },
-            { url: WebsitePaths.AboutTeam, text: 'Team' },
-            { url: WebsitePaths.AboutJobs, text: 'Jobs' },
-            { url: WebsitePaths.AboutPress, text: 'Press' },
-            { url: WebsitePaths.Ecosystem, text: 'Grant Program' },
-        ],
-    },
-    {
-        heading: 'Community',
-        isOnMobile: true,
-        links: [
-            { url: constants.URL_TWITTER, text: 'Twitter', shouldOpenInNewTab: true },
-            { url: constants.URL_ZEROEX_CHAT, text: 'Discord Chat', shouldOpenInNewTab: true },
-            { url: constants.URL_FACEBOOK, text: 'Facebook', shouldOpenInNewTab: true },
-            { url: constants.URL_REDDIT, text: 'Reddit', shouldOpenInNewTab: true },
-        ],
-    },
-];
-
-export const Footer: React.StatelessComponent = () => (
-    <FooterWrap>
-        <FlexWrap>
-            <FooterColumn width="35%">
-                <Logo />
-                <NewsletterForm />
-            </FooterColumn>
-
-            <FooterColumn width="55%">
-                <WrapGrid isCentered={false} isWrapped={true}>
-                    {_.map(linkRows, (row: LinkRows, index) => (
-                        <MediaQuery minWidth={row.isOnMobile ? 0 : 768} key={`fc-${index}`}>
-                            <FooterSectionWrap>
-                                <RowHeading>{row.heading}</RowHeading>
-
-                                <LinkList links={row.links} />
-                            </FooterSectionWrap>
-                        </MediaQuery>
-                    ))}
-                </WrapGrid>
-            </FooterColumn>
-        </FlexWrap>
-    </FooterWrap>
-);
-
-const LinkList = (props: LinkListProps) => (
-    <List>
-        {_.map(props.links, (link, index) => (
-            <li key={`fl-${index}`}>
-                <Link to={link.url} shouldOpenInNewTab={link.shouldOpenInNewTab}>
-                    {link.text}
-                </Link>
-            </li>
-        ))}
-    </List>
-);
-
-const FooterWrap = styled.footer`
-    padding: 40px 30px 30px 30px;
-    margin-top: 30px;
-    background-color: ${props => props.theme.footerBg};
-    color: ${props => props.theme.footerColor};
-
-    path {
-        fill: ${props => props.theme.footerColor};
-    }
-
-    @media (min-width: 768px) {
-        height: 350px;
-    }
-`;
-
-const FooterColumn = styled(Column)`
-    @media (min-width: 768px) {
-        width: ${props => props.width};
-    }
-
-    @media (max-width: 768px) {
-        text-align: left;
-    }
-`;
-
-const FooterSectionWrap = styled(FooterColumn)`
-    @media (max-width: 768px) {
-        width: 50%;
-
-        & + & {
-            margin-top: 0;
-            margin-bottom: 30px;
-        }
-    }
-`;
-
-const RowHeading = styled.h3`
-    color: inherit;
-    font-weight: 700;
-    font-size: 16px;
-    margin-bottom: 1.25em;
-    opacity: 0.75;
-`;
-
-const List = styled.ul`
-    li + li {
-        margin-top: 8px;
-    }
-`;
-
-const Link = styled(SmartLink)`
-    color: inherit;
-    opacity: 0.5;
-    display: block;
-    font-size: 16px;
-    line-height: 20px;
-    transition: opacity 0.25s;
-    text-decoration: none;
-
-    &:hover {
-        opacity: 0.8;
-    }
-`;
diff --git a/packages/website/ts/@next/pages/instant/code_demo.tsx b/packages/website/ts/@next/pages/instant/code_demo.tsx
deleted file mode 100644
index 4a3022df5..000000000
--- a/packages/website/ts/@next/pages/instant/code_demo.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import * as React from 'react';
-import * as CopyToClipboard from 'react-copy-to-clipboard';
-import SyntaxHighlighter from 'react-syntax-highlighter';
-
-import { Button } from 'ts/@next/components/button';
-import { Container } from 'ts/components/ui/container';
-import { styled } from 'ts/style/theme';
-import { zIndex } from 'ts/style/z_index';
-
-const CustomPre = styled.pre`
-    margin: 0px;
-    line-height: 24px;
-    overflow: scroll;
-    width: 100%;
-    height: 100%;
-    max-height: 800px;
-    border-radius: 4px;
-    code {
-        background-color: inherit !important;
-        border-radius: 0px;
-        font-family: 'Roboto Mono', sans-serif;
-        border: none;
-    }
-    code:first-of-type {
-        background-color: #060d0d !important;
-        color: #999;
-        min-height: 100%;
-        text-align: center;
-        margin-right: 15px;
-        line-height: 25px;
-        padding: 10px 7px !important;
-    }
-    code:last-of-type {
-        position: relative;
-        top: 10px;
-        top: 0;
-        padding-top: 11px;
-        display: inline-block;
-        line-height: 25px;
-    }
-`;
-
-const customStyle = {
-    'hljs-comment': {
-        color: '#7e7887',
-    },
-    'hljs-quote': {
-        color: '#7e7887',
-    },
-    'hljs-variable': {
-        color: '#be4678',
-    },
-    'hljs-template-variable': {
-        color: '#be4678',
-    },
-    'hljs-attribute': {
-        color: '#be4678',
-    },
-    'hljs-regexp': {
-        color: '#be4678',
-    },
-    'hljs-link': {
-        color: '#be4678',
-    },
-    'hljs-tag': {
-        color: '#61f5ff',
-    },
-    'hljs-name': {
-        color: '#61f5ff',
-    },
-    'hljs-selector-id': {
-        color: '#be4678',
-    },
-    'hljs-selector-class': {
-        color: '#be4678',
-    },
-    'hljs-number': {
-        color: '#c994ff',
-    },
-    'hljs-meta': {
-        color: '#61f5ff',
-    },
-    'hljs-built_in': {
-        color: '#aa573c',
-    },
-    'hljs-builtin-name': {
-        color: '#aa573c',
-    },
-    'hljs-literal': {
-        color: '#aa573c',
-    },
-    'hljs-type': {
-        color: '#aa573c',
-    },
-    'hljs-params': {
-        color: '#aa573c',
-    },
-    'hljs-string': {
-        color: '#bcff88',
-    },
-    'hljs-symbol': {
-        color: '#2a9292',
-    },
-    'hljs-bullet': {
-        color: '#2a9292',
-    },
-    'hljs-title': {
-        color: '#576ddb',
-    },
-    'hljs-section': {
-        color: '#576ddb',
-    },
-    'hljs-keyword': {
-        color: '#955ae7',
-    },
-    'hljs-selector-tag': {
-        color: '#955ae7',
-    },
-    'hljs-deletion': {
-        color: '#19171c',
-        display: 'inline-block',
-        width: '100%',
-        backgroundColor: '#be4678',
-    },
-    'hljs-addition': {
-        color: '#19171c',
-        display: 'inline-block',
-        width: '100%',
-        backgroundColor: '#2a9292',
-    },
-    hljs: {
-        display: 'block',
-        overflowX: 'hidden',
-        background: '#1B2625',
-        color: 'white',
-        fontSize: '12px',
-    },
-    'hljs-emphasis': {
-        fontStyle: 'italic',
-    },
-    'hljs-strong': {
-        fontWeight: 'bold',
-    },
-};
-
-export interface CodeDemoProps {
-    children: string;
-}
-
-export interface CodeDemoState {
-    didCopyCode: boolean;
-}
-
-export class CodeDemo extends React.Component<CodeDemoProps, CodeDemoState> {
-    public state: CodeDemoState = {
-        didCopyCode: false,
-    };
-    public render(): React.ReactNode {
-        const copyButtonText = this.state.didCopyCode ? 'Copied!' : 'Copy';
-        return (
-            <Container position="relative" height="100%">
-                <Container position="absolute" top="10px" right="10px" zIndex={zIndex.overlay - 1}>
-                    <CopyToClipboard text={this.props.children} onCopy={this._handleCopyClick}>
-                        <StyledButton>{copyButtonText}</StyledButton>
-                    </CopyToClipboard>
-                </Container>
-                <SyntaxHighlighter language="html" style={customStyle} showLineNumbers={true} PreTag={CustomPre}>
-                    {this.props.children}
-                </SyntaxHighlighter>
-            </Container>
-        );
-    }
-    private readonly _handleCopyClick = () => {
-        this.setState({ didCopyCode: true });
-    };
-}
-
-const StyledButton = styled(Button)`
-    border-radius: 4px;
-    font-size: 15px;
-    font-weight: 400;
-    padding: 9px 21px 7px;
-`;
diff --git a/packages/website/ts/@next/pages/instant/config_generator_address_input.tsx b/packages/website/ts/@next/pages/instant/config_generator_address_input.tsx
deleted file mode 100644
index 9b0e9b1d1..000000000
--- a/packages/website/ts/@next/pages/instant/config_generator_address_input.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { addressUtils } from '@0x/utils';
-import * as _ from 'lodash';
-import * as React from 'react';
-import styled from 'styled-components';
-
-import { colors } from 'ts/style/colors';
-
-import { Container } from 'ts/components/ui/container';
-
-import { Paragraph } from 'ts/@next/components/text';
-
-export interface ConfigGeneratorAddressInputProps {
-    value?: string;
-    onChange?: (address: string, isValid: boolean) => void;
-}
-
-export interface ConfigGeneratorAddressInputState {
-    errMsg: string;
-}
-
-export interface InputProps {
-    className?: string;
-    value?: string;
-    width?: string;
-    fontSize?: string;
-    fontColor?: string;
-    padding?: string;
-    placeholderColor?: string;
-    placeholder?: string;
-    backgroundColor?: string;
-    onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
-}
-
-export class ConfigGeneratorAddressInput extends React.Component<
-    ConfigGeneratorAddressInputProps,
-    ConfigGeneratorAddressInputState
-> {
-    public state = {
-        errMsg: '',
-    };
-    public render(): React.ReactNode {
-        const { errMsg } = this.state;
-        const hasError = !_.isEmpty(errMsg);
-        return (
-            <Container height="80px">
-                <Input value={this.props.value} onChange={this._handleChange} placeholder="0xe99...aa8da4" />
-                <Container marginTop="5px" isHidden={!hasError} height="25px">
-                    <Paragraph size="small" isNoMargin={true}>
-                        {errMsg}
-                    </Paragraph>
-                </Container>
-            </Container>
-        );
-    }
-
-    private readonly _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
-        const address = event.target.value;
-        const isValidAddress = addressUtils.isAddress(address.toLowerCase()) || address === '';
-        const errMsg = isValidAddress ? '' : 'Please enter a valid Ethereum address';
-        this.setState({
-            errMsg,
-        });
-        this.props.onChange(address, isValidAddress);
-    };
-}
-
-const PlainInput: React.StatelessComponent<InputProps> = ({ value, className, placeholder, onChange }) => (
-    <input className={className} value={value} onChange={onChange} placeholder={placeholder} />
-);
-
-export const Input = styled(PlainInput)`
-    background-color: ${colors.white};
-    color: ${colors.textDarkSecondary};
-    font-size: 1rem;
-    width: 100%;
-    padding: 16px 20px 18px;
-    border-radius: 4px;
-    border: 1px solid transparent;
-    outline: none;
-    &::placeholder {
-        color: #333333;
-        opacity: 0.5;
-    }
-`;
diff --git a/packages/website/ts/@next/components/aboutPageLayout.tsx b/packages/website/ts/components/aboutPageLayout.tsx
index 86a94ae2b..86a94ae2b 100644
--- a/packages/website/ts/@next/components/aboutPageLayout.tsx
+++ b/packages/website/ts/components/aboutPageLayout.tsx
diff --git a/packages/website/ts/@next/components/animatedChatIcon.tsx b/packages/website/ts/components/animatedChatIcon.tsx
index 9a86e244c..9a86e244c 100644
--- a/packages/website/ts/@next/components/animatedChatIcon.tsx
+++ b/packages/website/ts/components/animatedChatIcon.tsx
diff --git a/packages/website/ts/@next/components/animatedCompassIcon.tsx b/packages/website/ts/components/animatedCompassIcon.tsx
index 5388f95ca..5388f95ca 100644
--- a/packages/website/ts/@next/components/animatedCompassIcon.tsx
+++ b/packages/website/ts/components/animatedCompassIcon.tsx
diff --git a/packages/website/ts/@next/components/banner.tsx b/packages/website/ts/components/banner.tsx
index 6c4d94dc5..6c4d94dc5 100644
--- a/packages/website/ts/@next/components/banner.tsx
+++ b/packages/website/ts/components/banner.tsx
diff --git a/packages/website/ts/@next/components/blockIconLink.tsx b/packages/website/ts/components/blockIconLink.tsx
index 8d66a4afa..8d66a4afa 100644
--- a/packages/website/ts/@next/components/blockIconLink.tsx
+++ b/packages/website/ts/components/blockIconLink.tsx
diff --git a/packages/website/ts/@next/components/button.tsx b/packages/website/ts/components/button.tsx
index 348f1b7b4..348f1b7b4 100644
--- a/packages/website/ts/@next/components/button.tsx
+++ b/packages/website/ts/components/button.tsx
diff --git a/packages/website/ts/@next/components/chapter_link.tsx b/packages/website/ts/components/chapter_link.tsx
index fd974cec1..fd974cec1 100644
--- a/packages/website/ts/@next/components/chapter_link.tsx
+++ b/packages/website/ts/components/chapter_link.tsx
diff --git a/packages/website/ts/@next/components/definition.tsx b/packages/website/ts/components/definition.tsx
index 8adef8d54..8adef8d54 100644
--- a/packages/website/ts/@next/components/definition.tsx
+++ b/packages/website/ts/components/definition.tsx
diff --git a/packages/website/ts/@next/components/dropdowns/dropdown_developers.tsx b/packages/website/ts/components/dropdowns/dropdown_developers.tsx
index 96d88846b..96d88846b 100644
--- a/packages/website/ts/@next/components/dropdowns/dropdown_developers.tsx
+++ b/packages/website/ts/components/dropdowns/dropdown_developers.tsx
diff --git a/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx b/packages/website/ts/components/dropdowns/dropdown_products.tsx
index 886cee44a..886cee44a 100644
--- a/packages/website/ts/@next/components/dropdowns/dropdown_products.tsx
+++ b/packages/website/ts/components/dropdowns/dropdown_products.tsx
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 6366bf4ea..b30a0cc5e 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -1,228 +1,168 @@
-import { ALink, colors, Link } from '@0x/react-shared';
-import { ObjectMap } from '@0x/types';
+import { Link as SmartLink } from '@0x/react-shared';
 import * as _ from 'lodash';
-import DropDownMenu from 'material-ui/DropDownMenu';
-import MenuItem from 'material-ui/MenuItem';
 import * as React from 'react';
+import MediaQuery from 'react-responsive';
+import styled from 'styled-components';
 
-import { Dispatcher } from 'ts/redux/dispatcher';
-import { Deco, Key, Language, WebsitePaths } from 'ts/types';
+import { Logo } from 'ts/@next/components/logo';
+import { Column, FlexWrap, WrapGrid } from 'ts/@next/components/newLayout';
+import { NewsletterForm } from 'ts/@next/components/newsletter_form';
+import { WebsitePaths } from 'ts/types';
 import { constants } from 'ts/utils/constants';
-import { Translate } from 'ts/utils/translate';
-
-const ICON_DIMENSION = 16;
-
-const languageToMenuTitle = {
-    [Language.English]: 'English',
-    [Language.Russian]: 'Русский',
-    [Language.Spanish]: 'Español',
-    [Language.Korean]: '한국어',
-    [Language.Chinese]: '中文',
-};
-
-export interface FooterProps {
-    translate: Translate;
-    dispatcher: Dispatcher;
-    backgroundColor?: string;
+
+interface LinkInterface {
+    text: string;
+    url: string;
+    shouldOpenInNewTab?: boolean;
+}
+
+interface LinkRows {
+    heading: string;
+    isOnMobile?: boolean;
+    links: LinkInterface[];
 }
 
-interface FooterState {
-    selectedLanguage: Language;
+interface LinkListProps {
+    links: LinkInterface[];
 }
 
-export class Footer extends React.Component<FooterProps, FooterState> {
-    public static defaultProps = {
-        backgroundColor: colors.darkerGrey,
-    };
-    constructor(props: FooterProps) {
-        super(props);
-        this.state = {
-            selectedLanguage: props.translate.getLanguage(),
-        };
+const linkRows: LinkRows[] = [
+    {
+        heading: 'Products',
+        isOnMobile: true,
+        links: [
+            { url: WebsitePaths.Instant, text: '0x Instant' },
+            { url: WebsitePaths.LaunchKit, text: '0x Launch Kit' },
+        ],
+    },
+    {
+        heading: 'Developers',
+        links: [
+            { url: WebsitePaths.Docs, text: 'Documentation' },
+            { url: constants.URL_GITHUB_ORG, text: 'GitHub', shouldOpenInNewTab: true },
+            { url: constants.URL_PROTOCOL_SPECIFICATION, text: 'Protocol Spec', shouldOpenInNewTab: true },
+        ],
+    },
+    {
+        heading: 'About',
+        isOnMobile: true,
+        links: [
+            { url: WebsitePaths.AboutMission, text: 'Mission' },
+            { url: WebsitePaths.AboutTeam, text: 'Team' },
+            { url: WebsitePaths.AboutJobs, text: 'Jobs' },
+            { url: WebsitePaths.AboutPress, text: 'Press' },
+            { url: WebsitePaths.Ecosystem, text: 'Grant Program' },
+        ],
+    },
+    {
+        heading: 'Community',
+        isOnMobile: true,
+        links: [
+            { url: constants.URL_TWITTER, text: 'Twitter', shouldOpenInNewTab: true },
+            { url: constants.URL_ZEROEX_CHAT, text: 'Discord Chat', shouldOpenInNewTab: true },
+            { url: constants.URL_FACEBOOK, text: 'Facebook', shouldOpenInNewTab: true },
+            { url: constants.URL_REDDIT, text: 'Reddit', shouldOpenInNewTab: true },
+        ],
+    },
+];
+
+export const Footer: React.StatelessComponent = () => (
+    <FooterWrap>
+        <FlexWrap>
+            <FooterColumn width="35%">
+                <Logo />
+                <NewsletterForm />
+            </FooterColumn>
+
+            <FooterColumn width="55%">
+                <WrapGrid isCentered={false} isWrapped={true}>
+                    {_.map(linkRows, (row: LinkRows, index) => (
+                        <MediaQuery minWidth={row.isOnMobile ? 0 : 768} key={`fc-${index}`}>
+                            <FooterSectionWrap>
+                                <RowHeading>{row.heading}</RowHeading>
+
+                                <LinkList links={row.links} />
+                            </FooterSectionWrap>
+                        </MediaQuery>
+                    ))}
+                </WrapGrid>
+            </FooterColumn>
+        </FlexWrap>
+    </FooterWrap>
+);
+
+const LinkList = (props: LinkListProps) => (
+    <List>
+        {_.map(props.links, (link, index) => (
+            <li key={`fl-${index}`}>
+                <Link to={link.url} shouldOpenInNewTab={link.shouldOpenInNewTab}>
+                    {link.text}
+                </Link>
+            </li>
+        ))}
+    </List>
+);
+
+const FooterWrap = styled.footer`
+    padding: 40px 30px 30px 30px;
+    margin-top: 30px;
+    background-color: ${props => props.theme.footerBg};
+    color: ${props => props.theme.footerColor};
+
+    path {
+        fill: ${props => props.theme.footerColor};
+    }
+
+    @media (min-width: 768px) {
+        height: 350px;
     }
-    public render(): React.ReactNode {
-        const sectionNameToLinks: ObjectMap<ALink[]> = {
-            [Key.Documentation]: [
-                {
-                    title: 'Developer Home',
-                    to: WebsitePaths.Docs,
-                },
-                {
-                    title: '0x.js',
-                    to: WebsitePaths.ZeroExJs,
-                },
-                {
-                    title: this.props.translate.get(Key.SmartContracts, Deco.Cap),
-                    to: WebsitePaths.SmartContracts,
-                },
-                {
-                    title: this.props.translate.get(Key.Connect, Deco.Cap),
-                    to: WebsitePaths.Connect,
-                },
-                {
-                    title: this.props.translate.get(Key.Whitepaper, Deco.Cap),
-                    to: WebsitePaths.Whitepaper,
-                    shouldOpenInNewTab: true,
-                },
-                {
-                    title: this.props.translate.get(Key.Wiki, Deco.Cap),
-                    to: WebsitePaths.Wiki,
-                },
-            ],
-            [Key.Community]: [
-                {
-                    title: this.props.translate.get(Key.Discord, Deco.Cap),
-                    to: constants.URL_ZEROEX_CHAT,
-                    shouldOpenInNewTab: true,
-                },
-                {
-                    title: this.props.translate.get(Key.Blog, Deco.Cap),
-                    to: constants.URL_BLOG,
-                    shouldOpenInNewTab: true,
-                },
-                {
-                    title: 'Twitter',
-                    to: constants.URL_TWITTER,
-                    shouldOpenInNewTab: true,
-                },
-                {
-                    title: 'Reddit',
-                    to: constants.URL_REDDIT,
-                    shouldOpenInNewTab: true,
-                },
-                {
-                    title: this.props.translate.get(Key.Forum, Deco.Cap),
-                    to: constants.URL_DISCOURSE_FORUM,
-                    shouldOpenInNewTab: true,
-                },
-            ],
-            [Key.Organization]: [
-                {
-                    title: this.props.translate.get(Key.About, Deco.Cap),
-                    to: WebsitePaths.About,
-                },
-                {
-                    title: this.props.translate.get(Key.Careers, Deco.Cap),
-                    to: WebsitePaths.Careers,
-                },
-                {
-                    title: this.props.translate.get(Key.Contact, Deco.Cap),
-                    to: 'mailto:team@0x.org',
-                    shouldOpenInNewTab: true,
-                },
-            ],
-        };
-        const languageMenuItems = _.map(languageToMenuTitle, (menuTitle: string, language: Language) => {
-            return <MenuItem key={menuTitle} value={language} primaryText={menuTitle} />;
-        });
-        return (
-            <div className="relative pb4 pt2" style={{ backgroundColor: this.props.backgroundColor }}>
-                <div className="mx-auto max-width-4 md-px2 lg-px0 py4 clearfix" style={{ color: colors.white }}>
-                    <div className="col lg-col-4 md-col-4 col-12 left">
-                        <div className="sm-mx-auto" style={{ width: 148 }}>
-                            <div>
-                                <img src="/images/protocol_logo_white.png" height="30" />
-                            </div>
-                            <div
-                                style={{
-                                    fontSize: 11,
-                                    color: colors.grey,
-                                    paddingLeft: 37,
-                                    paddingTop: 2,
-                                }}
-                            >
-                                © ZeroEx, Intl.
-                            </div>
-                            <div className="pt4 center">
-                                <DropDownMenu
-                                    labelStyle={{ color: colors.white }}
-                                    value={this.state.selectedLanguage}
-                                    onChange={this._updateLanguage.bind(this)}
-                                >
-                                    {languageMenuItems}
-                                </DropDownMenu>
-                            </div>
-                        </div>
-                    </div>
-                    <div className="col lg-col-8 md-col-8 col-12 lg-pl4 md-pl4">
-                        <div className="col lg-col-4 md-col-4 col-12">
-                            <div className="lg-right md-right sm-center">
-                                {this._renderHeader(Key.Documentation)}
-                                {_.map(sectionNameToLinks[Key.Documentation], this._renderMenuItem.bind(this))}
-                            </div>
-                        </div>
-                        <div className="col lg-col-4 md-col-4 col-12 lg-pr2 md-pr2">
-                            <div className="lg-right md-right sm-center">
-                                {this._renderHeader(Key.Community)}
-                                {_.map(sectionNameToLinks[Key.Community], this._renderMenuItem.bind(this))}
-                            </div>
-                        </div>
-                        <div className="col lg-col-4 md-col-4 col-12">
-                            <div className="lg-right md-right sm-center">
-                                {this._renderHeader(Key.Organization)}
-                                {_.map(sectionNameToLinks[Key.Organization], this._renderMenuItem.bind(this))}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        );
+`;
+
+const FooterColumn = styled(Column)`
+    @media (min-width: 768px) {
+        width: ${props => props.width};
     }
-    private _renderIcon(fileName: string): React.ReactNode {
-        return (
-            <div style={{ height: ICON_DIMENSION, width: ICON_DIMENSION }}>
-                <img src={`/images/social/${fileName}`} style={{ width: ICON_DIMENSION }} />
-            </div>
-        );
+
+    @media (max-width: 768px) {
+        text-align: left;
     }
-    private _renderMenuItem(link: ALink): React.ReactNode {
-        const titleToIcon: { [title: string]: string } = {
-            [this.props.translate.get(Key.Discord, Deco.Cap)]: 'discord.png',
-            [this.props.translate.get(Key.Blog, Deco.Cap)]: 'medium.png',
-            Twitter: 'twitter.png',
-            Reddit: 'reddit.png',
-            [this.props.translate.get(Key.Forum, Deco.Cap)]: 'discourse.png',
-        };
-        const iconIfExists = titleToIcon[link.title];
-        return (
-            <div key={link.title} className="sm-center" style={{ fontSize: 13, paddingTop: 25 }}>
-                <Link
-                    to={link.to}
-                    shouldOpenInNewTab={link.shouldOpenInNewTab}
-                    fontColor={colors.white}
-                    className="text-decoration-none"
-                >
-                    <div>
-                        {!_.isUndefined(iconIfExists) ? (
-                            <div className="inline-block">
-                                <div className="pr1 table-cell">{this._renderIcon(iconIfExists)}</div>
-                                <div className="table-cell">{link.title}</div>
-                            </div>
-                        ) : (
-                            link.title
-                        )}
-                    </div>
-                </Link>
-            </div>
-        );
+`;
+
+const FooterSectionWrap = styled(FooterColumn)`
+    @media (max-width: 768px) {
+        width: 50%;
+
+        & + & {
+            margin-top: 0;
+            margin-bottom: 30px;
+        }
     }
-    private _renderHeader(key: Key): React.ReactNode {
-        const headerStyle = {
-            color: colors.grey400,
-            letterSpacing: 2,
-            fontFamily: 'Roboto Mono',
-            fontSize: 13,
-        };
-        return (
-            <div className="lg-pb2 md-pb2 sm-pt4" style={headerStyle}>
-                {this.props.translate.get(key, Deco.Upper)}
-            </div>
-        );
+`;
+
+const RowHeading = styled.h3`
+    color: inherit;
+    font-weight: 700;
+    font-size: 16px;
+    margin-bottom: 1.25em;
+    opacity: 0.75;
+`;
+
+const List = styled.ul`
+    li + li {
+        margin-top: 8px;
     }
-    private _updateLanguage(_event: any, _index: number, value: Language): void {
-        this.setState({
-            selectedLanguage: value,
-        });
-        this.props.dispatcher.updateSelectedLanguage(value);
+`;
+
+const Link = styled(SmartLink)`
+    color: inherit;
+    opacity: 0.5;
+    display: block;
+    font-size: 16px;
+    line-height: 20px;
+    transition: opacity 0.25s;
+    text-decoration: none;
+
+    &:hover {
+        opacity: 0.8;
     }
-}
+`;
diff --git a/packages/website/ts/@next/components/hamburger.tsx b/packages/website/ts/components/hamburger.tsx
index 435d206cd..435d206cd 100644
--- a/packages/website/ts/@next/components/hamburger.tsx
+++ b/packages/website/ts/components/hamburger.tsx
diff --git a/packages/website/ts/@next/components/header.tsx b/packages/website/ts/components/header.tsx
index e886923df..e886923df 100644
--- a/packages/website/ts/@next/components/header.tsx
+++ b/packages/website/ts/components/header.tsx
diff --git a/packages/website/ts/@next/components/hero.tsx b/packages/website/ts/components/hero.tsx
index 4c8874d3e..4c8874d3e 100644
--- a/packages/website/ts/@next/components/hero.tsx
+++ b/packages/website/ts/components/hero.tsx
diff --git a/packages/website/ts/@next/components/heroAnimation.tsx b/packages/website/ts/components/heroAnimation.tsx
index 42956fb6a..42956fb6a 100644
--- a/packages/website/ts/@next/components/heroAnimation.tsx
+++ b/packages/website/ts/components/heroAnimation.tsx
diff --git a/packages/website/ts/@next/components/heroImage.tsx b/packages/website/ts/components/heroImage.tsx
index af7c055ac..af7c055ac 100644
--- a/packages/website/ts/@next/components/heroImage.tsx
+++ b/packages/website/ts/components/heroImage.tsx
diff --git a/packages/website/ts/@next/components/icon.tsx b/packages/website/ts/components/icon.tsx
index fc9d488f9..fc9d488f9 100644
--- a/packages/website/ts/@next/components/icon.tsx
+++ b/packages/website/ts/components/icon.tsx
diff --git a/packages/website/ts/@next/components/image.tsx b/packages/website/ts/components/image.tsx
index 65b2a9705..65b2a9705 100644
--- a/packages/website/ts/@next/components/image.tsx
+++ b/packages/website/ts/components/image.tsx
diff --git a/packages/website/ts/@next/components/layout.tsx b/packages/website/ts/components/layout.tsx
index 770ee159c..770ee159c 100644
--- a/packages/website/ts/@next/components/layout.tsx
+++ b/packages/website/ts/components/layout.tsx
diff --git a/packages/website/ts/@next/components/link.tsx b/packages/website/ts/components/link.tsx
index 080a0abcc..080a0abcc 100644
--- a/packages/website/ts/@next/components/link.tsx
+++ b/packages/website/ts/components/link.tsx
diff --git a/packages/website/ts/@next/components/logo.tsx b/packages/website/ts/components/logo.tsx
index 227d48ee0..227d48ee0 100644
--- a/packages/website/ts/@next/components/logo.tsx
+++ b/packages/website/ts/components/logo.tsx
diff --git a/packages/website/ts/@next/components/mobileNav.tsx b/packages/website/ts/components/mobileNav.tsx
index 13cf46fca..13cf46fca 100644
--- a/packages/website/ts/@next/components/mobileNav.tsx
+++ b/packages/website/ts/components/mobileNav.tsx
diff --git a/packages/website/ts/@next/components/modals/input.tsx b/packages/website/ts/components/modals/input.tsx
index 8cfcc9763..8cfcc9763 100644
--- a/packages/website/ts/@next/components/modals/input.tsx
+++ b/packages/website/ts/components/modals/input.tsx
diff --git a/packages/website/ts/@next/components/modals/modal_contact.tsx b/packages/website/ts/components/modals/modal_contact.tsx
index b97baf5e7..b97baf5e7 100644
--- a/packages/website/ts/@next/components/modals/modal_contact.tsx
+++ b/packages/website/ts/components/modals/modal_contact.tsx
diff --git a/packages/website/ts/@next/components/newLayout.tsx b/packages/website/ts/components/newLayout.tsx
index 28e7653c5..28e7653c5 100644
--- a/packages/website/ts/@next/components/newLayout.tsx
+++ b/packages/website/ts/components/newLayout.tsx
diff --git a/packages/website/ts/@next/components/newsletter_form.tsx b/packages/website/ts/components/newsletter_form.tsx
index 8572ccc5f..8572ccc5f 100644
--- a/packages/website/ts/@next/components/newsletter_form.tsx
+++ b/packages/website/ts/components/newsletter_form.tsx
diff --git a/packages/website/ts/@next/components/sections/landing/about.tsx b/packages/website/ts/components/sections/landing/about.tsx
index 7b51b0d13..7b51b0d13 100644
--- a/packages/website/ts/@next/components/sections/landing/about.tsx
+++ b/packages/website/ts/components/sections/landing/about.tsx
diff --git a/packages/website/ts/@next/components/sections/landing/clients.tsx b/packages/website/ts/components/sections/landing/clients.tsx
index 4170fde46..4170fde46 100644
--- a/packages/website/ts/@next/components/sections/landing/clients.tsx
+++ b/packages/website/ts/components/sections/landing/clients.tsx
diff --git a/packages/website/ts/@next/components/sections/landing/cta.tsx b/packages/website/ts/components/sections/landing/cta.tsx
index ec7f5d961..ec7f5d961 100644
--- a/packages/website/ts/@next/components/sections/landing/cta.tsx
+++ b/packages/website/ts/components/sections/landing/cta.tsx
diff --git a/packages/website/ts/@next/components/sections/landing/hero.tsx b/packages/website/ts/components/sections/landing/hero.tsx
index cf67ad66d..cf67ad66d 100644
--- a/packages/website/ts/@next/components/sections/landing/hero.tsx
+++ b/packages/website/ts/components/sections/landing/hero.tsx
diff --git a/packages/website/ts/@next/components/separator.tsx b/packages/website/ts/components/separator.tsx
index 0b8b8d766..0b8b8d766 100644
--- a/packages/website/ts/@next/components/separator.tsx
+++ b/packages/website/ts/components/separator.tsx
diff --git a/packages/website/ts/@next/components/siteWrap.tsx b/packages/website/ts/components/siteWrap.tsx
index 75cb9a268..75cb9a268 100644
--- a/packages/website/ts/@next/components/siteWrap.tsx
+++ b/packages/website/ts/components/siteWrap.tsx
diff --git a/packages/website/ts/@next/components/slider/slider.tsx b/packages/website/ts/components/slider/slider.tsx
index 33a352b9f..33a352b9f 100644
--- a/packages/website/ts/@next/components/slider/slider.tsx
+++ b/packages/website/ts/components/slider/slider.tsx
diff --git a/packages/website/ts/@next/components/text.tsx b/packages/website/ts/components/text.tsx
index 9f6ed9e7a..9f6ed9e7a 100644
--- a/packages/website/ts/@next/components/text.tsx
+++ b/packages/website/ts/components/text.tsx
diff --git a/packages/website/ts/@next/constants/.gitkeep b/packages/website/ts/constants/.gitkeep
index e69de29bb..e69de29bb 100644
--- a/packages/website/ts/@next/constants/.gitkeep
+++ b/packages/website/ts/constants/.gitkeep
diff --git a/packages/website/ts/@next/constants/animations.tsx b/packages/website/ts/constants/animations.tsx
index 6a58c4b40..6a58c4b40 100644
--- a/packages/website/ts/@next/constants/animations.tsx
+++ b/packages/website/ts/constants/animations.tsx
diff --git a/packages/website/ts/@next/constants/cssReset.js b/packages/website/ts/constants/cssReset.js
index 4c5105b50..4c5105b50 100644
--- a/packages/website/ts/@next/constants/cssReset.js
+++ b/packages/website/ts/constants/cssReset.js
diff --git a/packages/website/ts/@next/constants/globalStyle.tsx b/packages/website/ts/constants/globalStyle.tsx
index b095fafb5..b095fafb5 100644
--- a/packages/website/ts/@next/constants/globalStyle.tsx
+++ b/packages/website/ts/constants/globalStyle.tsx
diff --git a/packages/website/ts/@next/constants/utilities.tsx b/packages/website/ts/constants/utilities.tsx
index ee5c5b4ce..ee5c5b4ce 100644
--- a/packages/website/ts/@next/constants/utilities.tsx
+++ b/packages/website/ts/constants/utilities.tsx
diff --git a/packages/website/ts/@next/icons/form-arrow.svg b/packages/website/ts/icons/form-arrow.svg
index 2070a6d48..2070a6d48 100644
--- a/packages/website/ts/@next/icons/form-arrow.svg
+++ b/packages/website/ts/icons/form-arrow.svg
diff --git a/packages/website/ts/@next/icons/illustrations/0x.svg b/packages/website/ts/icons/illustrations/0x.svg
index b0810f751..b0810f751 100755
--- a/packages/website/ts/@next/icons/illustrations/0x.svg
+++ b/packages/website/ts/icons/illustrations/0x.svg
diff --git a/packages/website/ts/@next/icons/illustrations/buildBusiness.svg b/packages/website/ts/icons/illustrations/buildBusiness.svg
index 48e5b3b1c..48e5b3b1c 100755
--- a/packages/website/ts/@next/icons/illustrations/buildBusiness.svg
+++ b/packages/website/ts/icons/illustrations/buildBusiness.svg
diff --git a/packages/website/ts/@next/icons/illustrations/checkmark.svg b/packages/website/ts/icons/illustrations/checkmark.svg
index e17a7ab8b..e17a7ab8b 100644
--- a/packages/website/ts/@next/icons/illustrations/checkmark.svg
+++ b/packages/website/ts/icons/illustrations/checkmark.svg
diff --git a/packages/website/ts/@next/icons/illustrations/code-repo.svg b/packages/website/ts/icons/illustrations/code-repo.svg
index 43e412198..43e412198 100644
--- a/packages/website/ts/@next/icons/illustrations/code-repo.svg
+++ b/packages/website/ts/icons/illustrations/code-repo.svg
diff --git a/packages/website/ts/@next/icons/illustrations/coin.svg b/packages/website/ts/icons/illustrations/coin.svg
index a1fb123a4..a1fb123a4 100644
--- a/packages/website/ts/@next/icons/illustrations/coin.svg
+++ b/packages/website/ts/icons/illustrations/coin.svg
diff --git a/packages/website/ts/@next/icons/illustrations/consistently-ship.svg b/packages/website/ts/icons/illustrations/consistently-ship.svg
index 733655a3f..733655a3f 100644
--- a/packages/website/ts/@next/icons/illustrations/consistently-ship.svg
+++ b/packages/website/ts/icons/illustrations/consistently-ship.svg
diff --git a/packages/website/ts/@next/icons/illustrations/customize.svg b/packages/website/ts/icons/illustrations/customize.svg
index 1f018ee7a..1f018ee7a 100644
--- a/packages/website/ts/@next/icons/illustrations/customize.svg
+++ b/packages/website/ts/icons/illustrations/customize.svg
diff --git a/packages/website/ts/@next/icons/illustrations/decentralisedLoans.svg b/packages/website/ts/icons/illustrations/decentralisedLoans.svg
index 72d0de7fc..72d0de7fc 100755
--- a/packages/website/ts/@next/icons/illustrations/decentralisedLoans.svg
+++ b/packages/website/ts/icons/illustrations/decentralisedLoans.svg
diff --git a/packages/website/ts/@next/icons/illustrations/description.svg b/packages/website/ts/icons/illustrations/description.svg
index 1887b182e..1887b182e 100755
--- a/packages/website/ts/@next/icons/illustrations/description.svg
+++ b/packages/website/ts/icons/illustrations/description.svg
diff --git a/packages/website/ts/@next/icons/illustrations/descriptionBolt.svg b/packages/website/ts/icons/illustrations/descriptionBolt.svg
index 45e51240f..45e51240f 100755
--- a/packages/website/ts/@next/icons/illustrations/descriptionBolt.svg
+++ b/packages/website/ts/icons/illustrations/descriptionBolt.svg
diff --git a/packages/website/ts/@next/icons/illustrations/descriptionCoin.svg b/packages/website/ts/icons/illustrations/descriptionCoin.svg
index d1015b98d..d1015b98d 100755
--- a/packages/website/ts/@next/icons/illustrations/descriptionCoin.svg
+++ b/packages/website/ts/icons/illustrations/descriptionCoin.svg
diff --git a/packages/website/ts/@next/icons/illustrations/descriptionCopy.svg b/packages/website/ts/icons/illustrations/descriptionCopy.svg
index 6c9b5f0fc..6c9b5f0fc 100755
--- a/packages/website/ts/@next/icons/illustrations/descriptionCopy.svg
+++ b/packages/website/ts/icons/illustrations/descriptionCopy.svg
diff --git a/packages/website/ts/@next/icons/illustrations/descriptionFlask.svg b/packages/website/ts/icons/illustrations/descriptionFlask.svg
index 703b069d5..703b069d5 100755
--- a/packages/website/ts/@next/icons/illustrations/descriptionFlask.svg
+++ b/packages/website/ts/icons/illustrations/descriptionFlask.svg
diff --git a/packages/website/ts/@next/icons/illustrations/eficientDesign.svg b/packages/website/ts/icons/illustrations/eficientDesign.svg
index 6b8f852c3..6b8f852c3 100755
--- a/packages/website/ts/@next/icons/illustrations/eficientDesign.svg
+++ b/packages/website/ts/icons/illustrations/eficientDesign.svg
diff --git a/packages/website/ts/@next/icons/illustrations/eth-based-tokens.svg b/packages/website/ts/icons/illustrations/eth-based-tokens.svg
index b0370d234..b0370d234 100644
--- a/packages/website/ts/@next/icons/illustrations/eth-based-tokens.svg
+++ b/packages/website/ts/icons/illustrations/eth-based-tokens.svg
diff --git a/packages/website/ts/@next/icons/illustrations/extensibleArchitecture.svg b/packages/website/ts/icons/illustrations/extensibleArchitecture.svg
index 7674b3289..7674b3289 100755
--- a/packages/website/ts/@next/icons/illustrations/extensibleArchitecture.svg
+++ b/packages/website/ts/icons/illustrations/extensibleArchitecture.svg
diff --git a/packages/website/ts/@next/icons/illustrations/flexibleIntegration.svg b/packages/website/ts/icons/illustrations/flexibleIntegration.svg
index dee44d4c0..dee44d4c0 100755
--- a/packages/website/ts/@next/icons/illustrations/flexibleIntegration.svg
+++ b/packages/website/ts/icons/illustrations/flexibleIntegration.svg
diff --git a/packages/website/ts/@next/icons/illustrations/flexibleIntegration0xInstant.svg b/packages/website/ts/icons/illustrations/flexibleIntegration0xInstant.svg
index bb5116b8b..bb5116b8b 100755
--- a/packages/website/ts/@next/icons/illustrations/flexibleIntegration0xInstant.svg
+++ b/packages/website/ts/icons/illustrations/flexibleIntegration0xInstant.svg
diff --git a/packages/website/ts/@next/icons/illustrations/flexibleOrders.svg b/packages/website/ts/icons/illustrations/flexibleOrders.svg
index f4545ae38..f4545ae38 100755
--- a/packages/website/ts/@next/icons/illustrations/flexibleOrders.svg
+++ b/packages/website/ts/icons/illustrations/flexibleOrders.svg
diff --git a/packages/website/ts/@next/icons/illustrations/gamingAndCollectibles.svg b/packages/website/ts/icons/illustrations/gamingAndCollectibles.svg
index c66af5088..c66af5088 100755
--- a/packages/website/ts/@next/icons/illustrations/gamingAndCollectibles.svg
+++ b/packages/website/ts/icons/illustrations/gamingAndCollectibles.svg
diff --git a/packages/website/ts/@next/icons/illustrations/generateRevenueForYourBusiness-large.svg b/packages/website/ts/icons/illustrations/generateRevenueForYourBusiness-large.svg
index 681b8c41e..681b8c41e 100755
--- a/packages/website/ts/@next/icons/illustrations/generateRevenueForYourBusiness-large.svg
+++ b/packages/website/ts/icons/illustrations/generateRevenueForYourBusiness-large.svg
diff --git a/packages/website/ts/@next/icons/illustrations/getInTouch.svg b/packages/website/ts/icons/illustrations/getInTouch.svg
index f44365351..f44365351 100755
--- a/packages/website/ts/@next/icons/illustrations/getInTouch.svg
+++ b/packages/website/ts/icons/illustrations/getInTouch.svg
diff --git a/packages/website/ts/@next/icons/illustrations/getStarted.svg b/packages/website/ts/icons/illustrations/getStarted.svg
index 627e1810b..627e1810b 100644
--- a/packages/website/ts/@next/icons/illustrations/getStarted.svg
+++ b/packages/website/ts/icons/illustrations/getStarted.svg
diff --git a/packages/website/ts/@next/icons/illustrations/launchKit.svg b/packages/website/ts/icons/illustrations/launchKit.svg
index fa11584af..fa11584af 100644
--- a/packages/website/ts/@next/icons/illustrations/launchKit.svg
+++ b/packages/website/ts/icons/illustrations/launchKit.svg
diff --git a/packages/website/ts/@next/icons/illustrations/launchKit_versionB.svg b/packages/website/ts/icons/illustrations/launchKit_versionB.svg
index 45f9ecc75..45f9ecc75 100755
--- a/packages/website/ts/@next/icons/illustrations/launchKit_versionB.svg
+++ b/packages/website/ts/icons/illustrations/launchKit_versionB.svg
diff --git a/packages/website/ts/@next/icons/illustrations/legalResources.svg b/packages/website/ts/icons/illustrations/legalResources.svg
index a8ba7fceb..a8ba7fceb 100755
--- a/packages/website/ts/@next/icons/illustrations/legalResources.svg
+++ b/packages/website/ts/icons/illustrations/legalResources.svg
diff --git a/packages/website/ts/@next/icons/illustrations/logo-mark.svg b/packages/website/ts/icons/illustrations/logo-mark.svg
index 4e9c9d2cb..4e9c9d2cb 100644
--- a/packages/website/ts/@next/icons/illustrations/logo-mark.svg
+++ b/packages/website/ts/icons/illustrations/logo-mark.svg
diff --git a/packages/website/ts/@next/icons/illustrations/logo-outlined.svg b/packages/website/ts/icons/illustrations/logo-outlined.svg
index a09d2355f..a09d2355f 100644
--- a/packages/website/ts/@next/icons/illustrations/logo-outlined.svg
+++ b/packages/website/ts/icons/illustrations/logo-outlined.svg
diff --git a/packages/website/ts/@next/icons/illustrations/long-term-impact.svg b/packages/website/ts/icons/illustrations/long-term-impact.svg
index dbd051598..dbd051598 100644
--- a/packages/website/ts/@next/icons/illustrations/long-term-impact.svg
+++ b/packages/website/ts/icons/illustrations/long-term-impact.svg
diff --git a/packages/website/ts/@next/icons/illustrations/low-cost.svg b/packages/website/ts/icons/illustrations/low-cost.svg
index 530cbdd79..530cbdd79 100644
--- a/packages/website/ts/@next/icons/illustrations/low-cost.svg
+++ b/packages/website/ts/icons/illustrations/low-cost.svg
diff --git a/packages/website/ts/@next/icons/illustrations/marketingDesignHelp.svg b/packages/website/ts/icons/illustrations/marketingDesignHelp.svg
index 1e65bd54f..1e65bd54f 100755
--- a/packages/website/ts/@next/icons/illustrations/marketingDesignHelp.svg
+++ b/packages/website/ts/icons/illustrations/marketingDesignHelp.svg
diff --git a/packages/website/ts/@next/icons/illustrations/milestoneGrants.svg b/packages/website/ts/icons/illustrations/milestoneGrants.svg
index 2c581864f..2c581864f 100755
--- a/packages/website/ts/@next/icons/illustrations/milestoneGrants.svg
+++ b/packages/website/ts/icons/illustrations/milestoneGrants.svg
diff --git a/packages/website/ts/@next/icons/illustrations/networkedLiquidity-small.svg b/packages/website/ts/icons/illustrations/networkedLiquidity-small.svg
index 4b65a5353..4b65a5353 100755
--- a/packages/website/ts/@next/icons/illustrations/networkedLiquidity-small.svg
+++ b/packages/website/ts/icons/illustrations/networkedLiquidity-small.svg
diff --git a/packages/website/ts/@next/icons/illustrations/networkedLiquidity.svg b/packages/website/ts/icons/illustrations/networkedLiquidity.svg
index c50ba7e7c..c50ba7e7c 100755
--- a/packages/website/ts/@next/icons/illustrations/networkedLiquidity.svg
+++ b/packages/website/ts/icons/illustrations/networkedLiquidity.svg
diff --git a/packages/website/ts/@next/icons/illustrations/orderBooks.svg b/packages/website/ts/icons/illustrations/orderBooks.svg
index 44e001ff0..44e001ff0 100755
--- a/packages/website/ts/@next/icons/illustrations/orderBooks.svg
+++ b/packages/website/ts/icons/illustrations/orderBooks.svg
diff --git a/packages/website/ts/@next/icons/illustrations/predictionMarkets.svg b/packages/website/ts/icons/illustrations/predictionMarkets.svg
index 820b79416..820b79416 100755
--- a/packages/website/ts/@next/icons/illustrations/predictionMarkets.svg
+++ b/packages/website/ts/icons/illustrations/predictionMarkets.svg
diff --git a/packages/website/ts/@next/icons/illustrations/protocol.svg b/packages/website/ts/icons/illustrations/protocol.svg
index 5c9c1531a..5c9c1531a 100644
--- a/packages/website/ts/@next/icons/illustrations/protocol.svg
+++ b/packages/website/ts/icons/illustrations/protocol.svg
diff --git a/packages/website/ts/@next/icons/illustrations/ready-to-build.svg b/packages/website/ts/icons/illustrations/ready-to-build.svg
index a26a4e236..a26a4e236 100644
--- a/packages/website/ts/@next/icons/illustrations/ready-to-build.svg
+++ b/packages/website/ts/icons/illustrations/ready-to-build.svg
diff --git a/packages/website/ts/@next/icons/illustrations/recruitingSupport.svg b/packages/website/ts/icons/illustrations/recruitingSupport.svg
index d630b23d7..d630b23d7 100755
--- a/packages/website/ts/@next/icons/illustrations/recruitingSupport.svg
+++ b/packages/website/ts/icons/illustrations/recruitingSupport.svg
diff --git a/packages/website/ts/@next/icons/illustrations/right-thing.svg b/packages/website/ts/icons/illustrations/right-thing.svg
index eba2bbc36..eba2bbc36 100644
--- a/packages/website/ts/@next/icons/illustrations/right-thing.svg
+++ b/packages/website/ts/icons/illustrations/right-thing.svg
diff --git a/packages/website/ts/@next/icons/illustrations/robustSmartContracts.svg b/packages/website/ts/icons/illustrations/robustSmartContracts.svg
index 060f2d00c..060f2d00c 100755
--- a/packages/website/ts/@next/icons/illustrations/robustSmartContracts.svg
+++ b/packages/website/ts/icons/illustrations/robustSmartContracts.svg
diff --git a/packages/website/ts/@next/icons/illustrations/rocketship.svg b/packages/website/ts/icons/illustrations/rocketship.svg
index e9b4b83ab..e9b4b83ab 100644
--- a/packages/website/ts/@next/icons/illustrations/rocketship.svg
+++ b/packages/website/ts/icons/illustrations/rocketship.svg
diff --git a/packages/website/ts/@next/icons/illustrations/secureTrading.svg b/packages/website/ts/icons/illustrations/secureTrading.svg
index 21912961d..21912961d 100755
--- a/packages/website/ts/@next/icons/illustrations/secureTrading.svg
+++ b/packages/website/ts/icons/illustrations/secureTrading.svg
diff --git a/packages/website/ts/@next/icons/illustrations/social-discord.svg b/packages/website/ts/icons/illustrations/social-discord.svg
index 144f6e061..144f6e061 100644
--- a/packages/website/ts/@next/icons/illustrations/social-discord.svg
+++ b/packages/website/ts/icons/illustrations/social-discord.svg
diff --git a/packages/website/ts/@next/icons/illustrations/social-fb.svg b/packages/website/ts/icons/illustrations/social-fb.svg
index e50cf107a..e50cf107a 100644
--- a/packages/website/ts/@next/icons/illustrations/social-fb.svg
+++ b/packages/website/ts/icons/illustrations/social-fb.svg
diff --git a/packages/website/ts/@next/icons/illustrations/social-github.svg b/packages/website/ts/icons/illustrations/social-github.svg
index ef0025582..ef0025582 100644
--- a/packages/website/ts/@next/icons/illustrations/social-github.svg
+++ b/packages/website/ts/icons/illustrations/social-github.svg
diff --git a/packages/website/ts/@next/icons/illustrations/social-newsletter.svg b/packages/website/ts/icons/illustrations/social-newsletter.svg
index 572cb8ed9..572cb8ed9 100644
--- a/packages/website/ts/@next/icons/illustrations/social-newsletter.svg
+++ b/packages/website/ts/icons/illustrations/social-newsletter.svg
diff --git a/packages/website/ts/@next/icons/illustrations/social-reddit.svg b/packages/website/ts/icons/illustrations/social-reddit.svg
index b93510b36..b93510b36 100644
--- a/packages/website/ts/@next/icons/illustrations/social-reddit.svg
+++ b/packages/website/ts/icons/illustrations/social-reddit.svg
diff --git a/packages/website/ts/@next/icons/illustrations/social-twitter.svg b/packages/website/ts/icons/illustrations/social-twitter.svg
index bc8e2f7d7..bc8e2f7d7 100644
--- a/packages/website/ts/@next/icons/illustrations/social-twitter.svg
+++ b/packages/website/ts/icons/illustrations/social-twitter.svg
diff --git a/packages/website/ts/@next/icons/illustrations/stableTokens.svg b/packages/website/ts/icons/illustrations/stableTokens.svg
index 9e854b0e6..9e854b0e6 100755
--- a/packages/website/ts/@next/icons/illustrations/stableTokens.svg
+++ b/packages/website/ts/icons/illustrations/stableTokens.svg
diff --git a/packages/website/ts/@next/icons/illustrations/standardForExchange.svg b/packages/website/ts/icons/illustrations/standardForExchange.svg
index f8075ed6d..f8075ed6d 100755
--- a/packages/website/ts/@next/icons/illustrations/standardForExchange.svg
+++ b/packages/website/ts/icons/illustrations/standardForExchange.svg
diff --git a/packages/website/ts/@next/icons/illustrations/support.svg b/packages/website/ts/icons/illustrations/support.svg
index 368e7cc02..368e7cc02 100644
--- a/packages/website/ts/@next/icons/illustrations/support.svg
+++ b/packages/website/ts/icons/illustrations/support.svg
diff --git a/packages/website/ts/@next/icons/illustrations/supportForAllEthereumStandards-large.svg b/packages/website/ts/icons/illustrations/supportForAllEthereumStandards-large.svg
index 1f840204a..1f840204a 100755
--- a/packages/website/ts/@next/icons/illustrations/supportForAllEthereumStandards-large.svg
+++ b/packages/website/ts/icons/illustrations/supportForAllEthereumStandards-large.svg
diff --git a/packages/website/ts/@next/icons/illustrations/supportForAllEthereumStandards.svg b/packages/website/ts/icons/illustrations/supportForAllEthereumStandards.svg
index 32a4d8602..32a4d8602 100755
--- a/packages/website/ts/@next/icons/illustrations/supportForAllEthereumStandards.svg
+++ b/packages/website/ts/icons/illustrations/supportForAllEthereumStandards.svg
diff --git a/packages/website/ts/@next/icons/illustrations/techSupport.svg b/packages/website/ts/icons/illustrations/techSupport.svg
index e52084f67..e52084f67 100755
--- a/packages/website/ts/@next/icons/illustrations/techSupport.svg
+++ b/packages/website/ts/icons/illustrations/techSupport.svg
diff --git a/packages/website/ts/@next/icons/illustrations/tokens.svg b/packages/website/ts/icons/illustrations/tokens.svg
index 966615265..966615265 100644
--- a/packages/website/ts/@next/icons/illustrations/tokens.svg
+++ b/packages/website/ts/icons/illustrations/tokens.svg
diff --git a/packages/website/ts/@next/icons/illustrations/vcIntroductions.svg b/packages/website/ts/icons/illustrations/vcIntroductions.svg
index 024cadab3..024cadab3 100755
--- a/packages/website/ts/@next/icons/illustrations/vcIntroductions.svg
+++ b/packages/website/ts/icons/illustrations/vcIntroductions.svg
diff --git a/packages/website/ts/@next/icons/logo-with-type.svg b/packages/website/ts/icons/logo-with-type.svg
index 25abf149e..25abf149e 100644
--- a/packages/website/ts/@next/icons/logo-with-type.svg
+++ b/packages/website/ts/icons/logo-with-type.svg
diff --git a/packages/website/ts/@next/pages/about/jobs.tsx b/packages/website/ts/pages/about/jobs.tsx
index 2fd2c7619..2fd2c7619 100644
--- a/packages/website/ts/@next/pages/about/jobs.tsx
+++ b/packages/website/ts/pages/about/jobs.tsx
diff --git a/packages/website/ts/@next/pages/about/mission.tsx b/packages/website/ts/pages/about/mission.tsx
index 2e6530edd..2e6530edd 100644
--- a/packages/website/ts/@next/pages/about/mission.tsx
+++ b/packages/website/ts/pages/about/mission.tsx
diff --git a/packages/website/ts/@next/pages/about/press.tsx b/packages/website/ts/pages/about/press.tsx
index 030ee4c14..030ee4c14 100644
--- a/packages/website/ts/@next/pages/about/press.tsx
+++ b/packages/website/ts/pages/about/press.tsx
diff --git a/packages/website/ts/@next/pages/about/team.tsx b/packages/website/ts/pages/about/team.tsx
index 7177964be..7177964be 100644
--- a/packages/website/ts/@next/pages/about/team.tsx
+++ b/packages/website/ts/pages/about/team.tsx
diff --git a/packages/website/ts/@next/pages/community.tsx b/packages/website/ts/pages/community.tsx
index a259e3438..a259e3438 100644
--- a/packages/website/ts/@next/pages/community.tsx
+++ b/packages/website/ts/pages/community.tsx
diff --git a/packages/website/ts/@next/pages/ecosystem.tsx b/packages/website/ts/pages/ecosystem.tsx
index f78bd3bdc..f78bd3bdc 100644
--- a/packages/website/ts/@next/pages/ecosystem.tsx
+++ b/packages/website/ts/pages/ecosystem.tsx
diff --git a/packages/website/ts/@next/pages/instant.tsx b/packages/website/ts/pages/instant.tsx
index d08fd566a..d08fd566a 100644
--- a/packages/website/ts/@next/pages/instant.tsx
+++ b/packages/website/ts/pages/instant.tsx
diff --git a/packages/website/ts/pages/instant/code_demo.tsx b/packages/website/ts/pages/instant/code_demo.tsx
index a3b5fe847..4a3022df5 100644
--- a/packages/website/ts/pages/instant/code_demo.tsx
+++ b/packages/website/ts/pages/instant/code_demo.tsx
@@ -2,9 +2,8 @@ import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import SyntaxHighlighter from 'react-syntax-highlighter';
 
-import { Button } from 'ts/components/ui/button';
+import { Button } from 'ts/@next/components/button';
 import { Container } from 'ts/components/ui/container';
-import { colors } from 'ts/style/colors';
 import { styled } from 'ts/style/theme';
 import { zIndex } from 'ts/style/z_index';
 
@@ -12,7 +11,7 @@ const CustomPre = styled.pre`
     margin: 0px;
     line-height: 24px;
     overflow: scroll;
-    width: 600px;
+    width: 100%;
     height: 100%;
     max-height: 800px;
     border-radius: 4px;
@@ -23,19 +22,21 @@ const CustomPre = styled.pre`
         border: none;
     }
     code:first-of-type {
-        background-color: #2a2a2a !important;
+        background-color: #060d0d !important;
         color: #999;
-        min-height: 98%;
+        min-height: 100%;
         text-align: center;
-        padding-right: 5px !important;
-        padding-left: 5px;
         margin-right: 15px;
         line-height: 25px;
-        padding-top: 10px;
+        padding: 10px 7px !important;
     }
     code:last-of-type {
         position: relative;
         top: 10px;
+        top: 0;
+        padding-top: 11px;
+        display: inline-block;
+        line-height: 25px;
     }
 `;
 
@@ -130,7 +131,7 @@ const customStyle = {
     hljs: {
         display: 'block',
         overflowX: 'hidden',
-        background: colors.instantSecondaryBackground,
+        background: '#1B2625',
         color: 'white',
         fontSize: '12px',
     },
@@ -160,9 +161,7 @@ export class CodeDemo extends React.Component<CodeDemoProps, CodeDemoState> {
             <Container position="relative" height="100%">
                 <Container position="absolute" top="10px" right="10px" zIndex={zIndex.overlay - 1}>
                     <CopyToClipboard text={this.props.children} onCopy={this._handleCopyClick}>
-                        <Button fontSize="14px">
-                            <b>{copyButtonText}</b>
-                        </Button>
+                        <StyledButton>{copyButtonText}</StyledButton>
                     </CopyToClipboard>
                 </Container>
                 <SyntaxHighlighter language="html" style={customStyle} showLineNumbers={true} PreTag={CustomPre}>
@@ -175,3 +174,10 @@ export class CodeDemo extends React.Component<CodeDemoProps, CodeDemoState> {
         this.setState({ didCopyCode: true });
     };
 }
+
+const StyledButton = styled(Button)`
+    border-radius: 4px;
+    font-size: 15px;
+    font-weight: 400;
+    padding: 9px 21px 7px;
+`;
diff --git a/packages/website/ts/@next/pages/instant/config_generator.tsx b/packages/website/ts/pages/instant/config_generator.tsx
index 3f00e33e2..3f00e33e2 100644
--- a/packages/website/ts/@next/pages/instant/config_generator.tsx
+++ b/packages/website/ts/pages/instant/config_generator.tsx
diff --git a/packages/website/ts/pages/instant/config_generator_address_input.tsx b/packages/website/ts/pages/instant/config_generator_address_input.tsx
index ccbaf4482..9b0e9b1d1 100644
--- a/packages/website/ts/pages/instant/config_generator_address_input.tsx
+++ b/packages/website/ts/pages/instant/config_generator_address_input.tsx
@@ -1,11 +1,13 @@
-import { colors } from '@0x/react-shared';
 import { addressUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
+import styled from 'styled-components';
+
+import { colors } from 'ts/style/colors';
 
 import { Container } from 'ts/components/ui/container';
-import { Input } from 'ts/components/ui/input';
-import { Text } from 'ts/components/ui/text';
+
+import { Paragraph } from 'ts/@next/components/text';
 
 export interface ConfigGeneratorAddressInputProps {
     value?: string;
@@ -16,6 +18,19 @@ export interface ConfigGeneratorAddressInputState {
     errMsg: string;
 }
 
+export interface InputProps {
+    className?: string;
+    value?: string;
+    width?: string;
+    fontSize?: string;
+    fontColor?: string;
+    padding?: string;
+    placeholderColor?: string;
+    placeholder?: string;
+    backgroundColor?: string;
+    onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
+}
+
 export class ConfigGeneratorAddressInput extends React.Component<
     ConfigGeneratorAddressInputProps,
     ConfigGeneratorAddressInputState
@@ -26,22 +41,13 @@ export class ConfigGeneratorAddressInput extends React.Component<
     public render(): React.ReactNode {
         const { errMsg } = this.state;
         const hasError = !_.isEmpty(errMsg);
-        const border = hasError ? '1px solid red' : undefined;
         return (
             <Container height="80px">
-                <Input
-                    width="100%"
-                    fontSize="16px"
-                    padding="0.7em 1em"
-                    value={this.props.value}
-                    onChange={this._handleChange}
-                    placeholder="0xe99...aa8da4"
-                    border={border}
-                />
+                <Input value={this.props.value} onChange={this._handleChange} placeholder="0xe99...aa8da4" />
                 <Container marginTop="5px" isHidden={!hasError} height="25px">
-                    <Text fontSize="14px" fontColor={colors.grey} fontStyle="italic">
+                    <Paragraph size="small" isNoMargin={true}>
                         {errMsg}
-                    </Text>
+                    </Paragraph>
                 </Container>
             </Container>
         );
@@ -57,3 +63,22 @@ export class ConfigGeneratorAddressInput extends React.Component<
         this.props.onChange(address, isValidAddress);
     };
 }
+
+const PlainInput: React.StatelessComponent<InputProps> = ({ value, className, placeholder, onChange }) => (
+    <input className={className} value={value} onChange={onChange} placeholder={placeholder} />
+);
+
+export const Input = styled(PlainInput)`
+    background-color: ${colors.white};
+    color: ${colors.textDarkSecondary};
+    font-size: 1rem;
+    width: 100%;
+    padding: 16px 20px 18px;
+    border-radius: 4px;
+    border: 1px solid transparent;
+    outline: none;
+    &::placeholder {
+        color: #333333;
+        opacity: 0.5;
+    }
+`;
diff --git a/packages/website/ts/@next/pages/instant/configurator.tsx b/packages/website/ts/pages/instant/configurator.tsx
index 7c67e6333..7c67e6333 100644
--- a/packages/website/ts/@next/pages/instant/configurator.tsx
+++ b/packages/website/ts/pages/instant/configurator.tsx
diff --git a/packages/website/ts/@next/pages/instant/fee_percentage_slider.tsx b/packages/website/ts/pages/instant/fee_percentage_slider.tsx
index 5775d6dfb..5775d6dfb 100644
--- a/packages/website/ts/@next/pages/instant/fee_percentage_slider.tsx
+++ b/packages/website/ts/pages/instant/fee_percentage_slider.tsx
diff --git a/packages/website/ts/@next/pages/instant/rc-slider.css b/packages/website/ts/pages/instant/rc-slider.css
index 63038324e..63038324e 100644
--- a/packages/website/ts/@next/pages/instant/rc-slider.css
+++ b/packages/website/ts/pages/instant/rc-slider.css
diff --git a/packages/website/ts/@next/pages/instant/select.tsx b/packages/website/ts/pages/instant/select.tsx
index d4146cfb0..d4146cfb0 100644
--- a/packages/website/ts/@next/pages/instant/select.tsx
+++ b/packages/website/ts/pages/instant/select.tsx
diff --git a/packages/website/ts/@next/pages/landing.tsx b/packages/website/ts/pages/landing.tsx
index 4d47fefd9..4d47fefd9 100644
--- a/packages/website/ts/@next/pages/landing.tsx
+++ b/packages/website/ts/pages/landing.tsx
diff --git a/packages/website/ts/@next/pages/launch_kit.tsx b/packages/website/ts/pages/launch_kit.tsx
index 605bce91c..605bce91c 100644
--- a/packages/website/ts/@next/pages/launch_kit.tsx
+++ b/packages/website/ts/pages/launch_kit.tsx
diff --git a/packages/website/ts/@next/pages/market_maker.tsx b/packages/website/ts/pages/market_maker.tsx
index e2d3c75c4..e2d3c75c4 100644
--- a/packages/website/ts/@next/pages/market_maker.tsx
+++ b/packages/website/ts/pages/market_maker.tsx
diff --git a/packages/website/ts/@next/pages/why.tsx b/packages/website/ts/pages/why.tsx
index cdf7960c2..cdf7960c2 100644
--- a/packages/website/ts/@next/pages/why.tsx
+++ b/packages/website/ts/pages/why.tsx