diff --git a/Gruntfile.js b/Gruntfile.js
index a3f6fe32..216087ad 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -23,6 +23,13 @@ module.exports = function (grunt) {
               replacement: '@extend .shadow-z-$1$2;',
               order: 2
             },
+            // bad conversions of .shadow-z-*
+            { // https://regex101.com/r/pV0yB0/2
+              pattern: /\.shadow-z-(\d+)((?:-hover)?)(?:\(\))?;/gi,
+              replacement: '@extend .shadow-z-$1$2;',
+              order: 2
+            },
+
             // bad conversions to @include instead of @extend
             {
               pattern: /@include (foo1|foo2)\(\);/gi,
@@ -30,6 +37,22 @@ module.exports = function (grunt) {
               order: 2
             },
 
+            // hack - (no conditional replacements)
+            { // https://regex101.com/r/pV0yB0/2
+              pattern: /@extend @extend/gi,
+              replacement: '@extend',
+              order: 10
+            },
+
+
+            // .variations need quoted properties?
+            //{ // Multi-line replacement - https://regex101.com/r/nA6zX9/1
+            //  pattern: /@include variations\(unquote\(("([^"]+)?")\), (\w+(?:-\w+)?), ((?:\$|#)?\w+(?:-\w+)?)\);/gi,
+            //  replacement: '@include variations(unquote($1), \"$3\", $4);\n',
+            //  order: 19
+            //},
+
+
             // button variations mixin replacement(s)
             { // Multi-line replacement - https://regex101.com/r/qD9qB8/2
               pattern: /.generic-variations\(unquote\(("[^"]+")\), (\$[\s\S]+?(?!\r|\n)), {$\n[\s\S]+?(?!\r|\n)contrast[\s\S]+?(?!\r|\n)(\d+)[\s\S]+?(?!\r|\n)}\);$\n/mg,
diff --git a/sass/_dividers.scss b/sass/_dividers.scss
index ee7cd4c1..d5cfe1b4 100644
--- a/sass/_dividers.scss
+++ b/sass/_dividers.scss
@@ -12,7 +12,7 @@ hr {
     (-o-device-pixel-ratio: 3/4),
     (min-device-pixel-ratio: 0.75),
     (min-resolution: 0.75dppx),
-    (min-resolution: 120dpi), {
+    (min-resolution: 120dpi) {
       height:0.75px;
     }
 
diff --git a/sass/_panels.scss b/sass/_panels.scss
index a5380d63..24080e06 100644
--- a/sass/_panels.scss
+++ b/sass/_panels.scss
@@ -3,7 +3,7 @@
   border: 0;
 
   @include variations(unquote(" > .panel-heading"), background-color, $grey-200);
-  .shadow-z-1;
+  @extend .shadow-z-1;
 }
 
 
diff --git a/sass/_plugin-snackbarjs.scss b/sass/_plugin-snackbarjs.scss
index 7db19e8c..ed6e39c1 100644
--- a/sass/_plugin-snackbarjs.scss
+++ b/sass/_plugin-snackbarjs.scss
@@ -7,7 +7,7 @@
     color: $darkbg-text;
     font-size: 14px;
     border-radius: 2px;
-    .shadow-z-1;
+    @extend .shadow-z-1;
 
     // Animation
     height: 0;