diff --git a/stylesheets/skeleton.css b/stylesheets/skeleton.css
index 34edd6c..565c82a 100644
--- a/stylesheets/skeleton.css
+++ b/stylesheets/skeleton.css
@@ -177,85 +177,21 @@
         .container .columns,
         .container .column { margin: 0; }
 
-        .container .one.column,
-        .container .one.columns,
-        .container .two.columns,
-        .container .three.columns,
-        .container .four.columns,
-        .container .five.columns,
-        .container .six.columns,
-        .container .seven.columns,
-        .container .eight.columns,
-        .container .nine.columns,
-        .container .ten.columns,
-        .container .eleven.columns,
-        .container .twelve.columns,
-        .container .thirteen.columns,
-        .container .fourteen.columns,
-        .container .fifteen.columns,
-        .container .sixteen.columns,
-        .container .one-third.column,
-        .container .two-thirds.column  { width: 300px; }
+        .container .column,
+        .container .column  { width: 300px; }
 
         /* Offsets */
-        .container .offset-by-one,
-        .container .offset-by-two,
-        .container .offset-by-three,
-        .container .offset-by-four,
-        .container .offset-by-five,
-        .container .offset-by-six,
-        .container .offset-by-seven,
-        .container .offset-by-eight,
-        .container .offset-by-nine,
-        .container .offset-by-ten,
-        .container .offset-by-eleven,
-        .container .offset-by-twelve,
-        .container .offset-by-thirteen,
-        .container .offset-by-fourteen,
-        .container .offset-by-fifteen { padding-left: 0; }
+        .container [class|="offset-by"] { padding-left: 0; }
 		
-		/* Use the full width of the screen */
-		.container-fluid .columns,
+	/* Use the full width of the screen */
+	.container-fluid .columns,
         .container-fluid .column { margin: 0; }
 
-        .container-fluid .one.column,
-        .container-fluid .one.columns,
-        .container-fluid .two.columns,
-        .container-fluid .three.columns,
-        .container-fluid .four.columns,
-        .container-fluid .five.columns,
-        .container-fluid .six.columns,
-        .container-fluid .seven.columns,
-        .container-fluid .eight.columns,
-        .container-fluid .nine.columns,
-        .container-fluid .ten.columns,
-        .container-fluid .eleven.columns,
-        .container-fluid .twelve.columns,
-        .container-fluid .thirteen.columns,
-        .container-fluid .fourteen.columns,
-        .container-fluid .fifteen.columns,
-        .container-fluid .sixteen.columns,
-        .container-fluid .one-third.column,
-        .container-fluid .two-thirds.column  { width: 100%; }
+        .container-fluid .column,
+        .container-fluid .columns { width: 100%; }
 
         /* Offsets */
-        .container-fluid .offset-by-one,
-        .container-fluid .offset-by-two,
-        .container-fluid .offset-by-three,
-        .container-fluid .offset-by-four,
-        .container-fluid .offset-by-five,
-        .container-fluid .offset-by-six,
-        .container-fluid .offset-by-seven,
-        .container-fluid .offset-by-eight,
-        .container-fluid .offset-by-nine,
-        .container-fluid .offset-by-ten,
-        .container-fluid .offset-by-eleven,
-        .container-fluid .offset-by-twelve,
-        .container-fluid .offset-by-thirteen,
-        .container-fluid .offset-by-fourteen,
-        .container-fluid .offset-by-fifteen { padding-left: 0; }
-
-		
+	.container-fluid [class|="offset-by"] { padding-left: 0; }
 		
     }
 
@@ -270,66 +206,18 @@
         .container .columns,
         .container .column { margin: 0; }
 
-        .container .one.column,
-        .container .one.columns,
-        .container .two.columns,
-        .container .three.columns,
-        .container .four.columns,
-        .container .five.columns,
-        .container .six.columns,
-        .container .seven.columns,
-        .container .eight.columns,
-        .container .nine.columns,
-        .container .ten.columns,
-        .container .eleven.columns,
-        .container .twelve.columns,
-        .container .thirteen.columns,
-        .container .fourteen.columns,
-        .container .fifteen.columns,
-        .container .sixteen.columns,
-        .container .one-third.column,
-        .container .two-thirds.column { width: 420px; }
+        .container .column,
+        .container .columns { width: 420px; }
 		
-		/* Use the full width of the screen */
-		.container-fluid .columns,
+	/* Use the full width of the screen */
+	.container-fluid .columns,
         .container-fluid .column { margin: 0; }
 
-        .container-fluid .one.column,
-        .container-fluid .one.columns,
-        .container-fluid .two.columns,
-        .container-fluid .three.columns,
-        .container-fluid .four.columns,
-        .container-fluid .five.columns,
-        .container-fluid .six.columns,
-        .container-fluid .seven.columns,
-        .container-fluid .eight.columns,
-        .container-fluid .nine.columns,
-        .container-fluid .ten.columns,
-        .container-fluid .eleven.columns,
-        .container-fluid .twelve.columns,
-        .container-fluid .thirteen.columns,
-        .container-fluid .fourteen.columns,
-        .container-fluid .fifteen.columns,
-        .container-fluid .sixteen.columns,
-        .container-fluid .one-third.column,
-        .container-fluid .two-thirds.column  { width: 100%; }
+        .container-fluid .column,
+        .container-fluid .columns { width: 100%; }
 
         /* Offsets */
-        .container-fluid .offset-by-one,
-        .container-fluid .offset-by-two,
-        .container-fluid .offset-by-three,
-        .container-fluid .offset-by-four,
-        .container-fluid .offset-by-five,
-        .container-fluid .offset-by-six,
-        .container-fluid .offset-by-seven,
-        .container-fluid .offset-by-eight,
-        .container-fluid .offset-by-nine,
-        .container-fluid .offset-by-ten,
-        .container-fluid .offset-by-eleven,
-        .container-fluid .offset-by-twelve,
-        .container-fluid .offset-by-thirteen,
-        .container-fluid .offset-by-fourteen,
-        .container-fluid .offset-by-fifteen { padding-left: 0; }
+        .container-fluid [class|="offset-by"] { padding-left: 0; }
 		
     }