diff --git a/src/components/App/index.js b/src/components/App/index.js
index 14d9ecd9..12528ccf 100644
--- a/src/components/App/index.js
+++ b/src/components/App/index.js
@@ -8,7 +8,6 @@ import Header from 'components/Header';
 import LeftPanel from 'components/LeftPanel';
 import Request from 'components/Request';
 import Response from 'components/Response';
-import Footer from 'components/Footer';
 import Modal from 'components/Modal';
 import updateTheme from 'utils/updateTheme';
 import updateHighlightStyle from 'utils/updateHighlightStyle';
@@ -80,7 +79,6 @@ class App extends React.Component {
             </main>
           </RightCol>
         </MainContent>
-        <Footer />
         <Modal />
       </Wrapper>
     );
diff --git a/src/components/Fonticon/StyledComponents.js b/src/components/Fonticon/StyledComponents.js
index c9ba38ad..09f41a60 100644
--- a/src/components/Fonticon/StyledComponents.js
+++ b/src/components/Fonticon/StyledComponents.js
@@ -7,7 +7,7 @@ export const StyledFonticon = styled(Clearfix)`
     display: inline-block;
   }
   i {
-    margin-right: 2px;
+    margin-right: 4px;
   }
 `;
 
diff --git a/src/components/Footer/StyledComponents.js b/src/components/Footer/StyledComponents.js
deleted file mode 100644
index 9a3fb7b3..00000000
--- a/src/components/Footer/StyledComponents.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import styled from 'styled-components';
-
-/* eslint-disable import/prefer-default-export */
-export const StyledFooter = styled.footer`
-  text-align: center;
-  padding: 5px 0;
-
-  small {
-    margin: 0 15px;
-  }
-`;
-
diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
deleted file mode 100644
index 0b0d8706..00000000
--- a/src/components/Footer/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-
-import { StyledFooter } from './StyledComponents';
-
-export default function Footer() {
-  return (
-    <StyledFooter>
-      <small>
-        <a
-          href="https://github.com/esphen/RESTED"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          GitHub
-        </a>
-      </small>
-      ·
-      <small>
-        <a
-          href="https://gist.github.com/esphen/f50cc049c8ed1256a11763826dac97db"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Licenses
-        </a>
-      </small>
-    </StyledFooter>
-  );
-}
-
diff --git a/src/components/Header/StyledComponents.js b/src/components/Header/StyledComponents.js
index c6e9da73..6056d90f 100644
--- a/src/components/Header/StyledComponents.js
+++ b/src/components/Header/StyledComponents.js
@@ -2,21 +2,23 @@ import styled, { css } from 'styled-components';
 
 /* eslint-disable import/prefer-default-export */
 export const StyledHeader = styled.header`
-  margin-top: 20px;
-  margin-bottom: 30px;
+  margin: 20px 0px 0px 0px;
+  color: black;
 
-  img {
-    margin-top: -7px;
-    margin-right: 10px;
+  .navbar-brand {
+    display: flex;
+    alignItems: center;
+    gap: 8px;
   }
 
-  h1 {
-    color: black;
+  h3, li a {
+    color: rgb(51, 51, 51) !important;
+    margin: 0;
   }
 
   ${props => props.darkMode && css`
-    h1 {
-      color: white;
+    h3, li a {
+      color: white !important;
     }
     img {
       filter: invert(100%);
diff --git a/src/components/Header/index.js b/src/components/Header/index.js
index 77a5a4f1..6ddbb3c5 100644
--- a/src/components/Header/index.js
+++ b/src/components/Header/index.js
@@ -1,21 +1,44 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
+import { Nav, Navbar, NavItem } from 'react-bootstrap';
+
 import { isDarkTheme } from 'store/options/selectors';
+import { showOptionsModal } from 'utils/modal';
+import Fonticon from 'components/Fonticon';
+import * as modalActions from 'store/modal/actions';
 
 import { StyledHeader } from './StyledComponents';
 
-export function Header({ darkMode }) {
+export function Header({ darkMode, ...props }) {
   return (
     <StyledHeader darkMode={darkMode}>
-      <h1>
-        <img
-          className="logo"
-          role="presentation"
-          height="40"
-          src="img/rested-logo.png"
-        />
-        <span>RESTED</span>
-      </h1>
+      <Navbar fluid inverse={darkMode}>
+        <Navbar.Header>
+          <Navbar.Brand>
+            <img
+              className="logo"
+              role="presentation"
+                  height="30"
+              src="img/rested-logo.png"
+            />
+            <h3>RESTED</h3>
+          </Navbar.Brand>
+        </Navbar.Header>
+        <Nav pullRight>
+          <NavItem onClick={() => showOptionsModal(props)}>
+            <Fonticon icon="cog" />
+            Options
+          </NavItem>
+          <NavItem
+            href="https://github.com/RESTEDClient/RESTED"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            <Fonticon icon="github" />
+            GitHub
+          </NavItem>
+        </Nav>
+      </Navbar>
     </StyledHeader>
   );
 }
@@ -28,5 +51,4 @@ const mapStateToProps = state => ({
   darkMode: isDarkTheme(state),
 });
 
-export default connect(mapStateToProps)(Header);
-
+export default connect(mapStateToProps, modalActions)(Header);
diff --git a/src/components/Request/Titlebar.js b/src/components/Request/Titlebar.js
index 3d271aa5..bc353ddd 100644
--- a/src/components/Request/Titlebar.js
+++ b/src/components/Request/Titlebar.js
@@ -7,7 +7,7 @@ import UUID from 'uuid-js';
 
 import { immutableCollectionShape } from 'propTypes/collection';
 import IconButton from 'components/IconButton';
-import { showChooseCollectionModal, showOptionsModal } from 'utils/modal';
+import { showChooseCollectionModal } from 'utils/modal';
 import { getCollections } from 'store/collections/selectors';
 import { getCollectionsMinimized } from 'store/options/selectors';
 import { getEditingRequest, isEditMode } from 'store/config/selectors';
@@ -86,12 +86,6 @@ function Titlebar(props) {
         icon="plus"
         className="pull-right hidden-xs"
       />
-      <IconButton
-        onClick={() => showOptionsModal(props)}
-        tooltip="Options"
-        icon="cog"
-        className="pull-right"
-      />
       <IconButton
         onClick={() => toggleCollectionsExpanded(props)}
         tooltip={`${collectionsMinimized ? 'Show' : 'Hide'} collections`}
diff --git a/src/constants/constants.js b/src/constants/constants.js
index 2217da74..8b0068bb 100644
--- a/src/constants/constants.js
+++ b/src/constants/constants.js
@@ -132,10 +132,14 @@ export const THEMES = [
  * being darker than the others
  */
 export const DARK_THEMES = [
+  'cosmo',
   'cyborg',
   'darkly',
+  'flatly',
+  'sandstone',
   'slate',
   'superhero',
+  'yeti'
 ];
 
 /**