diff --git a/addressing.mss b/addressing.mss
index 39f341f887..fae182afc6 100644
--- a/addressing.mss
+++ b/addressing.mss
@@ -30,4 +30,4 @@
       text-size: 9;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/admin.mss b/admin.mss
index 89268d18f5..1802b799d7 100644
--- a/admin.mss
+++ b/admin.mss
@@ -1,68 +1,80 @@
+#admin-01234 {
+  [admin_level = '2'],
+  [admin_level = '3'] {
+    [zoom >= 4] {
+      line-color: purple;
+      line-width: 0.6;
+      line-opacity: 0.2;
+    }
+    [zoom >= 7] {
+      line-width: 2;
+    }
+    [zoom >= 10] {
+      line-opacity: 0.1;
+      [admin_level = '2'] {
+        line-width: 6;
+      }
+      [admin_level = '3'] {
+        line-width: 5;
+        line-dasharray: 4,2;
+      }
+    }
+  }
+  [admin_level = '4'] {
+    [zoom >= 4] {
+      line-color: purple;
+      line-width: 0.6;
+      line-dasharray: 4,3;
+      line-opacity: 0.2;
+    }
+    [zoom >= 7] {
+      line-width: 1;
+    }
+    [zoom >= 11] {
+      line-width: 3;
+    }
+  }
+}
+
+#admin-5678 {
+  [admin_level = '5'][zoom >= 11] {
+    line-color: purple;
+    line-width: 2;
+    line-dasharray: 6,3,2,3,2,3;
+    line-opacity: 0.3;
+  }
+  [admin_level = '6'][zoom >= 11] {
+    line-color: purple;
+    line-width: 2;
+    line-dasharray: 6,3,2,3;
+    line-opacity: 0.3;
+  }
+  [admin_level = '7'],
+  [admin_level = '8'] {
+    [zoom >= 12] {
+      line-color: purple;
+      line-width: 1.5;
+      line-dasharray: 5,2;
+      line-opacity: 0.3;
+    }
+  }
+}
+
+#admin-other {
+  [admin_level = '9'],
+  [admin_level = '10'] {
+    [zoom >= 13] {
+      line-color: purple;
+      line-width: 2;
+      line-dasharray: 2,3;
+      line-opacity: 0.3;
+    }
+  }
+}
+
 /*
-<Style name="admin-01234">
-    <Rule>
-      <Filter>[admin_level]='2' or [admin_level]='3'</Filter>
-      &maxscale_zoom4;
-      &minscale_zoom6;
-      <LineSymbolizer stroke="purple" stroke-width="0.6" stroke-opacity="0.2"/>
-    </Rule>
-    <Rule>
-      <Filter>[admin_level]='2' or [admin_level]='3'</Filter>
-      &maxscale_zoom7;
-      &minscale_zoom9;
-      <LineSymbolizer stroke="purple" stroke-width="2" stroke-opacity="0.2"/>
-    </Rule>
-   <Rule>
-      <Filter>[admin_level]='2'</Filter>
-      &maxscale_zoom10;
-      <LineSymbolizer stroke="purple" stroke-width="6" stroke-opacity="0.1"/>
-    </Rule>
-    <Rule>
-      <Filter>[admin_level]='3'</Filter>
-      &maxscale_zoom10;
-      <LineSymbolizer stroke="purple" stroke-width="5" stroke-dasharray="4,2" stroke-opacity="0.1"/>
-    </Rule>
-    <Rule>
-      <Filter>[admin_level]='4'</Filter>
-      &maxscale_zoom4;
-      &minscale_zoom6;
-      <LineSymbolizer stroke="purple" stroke-width="0.6" stroke-dasharray="4,3" stroke-opacity="0.2"/>
-    </Rule>
-    <Rule>
-      <Filter>[admin_level]='4'</Filter>
-      &maxscale_zoom7;
-      &minscale_zoom10;
-      <LineSymbolizer stroke="purple" stroke-width="1" stroke-dasharray="4,3" stroke-opacity="0.2"/>
-    </Rule>
-    <Rule>
-      <Filter>[admin_level]='4'</Filter>
-      &maxscale_zoom11;
-      <LineSymbolizer stroke="purple" stroke-width="3" stroke-dasharray="4,3" stroke-opacity="0.2"/>
-    </Rule>
-</Style>
-<Style name="admin-5678">
-    <Rule>
-      <Filter>[admin_level]='5'</Filter>
-      &maxscale_zoom11;
-      <LineSymbolizer stroke="purple" stroke-width="2" stroke-dasharray="6,3,2,3,2,3" stroke-opacity="0.3"/>
-    </Rule>
-    <Rule>
-      <Filter>[admin_level]='6'</Filter>
-      &maxscale_zoom11;
-      <LineSymbolizer stroke="purple" stroke-width="2" stroke-dasharray="6,3,2,3" stroke-opacity="0.3"/>
-    </Rule>
-    <Rule>
-      <Filter>[admin_level]='8' or [admin_level]='7'</Filter>
-      &maxscale_zoom12;
-      <LineSymbolizer stroke="purple" stroke-width="1.5" stroke-dasharray="5,2" stroke-opacity="0.3"/>
-    </Rule>
-</Style>
+ * err, what does this do?
 <Style name="admin-other">
-    <Rule>
-      <Filter>[admin_level]='10' or [admin_level]='9'</Filter>
-      &maxscale_zoom13;
-      <LineSymbolizer stroke="purple" stroke-width="2" stroke-dasharray="2,3" stroke-opacity="0.3"/>
-    </Rule>
    <Rule>
       <Filter>not [admin_level] != ''</Filter>
       &maxscale_zoom9;
@@ -70,5 +82,4 @@
       <LineSymbolizer stroke="purple" stroke-width="1" stroke-opacity="0.2"/>
     </Rule>
 </Style>
-
 */