diff --git a/public/actions/LanguageActions.js b/public/actions/LanguageActions.js
index de55b3c..88ad731 100644
--- a/public/actions/LanguageActions.js
+++ b/public/actions/LanguageActions.js
@@ -21,12 +21,9 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import Language from './../language/Language';
-
 export const SET_LANGUAGE = "SET_LANGUAGE";
-export const LANGUAGES = Language.getLanguages();
 
-export function setLanguage(language) {
+export const setLanguage = language => {
   return {
     type: SET_LANGUAGE,
     code: language
diff --git a/public/components/footer/Footer.jsx b/public/components/footer/Footer.jsx
index 4b41edc..393d653 100644
--- a/public/components/footer/Footer.jsx
+++ b/public/components/footer/Footer.jsx
@@ -27,28 +27,24 @@ import { NavLink } from 'react-router-dom';
 
 import FooterStyles from './Footer.scss';
 
-import Language from '@public/language/Language';
+import { withLanguage } from '@public/language/Language';
 
 import { PageBoundary } from '@components/page/Page';
 
-const FooterLink = (props) => {
-  let { title, className } = props;
-  return (
-    <NavLink {...props} className={"c-footer__link"+(className?` ${className}`:``)}>
-      { Language.get(`footer.links.${title}`) }
-    </NavLink>
-  );
-}
-
 const SITE_LAUNCH_TIMESTAMP = 1335830400000;
 
+const FooterLink = props => {
+  let { title, className } = props;
+  return <NavLink {...props} className={`c-footer__link ${className||``}`} />;
+};
+
 class Footer extends React.Component {
   constructor(props) {
     super(props);
   }
 
   render() {
-    let { className } = this.props;
+    let { className, lang } = this.props;
 
     return (
       <footer className={"c-footer"+(className?` ${className}`:``)}>
@@ -59,9 +55,9 @@ class Footer extends React.Component {
           <div className="c-footer__inner">
 
             <nav className="c-footer__links">
-              <FooterLink title="home" to="/" />
-              <FooterLink title="contact" to="/contact" />
-              <FooterLink title="privacy" to="/legal/privacy" />
+              <FooterLink to="/" children={ lang.footer.links.home } />
+              <FooterLink to="/contact" children={ lang.footer.links.contact } />
+              <FooterLink to="/legal/privacy" children={ lang.footer.links.privacy } />
             </nav>
 
             <div className="c-footer__copyright">
@@ -76,10 +72,4 @@ class Footer extends React.Component {
   }
 }
 
-const mapStateToProps = (state) => {
-  return {
-    code: state.language.code
-  }
-}
-
-export default connect(mapStateToProps)(Footer);
+export default withLanguage(Footer);
diff --git a/public/components/nav/menu/HamburgerMenu.jsx b/public/components/nav/menu/HamburgerMenu.jsx
index 551ab20..fd3b6da 100644
--- a/public/components/nav/menu/HamburgerMenu.jsx
+++ b/public/components/nav/menu/HamburgerMenu.jsx
@@ -24,63 +24,56 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { NavLink } from 'react-router-dom';
+import { withLanguage } from '@public/language/Language';
+import * as MenuActions from '@public/actions/MenuActions';
 
 import Styles from './HamburgerMenu.scss';
 
-import Language from '@public/language/Language';
-import * as MenuActions from '@public/actions/MenuActions';
-
-const HamburerMenuItem = (props) => {
+const HamburerMenuItem = props => {
   let { lang, link, className } = props;
-  className = className || "";
 
   return (
-    <li {...props} className={`c-hamburger-menu__link c-hamburger-menu__link--${link} ${className}`}>
-      <NavLink to={ props.to } className="c-hamburger-menu__link-link">
-        { Language.get(lang) }
+    <li
+      {...props}
+      className={`c-hamburger-menu__link c-hamburger-menu__link--${link} ${className||""}`}
+    >
+      <NavLink to={ props.to } className="c-hamburger-menu__link-link">{ lang }
       </NavLink>
     </li>
   );
 }
 
-class HamburgerMenu extends React.Component {
-  constructor(props) {
-    super(props);
-  }
+const HamburgerMenu = props => {
+  let { open, className, toggleMenu, lang } = props;
 
-  render() {
-    let { open, className, toggleMenu } = this.props;
+  let clazz = "c-hamburger-menu";
+  if(open) clazz += " is-open";
+  if(className) clazz += ` ${className}`;
 
-    let clazz = "c-hamburger-menu";
-    if(open) clazz += " is-open";
-    if(className) clazz += ` ${className}`;
+  return (
+    <div className={clazz}>
+      <button type="button" className="c-hamburger-menu__button" onClick={toggleMenu}>
+        <img src={ require('@assets/images/icons/hamburger.svg') } className="c-hamburger-menu__icon" />
+      </button>
 
-    return (
-      <div className={clazz}>
-        <button type="button" className="c-hamburger-menu__button" onClick={toggleMenu}>
-          <img src={ require('@assets/images/icons/hamburger.svg') } className="c-hamburger-menu__icon" />
-        </button>
-
-        <nav className="c-hamburger-menu__menu">
-          <ul className="c-hamburger-menu__links">
-            <HamburerMenuItem to="/" lang="navbar.home" link="home" />
-            <HamburerMenuItem to="/contact" lang="navbar.contact" link="contact" />
-          </ul>
-        </nav>
-      </div>
-    );
-  }
+      <nav className="c-hamburger-menu__menu">
+        <ul className="c-hamburger-menu__links">
+          <HamburerMenuItem to="/" lang={lang.navbar.home} link="home" />
+          <HamburerMenuItem to="/contact" lang={lang.navbar.contact} link="contact" />
+        </ul>
+      </nav>
+    </div>
+  );
 }
 
 
-const mapStateToProps = (state) => {
+const mapStateToProps = state => {
   return {
-    open: state.menu.open,
-    language: state.language.code
+    open: state.menu.open
   }
 }
 
-const mapDispatchToProps = (dispatch) => {
+const mapDispatchToProps = dispatch => {
   return {
     toggleMenu: function(theme) {
       dispatch(MenuActions.toggleMenu());
@@ -88,4 +81,4 @@ const mapDispatchToProps = (dispatch) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(HamburgerMenu);
+export default connect(mapStateToProps, mapDispatchToProps)(withLanguage(HamburgerMenu));
diff --git a/public/components/nav/navbar/Navbar.jsx b/public/components/nav/navbar/Navbar.jsx
index 25ef075..202537c 100644
--- a/public/components/nav/navbar/Navbar.jsx
+++ b/public/components/nav/navbar/Navbar.jsx
@@ -22,68 +22,58 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
-import { withRouter } from 'react-router';
-import { connect } from 'react-redux';
 import { NavLink } from 'react-router-dom'
 
-import Styles from './Navbar.scss';
+import { withLanguage } from '@public/language/Language';
 
-import Language from '@public/language/Language';
+import Styles from './Navbar.scss';
 
 import { PageBoundary } from '@components/page/Page';
 import HamburgerMenu from './../menu/HamburgerMenu';
 
 import Image from '@objects/image/Image';
 
-const NavbarLink = function(props) {
+const NavbarLink = props => {
+  let { to, exact, title } = props;
+
   return (
-    <NavLink to={ props.to } className="c-navbar__link" activeClassName="is-active" exact={props.exact}>
-      { Language.get("navbar." + props.title) }
+    <NavLink to={ to } className="c-navbar__link" activeClassName="is-active" exact={ exact }>
+      { title }
     </NavLink>
   );
+};
+
+
+const Navbar = props => {
+  let { lang } = props;
+
+  return (
+    <section className="c-navbar is-stuck">
+      <PageBoundary>
+        <nav className="c-navbar__nav">
+
+          {/* Logo */}
+          <NavLink to="/" className="c-navbar__logo-container" activeClassName="is-active">
+            <Image
+              src={ require('@assets/images/logo.svg') }
+              className="c-navbar__logo"
+              alt={ lang.site.name  }
+              title={ lang.site.name }
+              width="780"
+              height="200"
+            />
+          </NavLink>
+
+          {/* Desktop / Tablet Screen Links */}
+          <NavbarLink to="/" title={lang.navbar.home} exact />
+          <NavbarLink to="/contact" title={lang.navbar.contact} exact />
+
+          {/* Hamburger Menu for smaller screens */}
+          <HamburgerMenu className="c-navbar__hamburger" />
+        </nav>
+      </PageBoundary>
+    </section>
+  );
 }
 
-
-class Navbar extends React.Component {
-  constructor(props) {
-    super(props);
-  }
-
-  render() {
-    return (
-      <section className="c-navbar is-stuck">
-        <PageBoundary>
-          <nav className="c-navbar__nav">
-
-            {/* Logo */}
-            <NavLink to="/" className="c-navbar__logo-container" activeClassName="is-active">
-              <Image
-                src={ require('./../../../assets/images/logo.svg') }
-                className="c-navbar__logo"
-                alt={ Language.get("site.name") }
-                title={ Language.get("site.name") }
-                width="780"
-                height="200"
-              />
-            </NavLink>
-
-            {/* Desktop / Tablet Screen Links */}
-            <NavbarLink to="/" title="home" exact />
-            <NavbarLink to="/contact" title="contact" exact />
-
-            {/* Hamburger Menu for smaller screens */}
-            <HamburgerMenu className="c-navbar__hamburger" />
-          </nav>
-        </PageBoundary>
-      </section>
-    );
-  }
-}
-
-const mapStateToProps = function(state) {
-  return {
-    code: state.language.code
-  }
-}
-
-export default withRouter(connect(mapStateToProps)(Navbar));
+export default withLanguage(Navbar);
diff --git a/public/language/Language.jsx b/public/language/Language.jsx
index 825e47e..2cc9748 100644
--- a/public/language/Language.jsx
+++ b/public/language/Language.jsx
@@ -21,9 +21,13 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import React from 'react';
+import { connect } from 'react-redux';
+import LanguageActions from './../actions/LanguageActions';
+
 import enAU from './en-AU.jsx';
 
-const LANGUAGES = {
+export const LANGUAGES = {
   'en-AU': enAU
 }
 
@@ -70,17 +74,30 @@ class Language {
     return Object.keys(LANGUAGES);
   }
 }
-
 const lang = new Language();
-
 export default lang;
 
-const LanguageTools = {
+export const LanguageTools = {
   random: function(someArray) {
     return someArray[Math.floor(Math.random() * someArray.length)];
   }
 }
 
-export {
-  LanguageTools
-}
+export const withLanguage = Wrapped => {
+  let LanguageWrapper = props => {
+    return <Wrapped {...props} />;
+  };
+
+  return connect(state => {
+    return {
+      language: state.language.code,
+      lang: lang.data
+    }
+  }, dispatch => {
+    return {
+      setLanguage: language => {
+        dispatch(LanguageActions.setLanguage(language));
+      }
+    };
+  })(LanguageWrapper);
+};