diff --git a/src/__snapshots__/ChipInput.spec.js.snap b/src/__snapshots__/ChipInput.spec.js.snap
index de9c1f4..f3720cb 100644
--- a/src/__snapshots__/ChipInput.spec.js.snap
+++ b/src/__snapshots__/ChipInput.spec.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`uncontrolled mode matches the snapshot 1`] = `
-<withStyles(ChipInput)
+<WithStyles(ChipInput)
   defaultValue={
     Array [
       "foo",
@@ -42,7 +42,7 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
       ]
     }
   >
-    <withStyles(FormControl)
+    <WithStyles(FormControl)
       className="ChipInput-root-1"
       onClick={[Function]}
     >
@@ -74,7 +74,7 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
           <div
             className="ChipInput-chipContainer-4 ChipInput-inkbar-9 ChipInput-underline-12"
           >
-            <withStyles(Chip)
+            <WithStyles(Chip)
               className="ChipInput-chip-14"
               key="0"
               label="foo"
@@ -100,6 +100,7 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                     "root": "MuiChip-root-19",
                   }
                 }
+                component="div"
                 label="foo"
                 onClick={[Function]}
                 onDelete={[Function]}
@@ -136,7 +137,7 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                       className="MuiChip-deleteIcon-25"
                       onClick={[Function]}
                     >
-                      <withStyles(SvgIcon)
+                      <WithStyles(SvgIcon)
                         className="MuiChip-deleteIcon-25"
                         onClick={[Function]}
                       >
@@ -144,12 +145,11 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                           className="MuiChip-deleteIcon-25"
                           classes={
                             Object {
-                              "colorAccent": "MuiSvgIcon-colorAccent-27",
-                              "colorAction": "MuiSvgIcon-colorAction-28",
-                              "colorContrast": "MuiSvgIcon-colorContrast-29",
+                              "colorAction": "MuiSvgIcon-colorAction-29",
                               "colorDisabled": "MuiSvgIcon-colorDisabled-30",
                               "colorError": "MuiSvgIcon-colorError-31",
-                              "colorPrimary": "MuiSvgIcon-colorPrimary-32",
+                              "colorPrimary": "MuiSvgIcon-colorPrimary-27",
+                              "colorSecondary": "MuiSvgIcon-colorSecondary-28",
                               "root": "MuiSvgIcon-root-26",
                             }
                           }
@@ -169,13 +169,13 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                             />
                           </svg>
                         </SvgIcon>
-                      </withStyles(SvgIcon)>
+                      </WithStyles(SvgIcon)>
                     </Cancel>
                   </pure(Cancel)>
                 </div>
               </Chip>
-            </withStyles(Chip)>
-            <withStyles(Chip)
+            </WithStyles(Chip)>
+            <WithStyles(Chip)
               className="ChipInput-chip-14"
               key="1"
               label="bar"
@@ -201,6 +201,7 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                     "root": "MuiChip-root-19",
                   }
                 }
+                component="div"
                 label="bar"
                 onClick={[Function]}
                 onDelete={[Function]}
@@ -237,7 +238,7 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                       className="MuiChip-deleteIcon-25"
                       onClick={[Function]}
                     >
-                      <withStyles(SvgIcon)
+                      <WithStyles(SvgIcon)
                         className="MuiChip-deleteIcon-25"
                         onClick={[Function]}
                       >
@@ -245,12 +246,11 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                           className="MuiChip-deleteIcon-25"
                           classes={
                             Object {
-                              "colorAccent": "MuiSvgIcon-colorAccent-27",
-                              "colorAction": "MuiSvgIcon-colorAction-28",
-                              "colorContrast": "MuiSvgIcon-colorContrast-29",
+                              "colorAction": "MuiSvgIcon-colorAction-29",
                               "colorDisabled": "MuiSvgIcon-colorDisabled-30",
                               "colorError": "MuiSvgIcon-colorError-31",
-                              "colorPrimary": "MuiSvgIcon-colorPrimary-32",
+                              "colorPrimary": "MuiSvgIcon-colorPrimary-27",
+                              "colorSecondary": "MuiSvgIcon-colorSecondary-28",
                               "root": "MuiSvgIcon-root-26",
                             }
                           }
@@ -270,13 +270,13 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                             />
                           </svg>
                         </SvgIcon>
-                      </withStyles(SvgIcon)>
+                      </WithStyles(SvgIcon)>
                     </Cancel>
                   </pure(Cancel)>
                 </div>
               </Chip>
-            </withStyles(Chip)>
-            <withStyles(Input)
+            </WithStyles(Chip)>
+            <WithStyles(Input)
               classes={
                 Object {
                   "input": "ChipInput-input-3",
@@ -297,21 +297,21 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
               <Input
                 classes={
                   Object {
-                    "disabled": "MuiInput-disabled-38",
-                    "error": "MuiInput-error-36",
-                    "focused": "MuiInput-focused-37",
-                    "formControl": "MuiInput-formControl-34",
-                    "fullWidth": "MuiInput-fullWidth-41",
-                    "inkbar": "MuiInput-inkbar-35",
-                    "input": "MuiInput-input-42 ChipInput-input-3",
-                    "inputDense": "MuiInput-inputDense-43",
-                    "inputDisabled": "MuiInput-inputDisabled-44",
-                    "inputMultiline": "MuiInput-inputMultiline-46",
-                    "inputSearch": "MuiInput-inputSearch-47",
-                    "inputSingleline": "MuiInput-inputSingleline-45",
-                    "multiline": "MuiInput-multiline-40",
-                    "root": "MuiInput-root-33 ChipInput-inputRoot-2",
-                    "underline": "MuiInput-underline-39",
+                    "disabled": "MuiInput-disabled-37",
+                    "error": "MuiInput-error-35",
+                    "focused": "MuiInput-focused-36",
+                    "formControl": "MuiInput-formControl-33",
+                    "fullWidth": "MuiInput-fullWidth-40",
+                    "inkbar": "MuiInput-inkbar-34",
+                    "input": "MuiInput-input-41 ChipInput-input-3",
+                    "inputDense": "MuiInput-inputDense-42",
+                    "inputDisabled": "MuiInput-inputDisabled-43",
+                    "inputMultiline": "MuiInput-inputMultiline-45",
+                    "inputSearch": "MuiInput-inputSearch-46",
+                    "inputSingleline": "MuiInput-inputSingleline-44",
+                    "multiline": "MuiInput-multiline-39",
+                    "root": "MuiInput-root-32 ChipInput-inputRoot-2",
+                    "underline": "MuiInput-underline-38",
                   }
                 }
                 disableUnderline={true}
@@ -329,13 +329,15 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                 value=""
               >
                 <div
-                  className="MuiInput-root-33 ChipInput-inputRoot-2 MuiInput-formControl-34"
+                  className="MuiInput-root-32 ChipInput-inputRoot-2 MuiInput-formControl-33"
                   onBlur={[Function]}
                   onFocus={[Function]}
                   onKeyPress={[Function]}
                 >
                   <input
-                    className="MuiInput-input-42 ChipInput-input-3 MuiInput-inputSingleline-45"
+                    aria-invalid={false}
+                    aria-required={false}
+                    className="MuiInput-input-41 ChipInput-input-3 MuiInput-inputSingleline-44"
                     disabled={false}
                     onChange={[Function]}
                     onKeyDown={[Function]}
@@ -346,11 +348,11 @@ exports[`uncontrolled mode matches the snapshot 1`] = `
                   />
                 </div>
               </Input>
-            </withStyles(Input)>
+            </WithStyles(Input)>
           </div>
         </div>
       </FormControl>
-    </withStyles(FormControl)>
+    </WithStyles(FormControl)>
   </ChipInput>
-</withStyles(ChipInput)>
+</WithStyles(ChipInput)>
 `;