diff --git a/js/components/ClutterBar.jsx b/js/components/ClutterBar.jsx
index 51bbad7a..dba20408 100644
--- a/js/components/ClutterBar.jsx
+++ b/js/components/ClutterBar.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {connect} from 'react-redux';
+import classnames from 'classnames';
 
 
 class ClutterBar extends React.Component {
@@ -25,7 +26,7 @@ class ClutterBar extends React.Component {
       <div id='button-i' />
       <div
         id='button-d'
-        className={this.props.doubled ? 'selected' : ''}
+        className={classnames({selected: this.props.doubled})}
         onMouseUp={this.handleMouseUpDouble}
         onMouseDown={this.handleMouseDownDouble}
       />
diff --git a/js/components/ContextMenu.jsx b/js/components/ContextMenu.jsx
index 118c1368..bc8a6c55 100644
--- a/js/components/ContextMenu.jsx
+++ b/js/components/ContextMenu.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {connect} from 'react-redux';
+import classnames from 'classnames';
 
 import {close, setSkinFromFilename, openFileDialog} from '../actionCreators';
 
@@ -46,8 +47,7 @@ class ContextMenu extends React.Component {
   }
 
   render() {
-    const classes = this.props.selected ? 'selected' : '';
-    return <div id='option' className={classes} onClick={this.toggleMenu}>
+    return <div id='option' className={classnames({selected: this.props.selected})} onClick={this.toggleMenu}>
       <ul id='context-menu'>
         <li><a href='https://github.com/captbaritone/winamp2-js' target='_blank'>Winamp2-js...</a></li>
         <li className='hr'><hr /></li>
diff --git a/js/components/MainWindow.jsx b/js/components/MainWindow.jsx
index e0637b58..9ef68895 100644
--- a/js/components/MainWindow.jsx
+++ b/js/components/MainWindow.jsx
@@ -28,7 +28,7 @@ import Volume from './Volume.jsx';
 
 import '../../css/main-window.css';
 
-class MainWindow extends React.Component {
+export class MainWindow extends React.Component {
   constructor(props) {
     super(props);
     this.handleClick = this.handleClick.bind(this);
@@ -80,7 +80,7 @@ class MainWindow extends React.Component {
           <div className='status'>
             <ClutterBar />
             <div id='play-pause' />
-            <div id='work-indicator' className={this.props.display.working ? 'selected' : ''} />
+            <div id='work-indicator' className={classnames({selected: this.props.display.working})} />
             <Time />
             <Visualizer analyser={this.props.mediaPlayer._analyser}/>
           </div>
@@ -110,4 +110,4 @@ class MainWindow extends React.Component {
   }
 }
 
-  module.exports = connect((state) => state)(MainWindow);
+export default connect((state) => state)(MainWindow);
diff --git a/js/components/MonoStereo.jsx b/js/components/MonoStereo.jsx
index 3a2d9893..45bf7079 100644
--- a/js/components/MonoStereo.jsx
+++ b/js/components/MonoStereo.jsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import {connect} from 'react-redux';
+import classnames from 'classnames';
 
 
 const MonoStereo = (props) => {
   return <div className='mono-stereo'>
-    <div id='stereo' className={props.channels === 2 ? 'selected' : ''} />
-    <div id='mono' className={props.channels === 1 ? 'selected' : ''} />
+    <div id='stereo' className={classnames({selected: props.channels === 2})} />
+    <div id='mono' className={classnames({selected: props.channels === 1})} />
   </div>;
 };
 
diff --git a/js/components/Repeat.jsx b/js/components/Repeat.jsx
index 0b308f8e..a2e3974d 100644
--- a/js/components/Repeat.jsx
+++ b/js/components/Repeat.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {connect} from 'react-redux';
+import classnames from 'classnames';
 
 import {toggleRepeat} from '../actionCreators';
 
@@ -15,7 +16,7 @@ class Repeat extends React.Component {
   render() {
     return <div
       id='repeat'
-      className={this.props.repeat ? 'selected' : ''}
+      className={classnames({selected: this.props.repeat})}
       onClick={this.handleClick}
     />;
   }
diff --git a/js/components/Shuffle.jsx b/js/components/Shuffle.jsx
index 2241ec79..b208df6b 100644
--- a/js/components/Shuffle.jsx
+++ b/js/components/Shuffle.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {connect} from 'react-redux';
+import classnames from 'classnames';
 
 
 class Shuffle extends React.Component {
@@ -13,7 +14,7 @@ class Shuffle extends React.Component {
   render() {
     return <div
       id='shuffle'
-      className={this.props.shuffle ? 'selected' : ''}
+      className={classnames({selected: this.props.shuffle})}
       onClick={this.handleClick}
     />;
   }