diff --git a/frontend/src/components/navigation/org.js b/frontend/src/components/navigation/org.js
index f562b78b..e189f058 100644
--- a/frontend/src/components/navigation/org.js
+++ b/frontend/src/components/navigation/org.js
@@ -33,7 +33,7 @@ const {
 
 const StyledNav = styled.div`
   background-color: #f2f2f2;
-  border-bottom: ${remcalc(1)} solid ${colors.greyDark};
+  border-bottom: ${remcalc(1)} solid ${colors.base.greyDark};
 
   & ul {
     height: ${remcalc(60)};
@@ -46,7 +46,7 @@ const NavigationLinkContainer = styled.div`
   position: relative;
   padding: ${remcalc(11)} ${remcalc(12)} ${remcalc(12)};
   color: #646464;
-  border: solid ${remcalc(1)} ${colors.greyDark};
+  border: ${remcalc(1)} solid ${colors.base.greyDark};
   height: ${remcalc(24)};
   background-color: #f2f2f2;
 
diff --git a/ui/src/components/list/item.js b/ui/src/components/list/item.js
index 86d3255c..9938369c 100644
--- a/ui/src/components/list/item.js
+++ b/ui/src/components/list/item.js
@@ -51,7 +51,7 @@ const Item = styled(Row)`
   height: ${height};
   min-height: ${minHeight};
   box-shadow: ${shadow};
-  border: ${remcalc(1)} solid ${colors.greyDark};
+  border: ${remcalc(1)} solid ${colors.base.greyDark};
   background-color: ${colors.base.white};
   margin-bottom: ${marginBottom};
 `;
diff --git a/ui/src/components/nav-link/index.js b/ui/src/components/nav-link/index.js
index 75e64fcb..3b65ac58 100644
--- a/ui/src/components/nav-link/index.js
+++ b/ui/src/components/nav-link/index.js
@@ -65,10 +65,7 @@ const NavLink = ({
 NavLink.propTypes = {
   activeClassName: React.PropTypes.string,
   activeStyle: React.PropTypes.object,
-  children: React.PropTypes.oneOf([
-    React.PropTypes.node,
-    React.PropTypes.func
-  ]),
+  children: React.PropTypes.any,
   className: React.PropTypes.string,
   exact: React.PropTypes.bool,
   isActive: React.PropTypes.func,
diff --git a/ui/src/components/table-data-table/table-head.js b/ui/src/components/table-data-table/table-head.js
index 85230096..18a2848a 100644
--- a/ui/src/components/table-data-table/table-head.js
+++ b/ui/src/components/table-data-table/table-head.js
@@ -30,7 +30,7 @@ const StyledTableHeadItem = styled.td`
 const StyledTableHead = styled.thead`
   background: #fafafa;
   box-shadow: 0 2px 0 0 rgba(0, 0, 0, 0.05);
-  border: solid ${remcalc(1)} ${colors.greyDark};
+  border: solid ${remcalc(1)} ${colors.base.greyDark};
 
   ${breakpoints.smallOnly`
     display: none;
diff --git a/ui/src/components/table-data-table/table-row.js b/ui/src/components/table-data-table/table-row.js
index 2f2e3209..b9d1abf2 100644
--- a/ui/src/components/table-data-table/table-row.js
+++ b/ui/src/components/table-data-table/table-row.js
@@ -18,7 +18,7 @@ const {
 } = constants;
 
 const StyledRow = styled.tr`
-  border: solid ${remcalc(1)} ${colors.greyDark};
+  border: solid ${remcalc(1)} ${colors.base.greyDark};
 
   ${breakpoints.smallOnly`
     display: block;
diff --git a/ui/src/components/table-simple-table/table-row.js b/ui/src/components/table-simple-table/table-row.js
index effd13b8..cdbaa9fa 100644
--- a/ui/src/components/table-simple-table/table-row.js
+++ b/ui/src/components/table-simple-table/table-row.js
@@ -26,7 +26,7 @@ const StyledTableRow = styled.div`
   ${clearfix}
 
   padding: ${remcalc(24)} 0;
-  border-bottom: solid 1px ${colors.greyDark};
+  border-bottom: solid 1px ${colors.base.greyDark};
 
   & > .table-item {
     text-align: center;
diff --git a/ui/src/components/table-simple-table/table.js b/ui/src/components/table-simple-table/table.js
index 14799d3c..4fe899ed 100644
--- a/ui/src/components/table-simple-table/table.js
+++ b/ui/src/components/table-simple-table/table.js
@@ -12,7 +12,7 @@ const {
 } = constants;
 
 const StyledTableWrapper = styled.section`
-  border: solid 1px ${colors.greyDark}
+  border: solid 1px ${colors.base.greyDark}
   font-family: 'LibreFranklin', sans-serif;
 	font-style: normal;
 `;
diff --git a/ui/src/components/tooltip/index.js b/ui/src/components/tooltip/index.js
index 8e583c7b..f885792b 100644
--- a/ui/src/components/tooltip/index.js
+++ b/ui/src/components/tooltip/index.js
@@ -38,7 +38,7 @@ const StyledList = styled.ul`
   margin: 0;
   padding: ${remcalc(ulPadder)};
   min-width: ${remcalc(200)};
-  
+
   ${props => props.style}
 
   ${baseBox()}
@@ -68,7 +68,7 @@ const StyledList = styled.ul`
   }
   &:before {
     border-color: rgba(216, 216, 216, 0);
-    border-bottom-color: ${colors.greyDark};
+    border-bottom-color: ${colors.base.greyDark};
     border-width: ${remcalc(12)};
     margin-left: ${remcalc(-12)};
   }