diff --git a/lib/sass/base.scss b/lib/sass/base.scss
index 7a383d3..b0fba80 100644
--- a/lib/sass/base.scss
+++ b/lib/sass/base.scss
@@ -2,6 +2,9 @@
 // Base styles
 // --------------------------------------------------
 
+// Use box sizing on all the things!
+* { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; }
+
 body {
   position: fixed;
   top: 0;
diff --git a/lib/sass/normalize.scss b/lib/sass/normalize.scss
index b69efc3..80e778e 100644
--- a/lib/sass/normalize.scss
+++ b/lib/sass/normalize.scss
@@ -64,9 +64,9 @@ template {
 //
 
 html {
-    font-family: sans-serif; /* 1 */
-    -ms-text-size-adjust: 100%; /* 2 */
-    -webkit-text-size-adjust: 100%; /* 2 */
+    font-family: sans-serif; // 1
+    -ms-text-size-adjust: 100%; // 2
+    -webkit-text-size-adjust: 100%; // 2
 }
 
 //
@@ -272,8 +272,8 @@ fieldset {
 //
 
 legend {
-    border: 0; /* 1 */
-    padding: 0; /* 2 */
+    border: 0; // 1
+    padding: 0; // 2
 }
 
 //
@@ -286,9 +286,9 @@ button,
 input,
 select,
 textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
-    margin: 0; /* 3 */
+    font-family: inherit; // 1
+    font-size: 100%; // 2
+    margin: 0; // 3
 }
 
 //
@@ -322,11 +322,11 @@ select {
 //
 
 button,
-html input[type="button"], /* 1 */
+html input[type="button"], // 1
 input[type="reset"],
 input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
+    -webkit-appearance: button; // 2
+    cursor: pointer; // 3
 }
 
 //
@@ -345,8 +345,8 @@ html input[disabled] {
 
 input[type="checkbox"],
 input[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
+    box-sizing: border-box; // 1
+    padding: 0; // 2
 }
 
 //
@@ -356,9 +356,9 @@ input[type="radio"] {
 //
 
 input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
+    -webkit-appearance: textfield; // 1
     -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
+    -webkit-box-sizing: content-box; // 2
     box-sizing: content-box;
 }
 
@@ -388,8 +388,8 @@ input::-moz-focus-inner {
 //
 
 textarea {
-    overflow: auto; /* 1 */
-    vertical-align: top; /* 2 */
+    overflow: auto; // 1
+    vertical-align: top; // 2
 }
 
 // ==========================================================================