diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7164d11..598a8c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changes to normalize.css
 
+### 4.1.0 (April 11, 2016)
+
+* Normalize placeholders in Chrome, Edge, and Safari.
+* Normalize `text-decoration-skip` property in Safari.
+* Normalize file select buttons.
+* Normalize search input outlines in Safari.
+* Limit Firefox focus normalizations to buttons.
+* Restore `main` to package.json.
+* Restore proper overflow to certain `select` elements.
+* Remove opinionated cursor styles on buttons.
+* Update stylelint configuration
+* Update tests
+
 ### 4.0.0 (March 19, 2016)
 
 * Add the correct font weight for `b` and `strong` in Chrome, Edge, and Safari.
diff --git a/normalize.css b/normalize.css
index 092de8f..ac61051 100644
--- a/normalize.css
+++ b/normalize.css
@@ -391,8 +391,7 @@ textarea {
 }
 
 /**
- * Remove the inner padding and cancel buttons in Chrome on OS X and
- * Safari on OS X.
+ * Remove the inner padding and cancel buttons in Chrome and Safari on OS X.
  */
 
 [type="search"]::-webkit-search-cancel-button,
@@ -411,7 +410,7 @@ textarea {
 
 /**
  * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Chrome and Safari.
+ * 2. Change font properties to `inherit` in Safari.
  */
 
 ::-webkit-file-upload-button {
diff --git a/package.json b/package.json
index 6447f35..2bb3831 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "normalize.css",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "A modern alternative to CSS resets",
   "main": "normalize.css",
   "style": "normalize.css",
@@ -9,8 +9,8 @@
     "normalize.css"
   ],
   "devDependencies": {
-    "stylelint": "^5.1.0",
-    "stylelint-config-standard": "^4.0.1"
+    "stylelint": "^5.4.0",
+    "stylelint-config-standard": "^5.0.0"
   },
   "scripts": {
     "test": "stylelint normalize.css"
diff --git a/test.html b/test.html
index a9d5524..f4d47ee 100644
--- a/test.html
+++ b/test.html
@@ -149,6 +149,10 @@
   <div class="Test-run">
     <a href="#non">dummy anchor</a>
   </div>
+  <h3 class="Test-it">should not skip underlines</h3>
+  <div class="Test-run">
+    <a href="#non">quip and jig</a>
+  </div>
   <h3 class="Test-it">should not have a focus outline when both focused and hovered (opinionated)</h3>
   <div class="Test-run">
     <a href="#non">dummy anchor</a>
@@ -226,6 +230,16 @@
     </svg>
   </div>
 
+  <h2 class="Test-describe"><code>code</code>, <code>kbd</code>, <code>pre</code>, <code>samp</code></h2>
+  <h3 class="Test-it">should render text at the same absolute size as normal text</h3>
+  <div class="Test-run">
+    <span>span: abcdefghijklmnopqrstuvwxyz.</span><br>
+    <code>code: abcdefghijklmnopqrstuvwxyz.</code><br>
+    <kbd>kbd: abcdefghijklmnopqrstuvwxyz.</kbd><br>
+    <samp>samp: abcdefghijklmnopqrstuvwxyz.</samp>
+    <pre>pre: abcdefghijklmnopqrstuvwxyz.</pre>
+  </div>
+
   <h2 class="Test-describe"><code>figure</code></h2>
   <h3 class="Test-it">should have margins</h3>
   <div class="Test-run" style="outline:1px solid #ADD8E6; overflow:hidden;">
@@ -240,16 +254,6 @@
     <hr style="height:2px; border:solid #ADD8E6; border-width:2px 0;">
   </div>
 
-  <h2 class="Test-describe"><code>code</code>, <code>kbd</code>, <code>pre</code>, <code>samp</code></h2>
-  <h3 class="Test-it">should render text at the same absolute size as normal text</h3>
-  <div class="Test-run">
-    <span>span: abcdefghijklmnopqrstuvwxyz.</span><br>
-    <code>code: abcdefghijklmnopqrstuvwxyz.</code><br>
-    <kbd>kbd: abcdefghijklmnopqrstuvwxyz.</kbd><br>
-    <samp>samp: abcdefghijklmnopqrstuvwxyz.</samp>
-    <pre>pre: abcdefghijklmnopqrstuvwxyz.</pre>
-  </div>
-
   <h2 class="Test-describe"><code>button</code>, <code>input</code>, <code>optgroup</code>, <code>select</code>, <code>textarea</code></h2>
   <h3 class="Test-it">should inherit <code>font</code> from ancestor</h3>
   <div class="Test-run" style="font:bold italic 20px/1 serif;">
@@ -314,14 +318,6 @@
   </div>
 
   <h2 class="Test-describe"><code>button</code> and button-style <code>input</code></h2>
-  <h3 class="Test-it">should have <code>pointer</code> cursor style</h3>
-  <div class="Test-run">
-    <p><button>button</button></p>
-    <p><input type="image" src="http://lorempixel.com/90/24" alt="input (image)"></p>
-    <p><input type="button" value="input (button)"></p>
-    <p><input type="reset" value="input (reset)"></p>
-    <p><input type="submit" value="input (submit)"></p>
-  </div>
   <h3 class="Test-it">should be styleable</h3>
   <div class="Test-run" id="button-like-style">
     <style>
@@ -334,8 +330,9 @@
       }
     </style>
     <p><button>button</button></p>
-    <p><input type="image" src="http://lorempixel.com/90/24" alt="input (image)"></p>
+    <p><input type="image" src="//placehold.it/90x24" alt="input (image)"></p>
     <p><input type="button" value="input (button)"></p>
+    <p><input type="file" value="input (file)"></p>
     <p><input type="reset" value="input (reset)"></p>
     <p><input type="submit" value="input (submit)"></p>
   </div>
@@ -344,7 +341,6 @@
   <h3 class="Test-it">should have <code>default</code> cursor style</h3>
   <div class="Test-run">
     <p><button disabled>button</button></p>
-    <p><input disabled type="image" src="http://lorempixel.com/90/24" alt="input (image)"></p>
     <p><input disabled type="button" value="input (button)"></p>
     <p><input disabled type="reset" value="input (reset)"></p>
     <p><input disabled type="submit" value="input (submit)"></p>
@@ -362,53 +358,11 @@
       }
     </style>
     <p><button>button</button></p>
