diff --git a/gtk-theme-qogir/src/_sass/cinnamon/_common.scss b/gtk-theme-qogir/src/_sass/cinnamon/_common.scss
index 139b364..6e80501 100644
--- a/gtk-theme-qogir/src/_sass/cinnamon/_common.scss
+++ b/gtk-theme-qogir/src/_sass/cinnamon/_common.scss
@@ -1112,7 +1112,7 @@ StScrollBar {
     padding: 10px;
     border: 1px solid rgba(0,0,0,0);
 
-    &:hover { @extend %button:hover; }
+    &:hover { @extend %button, :hover; }
   }
 
   &-places {
@@ -1140,7 +1140,7 @@ StScrollBar {
 
     &-selected {
       padding: 6px;
-      @extend %button:active;
+      @extend %button, :active;
       border: none;
 
       &:highlighted { font-weight: bold; }
diff --git a/gtk-theme-qogir/src/_sass/gtk/_common.scss b/gtk-theme-qogir/src/_sass/gtk/_common.scss
index 5bdad45..fd27ac2 100644
--- a/gtk-theme-qogir/src/_sass/gtk/_common.scss
+++ b/gtk-theme-qogir/src/_sass/gtk/_common.scss
@@ -64,7 +64,7 @@ button.gtkstyle-fallback { // For Cinnamon system setting
 
 .view,
 %view {
-  @extend row.activatable;
+  @extend row, .activatable;
   color: $text_color;
   background-color: $base_color;
 
@@ -130,7 +130,7 @@ label {
 
   &:disabled {
     color: $insensitive_fg_color;
-    selection { @extend %selected_items:disabled; }
+    selection { @extend %selected_items, :disabled; }
   }
 }
 
@@ -604,9 +604,9 @@ button {
 // More inline toolbar buttons
 toolbar.inline-toolbar toolbutton {
   & > button.flat { @extend %linked_flat_middle; }
-  &:first-child > button.flat { @extend %linked_flat:first-child; }
-  &:last-child > button.flat { @extend %linked_flat:last-child; }
-  &:only-child > button.flat { @extend %linked_flat:only-child; }
+  &:first-child > button.flat { @extend %linked_flat, :first-child; }
+  &:last-child > button.flat { @extend %linked_flat, :last-child; }
+  &:only-child > button.flat { @extend %linked_flat, :only-child; }
   &:hover { background-color: if($variant=='light', rgba($fg_color, 0.03), rgba($fg_color, 0.08)); }
   &:active, &:checked { @include button(active); }
 }
@@ -936,7 +936,7 @@ modelbutton.flat arrow {
 
 button:link, button:visited {
   @extend %undecorated_button;
-  @extend *:link;
+  @extend *, :link;
 
   &:hover, &:active, &:checked {
     @extend %undecorated_button;
@@ -1030,7 +1030,7 @@ combobox {
     min-width: 16px;
   }
 
-  &:drop(active) button.combo { @extend button:drop(active); }
+  &:drop(active) button.combo { @extend button, :drop(active); }
 
   decoration,
   button.combo:checked { transition: none; } // workaround for menuitem selection
@@ -1053,14 +1053,14 @@ combobox {
     &:dir(rtl) { @extend %linked_middle; } // specificity bump
   }
 
-  .linked:not(.vertical) > &:first-child > box > button.combo { @extend %linked:first-child; }
-  .linked:not(.vertical) > &:last-child > box > button.combo { @extend %linked:last-child; }
-  .linked:not(.vertical) > &:only-child > box > button.combo { @extend %linked:only-child; }
+  .linked:not(.vertical) > &:first-child > box > button.combo { @extend %linked, :first-child; }
+  .linked:not(.vertical) > &:last-child > box > button.combo { @extend %linked, :last-child; }
+  .linked:not(.vertical) > &:only-child > box > button.combo { @extend %linked, :only-child; }
 
   .linked.vertical > & > box > button.combo { @extend %linked_vertical_middle; }
-  .linked.vertical > &:first-child > box > button.combo { @extend %linked_vertical:first-child; }
-  .linked.vertical > &:last-child > box > button.combo { @extend %linked_vertical:last-child; }
-  .linked.vertical > &:only-child > box > button.combo { @extend %linked_vertical:only-child; }
+  .linked.vertical > &:first-child > box > button.combo { @extend %linked_vertical, :first-child; }
+  .linked.vertical > &:last-child > box > button.combo { @extend %linked_vertical, :last-child; }
+  .linked.vertical > &:only-child > box > button.combo { @extend %linked_vertical, :only-child; }
 }
 
 //
@@ -1203,7 +1203,7 @@ headerbar,
       color: transparentize($selection_mode_fg, 0.4);
     }
 
-    .subtitle:link { @extend *:link:selected;  }
+    .subtitle:link { @extend *, :link, :selected;  }
 
     .selection-menu {
       box-shadow: none;
@@ -1439,12 +1439,12 @@ headerbar {
     }
 
     &:hover { background-color: gtkalpha($selection_mode_fg, 0.3); }
-    &:active, &:checked { @extend %selected-button:active; }
+    &:active, &:checked { @extend %selected-button, :active; }
 
     &:disabled {
-      @extend %selected-button.flat:disabled;
+      @extend %selected-button, .flat, :disabled;
 
-      &:checked, &:active { @extend %selected-button:disabled:checked; }
+      &:checked, &:active { @extend %selected-button, :disabled, :checked; }
     }
 
     &:backdrop { opacity: 0.7; background: none; }
@@ -1678,7 +1678,7 @@ treeview.view {
     -GtkTreeView-expander-size: 16;
   }
 
-  @extend row.activatable;
+  @extend row, .activatable;
 
   border-left-color: transparentize($fg_color, 0.85);   // this is actually the tree lines color,
   border-top-color: transparentize(black, 0.9);         // while this is the grid lines color, better then nothing
@@ -1969,7 +1969,7 @@ popover.background {
   }
 
   & separator { background-color: $_popover_bg; }
-  label.separator { @extend label.separator; } // Noice
+  label.separator { @extend label, .separator; } // Noice
 
   > list,
   > .view,
@@ -3136,7 +3136,7 @@ placessidebar {
       margin-top: 2px;
       margin-bottom: 2px;
       padding: 0;
-      @extend button.flat;
+      @extend button, .flat;
       border-radius: 100%;
       -gtk-outline-radius: 100%;
 
diff --git a/gtk-theme-qogir/src/_sass/gtk/_darksidebar_widgets.scss b/gtk-theme-qogir/src/_sass/gtk/_darksidebar_widgets.scss
index 382e511..8f68914 100644
--- a/gtk-theme-qogir/src/_sass/gtk/_darksidebar_widgets.scss
+++ b/gtk-theme-qogir/src/_sass/gtk/_darksidebar_widgets.scss
@@ -885,7 +885,7 @@ window.background.csd {
         row.activatable {
           @extend %side_views;
 
-          button { @extend %side_buttons.flat; }
+          button { @extend %side_buttons, .flat; }
 
           &:selected button { @extend %selected-button; }
         }
@@ -988,7 +988,7 @@ hdyleaflet {
       color: transparentize($selection_mode_fg, 0.4);
     }
 
-    .subtitle:link { @extend *:link:selected;  }
+    .subtitle:link { @extend *, :link, :selected;  }
 
     .selection-menu {
       box-shadow: none;
@@ -1011,12 +1011,12 @@ hdyleaflet {
       }
 
       &:hover { background-color: gtkalpha($selection_mode_fg, 0.3); }
-      &:active, &:checked { @extend %selected-button:active; }
+      &:active, &:checked { @extend %selected-button, :active; }
 
       &:disabled {
-        @extend %selected-button.flat:disabled;
+        @extend %selected-button, .flat, :disabled;
 
-        &:checked, &:active { @extend %selected-button:disabled:checked; }
+        &:checked, &:active { @extend %selected-button, :disabled, :checked; }
       }
 
       &:backdrop { opacity: 0.7; background: none; }
diff --git a/gtk-theme-qogir/src/_sass/gtk/apps/_budgie.scss b/gtk-theme-qogir/src/_sass/gtk/apps/_budgie.scss
index 29ed8dd..4bb1c12 100644
--- a/gtk-theme-qogir/src/_sass/gtk/apps/_budgie.scss
+++ b/gtk-theme-qogir/src/_sass/gtk/apps/_budgie.scss
@@ -99,7 +99,7 @@
     background-color: transparent;
 
     &:hover { box-shadow: none; }
-    @extend row.activatable;
+    @extend row, .activatable;
   }
 
   switch { margin-left: 56px; }
@@ -273,7 +273,7 @@ window.budgie-popover:not(.csd) {
   }
 
   button {
-    @extend row.activatable;
+    @extend row, .activatable;
 
     min-height: 32px;
     padding: 0 8px;
@@ -297,7 +297,7 @@ window.budgie-popover:not(.csd) {
 // Menu Button
 button.budgie-menu-launcher {
   // padding: 0 2px;
-  @extend button.flat;
+  @extend button, .flat;
 }
 
 // User Menu
@@ -422,7 +422,7 @@ popover.background.places-menu {
   #tasklist-button:not(.flat) {
     padding: 0 4px;
     @extend %underscores;
-    @extend button.flat;
+    @extend button, .flat;
     @extend %budgie_button;
     box-shadow: none;
   }
@@ -432,7 +432,7 @@ popover.background.places-menu {
   // Icon Tasklist
   button.flat.launcher {
     padding: 0;
-    @extend button.flat;
+    @extend button, .flat;
     @extend %underscores;
 
     // for indicator colors
@@ -701,7 +701,7 @@ button.raven-trigger {
     grid > label:first-child { min-height: 26px; } // workaround to fix vertical-align
 
     // for <10.4
-    spinbutton:not(.vertical) { @extend entry.flat; }
+    spinbutton:not(.vertical) { @extend entry, .flat; }
 
     // for <10.4
     button.combo { }
@@ -779,7 +779,7 @@ window.sound-popover.background {
   button.image-button {
     padding: $cont_padding;
     border: none;
-    @extend %budgie_button.flat;
+    @extend %budgie_button, .flat;
   }
 }
 
diff --git a/gtk-theme-qogir/src/_sass/gtk/apps/_elementary.scss b/gtk-theme-qogir/src/_sass/gtk/apps/_elementary.scss
index b9db4f6..f5f5ba1 100644
--- a/gtk-theme-qogir/src/_sass/gtk/apps/_elementary.scss
+++ b/gtk-theme-qogir/src/_sass/gtk/apps/_elementary.scss
@@ -228,7 +228,7 @@ treeview.view {
         }
       }
 
-      &.trough { @extend treeview.view.trough }
+      &.trough { @extend treeview, .view, .trough }
     }
   }
 }
diff --git a/gtk-theme-qogir/src/_sass/gtk/apps/_gnome.scss b/gtk-theme-qogir/src/_sass/gtk/apps/_gnome.scss
index 92fb7be..079aec0 100644
--- a/gtk-theme-qogir/src/_sass/gtk/apps/_gnome.scss
+++ b/gtk-theme-qogir/src/_sass/gtk/apps/_gnome.scss
@@ -191,7 +191,7 @@ window.background { // gnome-terminal 3.32
 }
 
 button.nautilus-circular-button.image-button {
-  @extend button.circular;
+  @extend button, .circular;
 }
 
 $disk_space_unknown: transparentize($fg_color, 0.5);
diff --git a/gtk-theme-qogir/src/_sass/gtk/apps/_mate.scss b/gtk-theme-qogir/src/_sass/gtk/apps/_mate.scss
index 21f9ee6..3370ab4 100644
--- a/gtk-theme-qogir/src/_sass/gtk/apps/_mate.scss
+++ b/gtk-theme-qogir/src/_sass/gtk/apps/_mate.scss
@@ -121,7 +121,7 @@ PanelSeparator {
 
 // 'hide' arrow buttons
 PanelToplevel.mate-panel-menu-bar > grid.horizontal > button {
-  @extend button.flat;
+  @extend button, .flat;
   min-height: 4px;
   min-width: 4px;
   padding: 0;
@@ -324,7 +324,7 @@ PanelToplevel.mate-panel-menu-bar > grid.horizontal > button {
 //
 // Caja
 //
-.caja-desktop { @extend .nautilus-desktop.nautilus-canvas-item; }
+.caja-desktop { @extend .nautilus-desktop, .nautilus-canvas-item; }
 .caja-notebook { border-top: 1px solid $borders_color; }
 .caja-side-pane .frame { border-width: 1px 0 0; }
 .caja-notebook .frame { border-width: 0 0 1px; }
@@ -336,7 +336,7 @@ PanelToplevel.mate-panel-menu-bar > grid.horizontal > button {
 }
 
 .caja-desktop { // desktop icon-grid styling
-  &.caja-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; }
+  &.caja-canvas-item { @extend .nautilus-desktop, .nautilus-canvas-item; }
 
   > widget.entry { // = EelEditableLabel.entry
     &, &:focus {
diff --git a/gtk-theme-qogir/src/_sass/gtk/apps/_misc.scss b/gtk-theme-qogir/src/_sass/gtk/apps/_misc.scss
index 040d8c0..dd76185 100644
--- a/gtk-theme-qogir/src/_sass/gtk/apps/_misc.scss
+++ b/gtk-theme-qogir/src/_sass/gtk/apps/_misc.scss
@@ -2,14 +2,14 @@
 //
 // Nemo
 //
-.nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; }
+.nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop, .nautilus-canvas-item; }
 
 .nemo-window {
   .nemo-places-sidebar {
     &.frame { border-width: 0; }
 
     .places-treeview {
-      @extend row.activatable;
+      @extend row, .activatable;
 
       -NemoPlacesTreeView-disk-full-bg-color: $solid_borders_color;
       -NemoPlacesTreeView-disk-full-fg-color: darken($progress_color, 5%);
diff --git a/gtk-theme-qogir/src/_sass/gtk/apps/_xfce4.scss b/gtk-theme-qogir/src/_sass/gtk/apps/_xfce4.scss
index e282958..f662b4d 100644
--- a/gtk-theme-qogir/src/_sass/gtk/apps/_xfce4.scss
+++ b/gtk-theme-qogir/src/_sass/gtk/apps/_xfce4.scss
@@ -144,7 +144,7 @@ window.thunar {
     border-top: none;
 
     treeview.view {
-      @extend treeview.view;
+      @extend treeview, .view;
       background-color: $bg_color;
       color: $alt_fg_color;