diff --git a/components/header/index.js b/components/header/index.js
index b8ff2524b..1da267d9b 100644
--- a/components/header/index.js
+++ b/components/header/index.js
@@ -43,7 +43,8 @@ export default class Header extends React.Component {
             <span className='Header-title'>
               {title}
             </span>
-            {subtitle &&
+            {
+              subtitle &&
               <span className='Header-subtitle'>
                 <Icon.ChevronRight className='Header-chevron' />
                 {subtitle}
diff --git a/components/list/index.js b/components/list/index.js
index 1a7110d2b..07e5c3475 100644
--- a/components/list/index.js
+++ b/components/list/index.js
@@ -55,17 +55,20 @@ export const Row = ({
     }
   }
 
-  const avatarElement = avatar &&
+  const avatarElement =
+    avatar &&
     <div className='List-row-avatar' key='avatar'>
       {(typeof avatar === 'string' ? <img src={avatar} /> : avatar)}
     </div>
 
-  const iconLeftElement = !avatar && icon &&
+  const iconLeftElement =
+    !avatar && icon &&
     <div className='List-row-icon-left' key='icon-left'>
       {icon}
     </div>
 
-  const iconRightElement = avatar && icon &&
+  const iconRightElement =
+    avatar && icon &&
     <div className='List-row-icon-right' key='icon-right'>
       {icon}
     </div>
diff --git a/components/menu/index.js b/components/menu/index.js
index 981871249..ac37c50f6 100644
--- a/components/menu/index.js
+++ b/components/menu/index.js
@@ -42,7 +42,8 @@ export function Menu ({items, children, visible, onClick, transformX, transformY
                       e.preventDefault()
                       onClick(item)
                     }}>
-                      {hasIcon &&
+                      {
+                        hasIcon &&
                         <div className='Menu-icon'>
                           {item.icon}
                         </div>
diff --git a/components/navigation/index.js b/components/navigation/index.js
index f5cc20d84..7373dd1e3 100644
--- a/components/navigation/index.js
+++ b/components/navigation/index.js
@@ -24,7 +24,8 @@ const Item = ({index, onClick, item}) => (
     >
       {item.text}
     </Link>
-    {item.links &&
+    {
+      item.links &&
       <ul className='Navigation'>
         {item.links.map((item, index) =>
           <Item
diff --git a/components/progress/index.js b/components/progress/index.js
index 01f73bb1c..769f7079f 100644
--- a/components/progress/index.js
+++ b/components/progress/index.js
@@ -29,7 +29,8 @@ class Linear extends React.Component {
   render () {
     return (
       <Motion defaultStyle={{x: 0}} style={{x: spring(this.state.isDone ? 0 : 4)}}>
-        {(value) => value.x !== 0 &&
+        {
+          (value) => value.x !== 0 &&
           <div className='Progress-linear'>
             <div className='Progress-linear-background' style={{height: value.x}}>
               <div className='Progress-linear-inner' style={{width: `${this.props.percentage}%`}} />
diff --git a/components/select/index.js b/components/select/index.js
index 9663d41ff..6107e692d 100644
--- a/components/select/index.js
+++ b/components/select/index.js
@@ -86,7 +86,8 @@ export default class Select extends React.Component {
 
     return (
       <div className='Select' ref={(c) => { this.ref = c }}>
-        {label &&
+        {
+          label &&
           <span className='Select-label'>{this.props.label}</span>
         }
         <button className='Select-body' onClick={this.open}>
@@ -100,16 +101,16 @@ export default class Select extends React.Component {
         }}>
           {style =>
             open &&
-              <List
-                style={{
-                  opacity: style.opacity
-                }}
-                hasLabel={!!this.props.label}
-                items={this.props.items}
-                selectedIndex={selectedIndex}
-                onClick={this.props.onChange}
-                width={this.state.width}
-              />
+            <List
+              style={{
+                opacity: style.opacity
+              }}
+              hasLabel={!!this.props.label}
+              items={this.props.items}
+              selectedIndex={selectedIndex}
+              onClick={this.props.onChange}
+              width={this.state.width}
+            />
           }
         </Motion>
       </div>
diff --git a/components/snackbar/index.js b/components/snackbar/index.js
index 7a8a51511..9c1aa242a 100644
--- a/components/snackbar/index.js
+++ b/components/snackbar/index.js
@@ -27,7 +27,8 @@ var Snackbar = ({text, action, onAction, visible}) => (
               <span className='Snackbar-text'>
                 {text}
               </span>
-              {action &&
+              {
+                action &&
                 <input
                   type='button'
                   className='Snackbar-action'
diff --git a/package.json b/package.json
index 26d3d49ff..3cf8bf129 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "saucelabs": "^1.2.0",
     "selenium-webdriver": "^3.0.0-beta-2",
     "st": "^1.2.0",
-    "standard": "^7.0.1",
+    "standard": "^8.0.3",
     "stylelint": "^7.3.1",
     "stylelint-config-standard": "^13.0.2",
     "tarball-extract": "0.0.3",