-    <p><input value="input (text)"></p>
     <p><input type="button" value="input (button)"></p>
     <p><input type="reset" value="input (reset)"></p>
     <p><input type="submit" value="input (submit)"></p>
   </div>
 
-  <h2 class="Test-describe"><code>input[type="checkbox"]</code>, <code>input[type="radio"]</code></h2>
-  <h3 class="Test-it">should have a <code>border-box</code> box model</h3>
-  <div class="Test-run Test-run--highlightEl" id="radio-box-model">
-    <style>
-      #radio-box-model {
-        width: 200px;
-        border: 1px solid red;
-      }
-
-      #radio-box-model input {
-        width: 100%;
-        border: 5px solid #ADD8E6;
-        display: block;
-        position: relative;
-      }
-    </style>
-    <input type="checkbox">
-    <input type="radio" name="rad">
-  </div>
-  <h3 class="Test-it">should not have padding</h3>
-  <div class="Test-run Test-run--highlightEl">
-    <input type="checkbox">
-    <input type="radio" name="rad">
-  </div>
-
-  <h2 class="Test-describe"><code>input[type="number"]</code></h2>
-  <h3 class="Test-it">should display a default cursor for the decrement button's click target in Chrome</h3>
-  <div class="Test-run">
-    <input style="height:50px; font-size:15px;" type="number" id="in" min="0" max="10" value="5">
-  </div>
-
-  <h2 class="Test-describe"><code>input[type="search"]</code></h2>
-  <h3 class="Test-it">should be styleable</h3>
-  <div class="Test-run">
-    <input type="search" style="border:1px solid #ADD8E6; padding:10px; width:200px;">
-  </div>
-  <h3 class="Test-it">should not have a cancel button in Safari or Chrome</h3>
-  <div class="Test-run">
-    <input type="search" value="search">
-  </div>
-
   <h2 class="Test-describe"><code>fieldset</code></h2>
   <h3 class="Test-it">should have consistent border, padding, and margin</h3>
   <div class="Test-run">
@@ -443,4 +397,49 @@
     <textarea>textarea</textarea>
   </div>
 
+  <h2 class="Test-describe"><code>[type="checkbox"]</code>, <code>[type="radio"]</code></h2>
+  <h3 class="Test-it">should have a <code>border-box</code> box model</h3>
+  <div class="Test-run Test-run--highlightEl" id="radio-box-model">
+    <style>
+      #radio-box-model {
+        width: 200px;
+        border: 1px solid red;
+      }
+
+      #radio-box-model input {
+        width: 100%;
+        border: 5px solid #ADD8E6;
+        display: block;
+        position: relative;
+      }
+    </style>
+    <input type="checkbox">
+    <input type="radio" name="rad">
+  </div>
+  <h3 class="Test-it">should not have padding</h3>
+  <div class="Test-run Test-run--highlightEl">
+    <input type="checkbox">
+    <input type="radio" name="rad">
+  </div>
+
+  <h2 class="Test-describe"><code>[type="number"]</code></h2>
+  <h3 class="Test-it">should display a default cursor for the decrement button's click target in Chrome</h3>
+  <div class="Test-run">
+    <input style="height:50px; font-size:15px;" type="number" id="in" min="0" max="10" value="5">
+  </div>
+
+  <h2 class="Test-describe"><code>[type="search"]</code></h2>
+  <h3 class="Test-it">should be styleable</h3>
+  <div class="Test-run">
+    <input type="search" style="border:1px solid #ADD8E6; padding:10px; width:200px;">
+  </div>
+  <h3 class="Test-it">should not have a cancel button in Safari or Chrome</h3>
+  <div class="Test-run">
+    <input type="search" value="search">
+  </div>
+  <h3 class="Test-it">should reference inherited color</h3>
+  <div class="Test-run">
+    <input type="text" placeholder="Text goes here" style="background-color: black; color: orange;">
+  </div>
+
 </div>