diff --git a/components/input/index.cjsx b/components/input/index.cjsx
index c4170b43..776784fe 100644
--- a/components/input/index.cjsx
+++ b/components/input/index.cjsx
@@ -1,4 +1,4 @@
-require './style'
+localCSS = require './style'
 
 module.exports = React.createClass
 
@@ -55,17 +55,18 @@ module.exports = React.createClass
 
   # -- Render
   render: ->
-    className = @props.className
-    className += ' checked'   if @state.checked
-    className += ' disabled'  if @props.disabled
-    className += ' error'     if @state.error
-    className += ' focus'     if @state.focus
-    className += ' hidden'    if @props.type is 'hidden'
-    className += ' touch'     if @state.touch
-    className += ' radio'     if @props.type is 'radio'
-    className += ' valid'     if @state.value? and @state.value.length > 0
+    className  = "#{localCSS.root} #{@props.className}"
+    className += " #{@props.type}"  if @props.type
+    className += ' checked'         if @state.checked
+    className += ' disabled'        if @props.disabled
+    className += ' error'           if @state.error
+    className += ' focus'           if @state.focus
+    className += ' hidden'          if @props.type is 'hidden'
+    className += ' touch'           if @state.touch
+    className += ' radio'           if @props.type is 'radio'
+    className += ' valid'           if @state.value? and @state.value.length > 0
 
-    <div data-component-input={@props.type} className={className}>
+    <div data-react-toolbox='input' className={className}>
       {
         if @props.multiline
           <textarea ref='input' {...@props} value={@state.value}
diff --git a/components/input/style.styl b/components/input/style.styl
index 4dfee047..089982bb 100644
--- a/components/input/style.styl
+++ b/components/input/style.styl
@@ -1,6 +1,6 @@
-@import "../constants.styl"
+@import '../constants'
 
-[data-component-input]
+:local(.root)
   position                            : relative
   margin-bottom                       : SPACE
   input, textarea, label