diff --git a/NEWS b/NEWS
index 49567c0..61603bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,51 @@
-3.34.2
-======
+3.36.1
+======
+
+Translators:
+  Daniel Korostil [uk]
+
+3.36.0
+======
+
+Contributors:
+  Florian Müllner
+
+3.35.91
+=======
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Zander Brown [en_GB]
+
+3.35.90
+=======
+* Adjust to gnome-shell changes [Florian; !100, !101, !102]
+* Force single-line window titles in window list [Florian; #202]
+* Misc. bug fixes and cleanup [Florian; !104, !105]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  sicklylife [ja], Umarzuki Bin Mochlis Moktar [ms]
+
+3.35.3
+======
+
+Translators:
+  Fran Dieguez [gl]
+
+3.35.2
+======
+* Adjust to gnome-shell changes [Marco, Florian; !89, !95, !96]
 * window-list, workspace-indicator: Exclude DESKTOP windows from previews
   [Florian; !93]
 * screenshot-window-sizer: Fix cycling through all valid sizes [Willy; !97]
 
 Contributors:
-  Florian Müllner, Willy Stadnick
-
-Translators:
-  Stas Solovey [ru], Umarzuki Bin Mochlis Moktar [ms]
+  Marco Trevisan (Treviño), Florian Müllner, Willy Stadnick
 
 3.34.1
 ======
diff --git a/data/gnome-classic.scss b/data/gnome-classic.scss
index edf24d6..b573ec8 100644
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -4,6 +4,7 @@
 @import "gnome-shell-sass/_colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";
+@import "gnome-shell-sass/_widgets";
 
 /* Overrides */
 
diff --git a/data/gnome-shell-sass/_colors.scss b/data/gnome-shell-sass/_colors.scss
index d14a440..882c25b 100644
--- a/data/gnome-shell-sass/_colors.scss
+++ b/data/gnome-shell-sass/_colors.scss
@@ -1,16 +1,15 @@
 // When color definition differs for dark and light variant,
 // it gets @if ed depending on $variant
 
-
-$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
+$base_color: if($variant == 'light', #fff, lighten(desaturate(#241f31, 20%), 2%));
 $bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
 $fg_color: if($variant == 'light', #2e3436, #eeeeec);
 
-$selected_fg_color: #ffffff;
+$selected_fg_color: #fff;
 $selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
-$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
-$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
+$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 8%));
+$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), transparentize($fg_color, 0.93));
 $link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
 $link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
 $top_hilight: $borders_edge;
@@ -28,13 +27,12 @@
 $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.84);
 
-$tooltip_borders_color: $osd_outer_borders_color;
-$shadow_color: transparentize(black, 0.9);
+$shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
 $insensitive_bg_color: mix($bg_color, $base_color, 60%);
-$insensitive_borders_color: $borders_color;
+$insensitive_borders_color: mix($borders_color, $base_color, 60%);
 
 //colors for the backdrop state, derived from the main colors.
 $backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
diff --git a/data/gnome-shell-sass/_common.scss b/data/gnome-shell-sass/_common.scss
index 9724a8f..d648097 100644
--- a/data/gnome-shell-sass/_common.scss
+++ b/data/gnome-shell-sass/_common.scss
@@ -23,2219 +23,155 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/* GLOBALS */
+/* Global Values */
 
+// padding, margin and spacing
+$base_padding: 6px;
+$base_margin: 4px;
+$base_spacing: 6px;
 
-$modal_radius: 9px;
-$button_radius: 5px;
-$panel-corner-radius: $button_radius + 1;
+// border radii
+$base_border_radius: 5px;
 
-$_trough_color: transparentize($fg_color, 0.9);
-$_bubble_borders_color: lighten($borders_color, if($variant=='light', 0%, 5%));
-$_hover_bg_color: lighten($bg_color,if($variant=='light', 5%, 3%));
-$_active_bg_color: if($variant == 'light', darken($bg_color, 14%), darken($bg_color, 9%));
+$modal_radius:$base_border_radius * 2;
 
-$font-size: 11;
-$font-family: Cantarell, Sans-Serif;
+// non-standard colors
+$bubble_borders_color: lighten($borders_color, if($variant=='light', 0%, 5%));
+// $bubble_borders_color: if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.3));
 
+// hover
+$hover_bg_color: if($variant=='light', darken($bg_color, 3%), lighten($bg_color, 5%));
+$hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 5%));
+$hover_borders_color: lighten($borders_color,if($variant=='light', 5%, 3%));
+
+// active
+$active_bg_color: if($variant == 'light', darken($bg_color, 7%), darken($bg_color, 9%));
+$active_fg_color: darken($fg_color,if($variant=='light', 5%, 3%));
+$active_borders_color: darken($borders_color,if($variant=='light', 5%, 3%));
+
+// fonts
+$base_font_size: 11;
+$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
+
+// icons
+$base_icon_size: 1.09em;
+// $base_icon_size: 16px;
+
+// Stage
 stage {
-  font-family: $font-family;
-  @include fontsize($font-size);
+  @include fontsize($base_font_size);
   color: $fg_color;
 }
 
-/* WIDGETS */
+/* Common Stylings */
 
-/* Buttons */
-.button, %button {
-  border-radius: $button_radius;
-  border-width: 1px;
-  min-height: 22px;
-  padding: 4px 32px;
-  @include button(normal);
-  &:focus { @include button(focus, $c:$_hover_bg_color, $tc:$fg_color); }
-  &:hover { @include button(hover, $c:$_hover_bg_color, $tc:$fg_color); }
-  &:insensitive { @include button(insensitive); }
-  &:active { @include button(active, $c:$_active_bg_color, $tc:$fg_color); }
-}
-
-.modal-dialog-linked-button, %bubble_button {
-  border-right-width: 1px;
-  @include button(normal, $c:$bg_color, $tc:$fg_color);
-  &:insensitive { @include button(insensitive, $c:$bg_color, $tc:$fg_color); }
-  &:hover { @include button(hover, $c:$_hover_bg_color, $tc:$fg_color); }
-  &:focus { @include button(focus, $c:$_hover_bg_color, $tc:$fg_color); }
-  &:active { @include button(active, $c:$_active_bg_color, $tc:$fg_color); }
-  padding: 12px;
-  border-top: 1px solid $_bubble_borders_color;
-
-  &:first-child {
-    border-radius: 0px 0px 0px $modal_radius;
-  }
-  &:last-child {
-    border-right-width: 0px;
-    border-radius: 0px 0px $modal_radius 0px;
-  }
-  &:first-child:last-child {
-    border-right-width: 0px;
-    border-radius: 0px 0px $modal_radius $modal_radius;
-  }
-}
-
-/* Entries */
-StEntry {
-  border-radius: $button_radius;
-  padding: 4px;
-  border-width: 1px;
-  color: $fg_color;
-  @include entry(normal);
-  //&:hover { @include entry(hover);}
-  &:focus { @include entry(focus,$fc:transparentize($fg_color,0.5));}
-  &:insensitive { @include entry(insensitive);}
-  selection-background-color: $selected_bg_color;
-  selected-color: $selected_fg_color;
-  StIcon.capslock-warning {
-    icon-size: 16px;
-    warning-color: $warning_color;
-    padding: 0 4px;
-  }
-}
-
-
-/* Scrollbars */
-
-StScrollView {
-  &.vfade { -st-vfade-offset: 68px; }
-  &.hfade { -st-hfade-offset: 68px; }
-}
-
-StScrollBar {
-  padding: 0;
-
-  StScrollView & {
-    min-width: 14px;
-    min-height: 14px;
-  }
-
-  StBin#trough {
-    border-radius: 0;
-    background-color: transparent;
-  }
-
-  StButton#vhandle, StButton#hhandle {
-    border-radius: 8px;
-    background-color: mix($fg_color, $bg_color, 60%);
-    //border: 3px solid transparent; //would be nice to margin or at least to transparent
-    margin: 3px;
-    &:hover { background-color: mix($fg_color, $bg_color, 80%); }
-    &:active { background-color: $selected_bg_color; }
-  }
-}
-
-/* Slider */
-
-.slider {
-  height: 1em;
-  -barlevel-height: 0.3em;
-  -barlevel-background-color: transparentize($fg_color, 0.9); //background of the trough
-  -barlevel-border-color: $borders_color; //trough border color
-  -barlevel-active-background-color: $selected_bg_color; //active trough fill
-  -barlevel-active-border-color: $selected_borders_color; //active trough border
-  -barlevel-overdrive-color: $destructive_color;
-  -barlevel-overdrive-border-color: darken($destructive_color,10%);
-  -barlevel-overdrive-separator-width: 0.2em;
-  -barlevel-border-width: 1px;
-  -slider-handle-radius: 8px;
-  -slider-handle-border-width: 1px;
-  -slider-handle-border-color: $borders_color;
-  color: if($variant == 'light', lighten($bg_color, 10%), darken($bg_color,4%));
-  &:hover { color: $_hover_bg_color; }
-  &:active { color: $_active_bg_color; }
-}
-
-/* Check Boxes */
-
-.check-box {
-  StBoxLayout { spacing: .8em; }
-  StBin {
-    width: 24px;
-    height: 22px;
-    background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg");
-  }
-  &:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
-  &:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
-  &:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
-}
-
-/* Switches */
-.toggle-switch {
-  color: $fg_color;
-  width: 46px;
-  height: 22px;
-  background-size: contain;
-  background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-off.svg"),
-					    url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"));
-  &:checked { 
-    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-on.svg"),
-					    url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"));
-  }
-}
-
-/* links */
-.shell-link {
-  color: $link_color;
-  &:hover { color: lighten($link_color,10%); }
-}
-
-/* Modal Dialogs */
-
-.headline { font-size: 110%; }
-.lightbox { background-color: black; }
-.flashspot { background-color: white; }
-
-.modal-dialog {
-  border-radius: $modal_radius;
-  @extend %bubble-panel;
-  .modal-dialog-content-box {
-    padding: 24px;
-  }
-  .run-dialog-entry { width: 20em; margin-bottom: 6px; }
-  .run-dialog-error-box {
-    padding-top: 16px;
-    spacing: 6px;
-  }
-  .run-dialog-button-box { padding-top: 1em; }
-  .run-dialog-label {
-    @include fontsize($font-size + 1.1);
-    font-weight: normal;
-    color: $fg_color;
-    padding-bottom: .4em;
-  }
-
-}
-
-  .mount-dialog-subject,
-  .end-session-dialog-subject { //this should be a generic header class
-    @include fontsize($font-size * 1.3);
-  }
-
-/* Message Dialog */
-  .message-dialog-main-layout {
-    padding: 12px 20px 0;
-    spacing: 12px;
-  }
-
-  .message-dialog-content {
-    max-width: 28em;
-    spacing: 20px;
-  }
-
-  .message-dialog-icon {
-    min-width: 48px;
-    icon-size: 48px;
-  }
-
-  .message-dialog-title {
-    font-weight: bold;
-  }
-
-  .message-dialog-subtitle {
-    color: $fg_color;
-    font-weight: bold;
-  }
-
-/* End Session Dialog */
-.end-session-dialog {
-  spacing: 42px;
-  border: 1px solid $_bubble_borders_color;
-}
-
-  .end-session-dialog-list {
-      padding-top: 20px;
-  }
-
-  .end-session-dialog-layout {
-    padding-left: 17px;
-    &:rtl { padding-right: 17px; }
-  }
-
-  .end-session-dialog-description {
-    width: 28em;
-    padding-bottom: 10px;
-    &:rtl {
-      text-align: right;
-    }
-  }
-
-  .end-session-dialog-warning {
-    width: 28em;
-    color: $warning_color;
-    padding-top: 6px;
-    &:rtl {
-      text-align: right;
-    }
-  }
-
-  .end-session-dialog-logout-icon {
-    border-radius: 99px;
-    width: 48px;
-    height: 48px;
-    background-size: contain;
-  }
-
-  .end-session-dialog-shutdown-icon {
-    color: $fg_color;
-    width: 48px;
-    height: 48px;
-  }
-
-  .end-session-dialog-inhibitor-layout {
-    spacing: 16px;
-    max-height: 200px;
-    padding-right: 65px;
-    padding-left: 65px;
-  }
-
-  .end-session-dialog-session-list,
-  .end-session-dialog-app-list {
-    spacing: 1em;
-  }
-
-  .end-session-dialog-list-header {
-    font-weight: bold;
-    &:rtl { text-align: right; }
-  }
-
-  .end-session-dialog-app-list-item,
-  .end-session-dialog-session-list-item {
-    spacing: 1em;
-  }
-
-  .end-session-dialog-app-list-item-name,
-  .end-session-dialog-session-list-item-name {
-    font-weight: bold;
-  }
-
-  .end-session-dialog-app-list-item-description {
-    color: darken($fg_color,5%);
-    font-size: 10pt;
-  }
-
-/* ShellMountOperation Dialogs */
-.shell-mount-operation-icon { icon-size: 48px; }
-
-  .mount-dialog {
-    spacing: 24px;
-
-    .message-dialog-title {
-      padding-top: 10px;
-      padding-left: 17px;
-      padding-bottom: 6px;
-      max-width: 34em;
-    }
-
-    .message-dialog-title:rtl {
-      padding-left: 0px;
-      padding-right: 17px;
-    }
-
-    .message-dialog-body {
-      padding-left: 17px;
-      width: 28em;
-    }
-
-    .message-dialog-body:rtl {
-      padding-left: 0px;
-      padding-right: 17px;
-    }
-  }
-
-  .mount-dialog-app-list {
-    max-height: 200px;
-    padding-top: 24px;
-    padding-left: 49px;
-    padding-right: 32px;
-  }
-
-  .mount-dialog-app-list:rtl {
-    padding-right: 49px;
-    padding-left: 32px;
-  }
-
-  .mount-dialog-app-list-item {
-    color: lighten($fg_color,10%);
-    &:hover { color: $fg_color; }
-    &:ltr { padding-right: 1em; }
-    &:rtl { padding-left: 1em; }
-  }
-
-  .mount-dialog-app-list-item-icon {
-    &:ltr { padding-right: 17px; }
-    &:rtl { padding-left: 17px; }
-  }
-
-  .mount-dialog-app-list-item-name {
-    font-size: 10pt;
-  }
-
-
-/* Password or Authentication Dialog */
-
-.prompt-dialog {
-  @extend %bubble-panel;
-  //this is the width of the entire modal popup
-  width: 34em;
-
-  .message-dialog-main-layout { spacing: 24px; padding: 10px; }
-  .message-dialog-content { spacing: 16px; }
-  .message-dialog-title { color: lighten($fg_color,15%); }
-}
-
-  .prompt-dialog-description:rtl {
-    text-align: right;
-  }
-
-  .prompt-dialog-password-box {
-    spacing: 1em;
-    padding-bottom: 1em;
-  }
-
-  .prompt-dialog-error-label {
-    font-size: 10pt;
-    color: $warning_color;
-    padding-bottom: 8px;
-  }
-
-  .prompt-dialog-info-label {
-    font-size: 10pt;
-    padding-bottom: 8px;
-  }
-
-  .hidden {
-    color: rgba(0,0,0,0);
-  }
-
-  .prompt-dialog-null-label {
-    font-size: 10pt;
-    padding-bottom: 8px;
-  }
-
-  .prompt-dialog-pim-box {
-    spacing: 1em;
-  }
-
-  .prompt-dialog-grid {
-    spacing-rows: 15px;
-    spacing-columns: 1em;
-  }
-
-  .prompt-dialog-keyfiles-box {
-    spacing: 1em;
-  }
-
-  .prompt-dialog-button.button {
-    padding: 8px;
-  }
-
-
-/* Polkit Dialog */
-
-.polkit-dialog-user-layout {
-  padding-left: 10px;
-  spacing: 10px;
-  &:rtl {
-    padding-left: 0px;
-    padding-right: 10px;
-  }
-}
-
-  .polkit-dialog-user-root-label {
-    color: $warning_color;
-  }
-
-  .polkit-dialog-user-icon {
-    border-radius: 99px;
-    background-size: contain;
-    width: 48px;
-    height: 48px;
-  }
-
-/* Audio selection dialog */
-.audio-device-selection-dialog {
-  @extend %bubble-panel;
-  spacing: 30px;
-}
-
-  .audio-selection-content {
-    spacing: 20px;
-    padding: 24px;
-  }
-
-  .audio-selection-title {
-    font-weight: bold;
-    text-align: center;
-  }
-
-  .audio-selection-box {
-    spacing: 20px;
-  }
-
-  .audio-selection-device {
-    border: 1px solid $_bubble_borders_color;
-    border-radius: 12px;
-    &:hover,&:focus { background-color: $_hover_bg_color; }
-    &:active { 
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
-    }
-  }
-
-  .audio-selection-device-box {
-    padding: 20px;
-    spacing: 20px;
-  }
-
-  .audio-selection-device-icon {
-    icon-size: 64px;
-  }
-
-/* Access Dialog */
-.access-dialog {
-  @extend %bubble-panel;
-  spacing: 30px;
-}
-
-/* Geolocation Dialog */
-.geolocation-dialog {
-  @extend %bubble-panel;
-  spacing: 30px;
-}
-
-/* Extension Dialog */
-.extension-dialog {
-  @extend %bubble-panel;
-  .message-dialog-main-layout { spacing: 24px; padding: 10px; }
-  .message-dialog-title { font-weight: normal; color: $fg_color; }
-}
-
-/* Inhibit-Shortcuts Dialog */
-.inhibit-shortcuts-dialog {
-  @extend %bubble-panel;
-  spacing: 30px;
-}
-
-/* Network Agent Dialog */
-
-.network-dialog-secret-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em;
-}
-
-.keyring-dialog-control-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em;
-}
-
-/* Popovers/Menus */
-
-.popup-menu {
-  min-width: 15em;
-  color: $fg_color;
-  border-color: $_bubble_borders_color;
-
-  .popup-menu-arrow { } //defined globally in the TOP BAR
-  .popup-sub-menu {
-    background-color: darken($bg_color,5%);
-    box-shadow: inset 0 -1px 0px $_bubble_borders_color;
-  }
-
-  .popup-menu-content { padding: 1em 0em; }
-  .popup-menu-item {
-    spacing: 12px;
-
-    &:ltr { padding: .4em 1.75em .4em 0em; }
-    &:rtl { padding: .4em 0em .4em 1.75em; }
-    &:checked {
-      background-color: $bg_color;
-      box-shadow: inset 0 -1px 0px $_bubble_borders_color;
-      font-weight: bold;
-    }
-    &.selected {
-      background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
-      color: $fg_color;
-    }
-    &:active { 
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
-     }
-    &:insensitive { color: transparentize($fg_color,.5); }
-  }
-
-  .popup-inactive-menu-item { //all icons and other graphical elements
-    color: $fg_color;
-
-    &:insensitive { color: transparentize($fg_color,0.5); }
-  }
-  //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is
-  &.panel-menu {
-    -boxpointer-gap: 4px;
-    margin-bottom: 1.75em;
-  }
-}
-
-
-
-  .popup-menu-ornament {
-    text-align: right;
-    width: 1.2em;
-  }
-  .popup-menu-boxpointer,
-  .candidate-popup-boxpointer {
-    -arrow-border-radius: $button_radius+4;
-    -arrow-background-color: $bg_color;
-    -arrow-border-width: 1px;
-    -arrow-border-color: if($variant=='light', transparentize(black, 0.6), $borders_color);
-    -arrow-base: 24px;
-    -arrow-rise: 11px;
-    -arrow-box-shadow: 0 1px 3px black; //dreaming. bug #689995
-  }
-
-  .popup-separator-menu-item {
-    //-margin-horizontal: 24px;
-    height: 1px; //not really the whole box
-    margin: 6px 64px;
-    background-color: transparent;
-    border-color: $_bubble_borders_color;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-  }
-
-// Rename popup
-.rename-folder-popup {
-  .rename-folder-popup-item {
-    spacing: 6px;
-    &:ltr, &:rtl { padding: 0, 12px; }
-  }
-}
-
-// Background menu
-.background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; }
-
-/* fallback menu
-- odd thing for styling App menu when apparently not running under shell. Light Adwaita styled
-  app menu inside the main app window itself rather than the top bar
-*/
-
-/*************
- * App Icons *
- *************/
-/* Outline for low res icons */
-.lowres-icon {
-    icon-shadow: 0 1px 2px rgba(0,0,0,0.3);
-}
-
-/* Drapshadow for large icons */
-.icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(0,0,0,0.4);
-}
-
-/* OSD */
-.osd-window {
-  text-align: center;
-  font-weight: bold;
-  spacing: 1em;
-  margin: 32px;
-  min-width: 64px;
-  min-height: 64px;
-
-  .osd-monitor-label { font-size: 3em; }
-  .level {
-    height: 0.6em;
-    -barlevel-height: 0.6em;
-    -barlevel-background-color: transparentize($fg_color, if($variant=='light', 0.2, 0.9));
-    -barlevel-active-background-color: $osd_fg_color;
-    -barlevel-overdrive-color: $destructive_color;
-    -barlevel-overdrive-separator-width: 0.2em;
-  }
-}
-
-/* Pad OSD */
-.pad-osd-window {
-    padding: 32px;
-    background-color: transparentize(black, 0.2);
-
-  .pad-osd-title-box { spacing: 12px; }
-  .pad-osd-title-menu-box { spacing: 6px; }
-}
-
-.combo-box-label {
-    width: 15em;
-}
-
-/* App Switcher */
-.switcher-popup {
-  padding: 8px;
-  spacing: 16px;
-}
-
-.osd-window,
-.resize-popup,
-.switcher-list {
-  @extend %osd-panel;
-}
-
-  .switcher-list-item-container { spacing: 8px;  }
-
-  .switcher-list .item-box {
-    padding: 8px;
-    border-radius: 4px;
-  }
-
-  .switcher-list .item-box:outlined {
-    padding: 6px;
-    border: 2px solid darken($borders_color,10%);
-  }
-
-  .switcher-list .item-box:selected {
-    background-color: transparentize($osd_fg_color, 0.7);
-    color: $selected_fg_color;
-  }
-
-  .switcher-list .thumbnail-box {
-    padding: 2px;
-    spacing: 4px;
-  }
-
-  .switcher-list .thumbnail {
-    width:  256px;
-  }
-
-  .switcher-list .separator {
-    width: 1px;
-    background: $borders_color;
-  }
-
-  .switcher-arrow {
-    border-color: rgba(0,0,0,0);
-    color: transparentize($fg_color,0.2);
-    &:highlighted {
-      color: $fg_color;
-    }
-  }
-
-  .input-source-switcher-symbol {
-    font-size: 34pt;
-    width: 96px;
-    height: 96px;
-  }
-
-/* Window Cycler */
-.cycler-highlight { border: 5px solid $selected_bg_color; }
-
-/* Workspace Switcher */
-.workspace-switcher-group { padding: 12px; }
-
-  .workspace-switcher-container {
-    @extend %osd-panel;
-  }
-
-  .workspace-switcher {
-    background: transparent;
-    border: 0px;
-    border-radius: 0px;
-    padding: 0px;
-    spacing: 8px;
-  }
-
-  .ws-switcher-active-up, .ws-switcher-active-down,
-  .ws-switcher-active-left, .ws-switcher-active-right {
-    height: 52px;
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-    background-size: 32px;
-    border-radius: 8px;
-  }
-
-  .ws-switcher-box {
-    height: 50px;
-    border: 1px solid transparentize($osd_fg_color,0.9);
-    background: transparent;
-    border-radius: 8px;
-  }
-
-%osd-panel {
-  color: $osd_fg_color;
-  background-color: $osd_bg_color;
-  border: 1px solid $osd_outer_borders_color;
-  border-radius: 12px;
-  padding: 12px;
-}
-
-%bubble-entry {
-  color: $fg_color;
-  background-color: darken($bg_color, 2%);
-  border-color: $_bubble_borders_color;
-  box-shadow: none;
-  &:focus { border: 2px solid $selected_bg_color; }
-}
-
-%bubble-panel {
-  color: $fg_color;
-  background-color: $bg_color;
-  border: 1px solid if($variant=='light', transparentize(black, 0.6), $borders_color);
-
-  StEntry { @extend %bubble-entry; }
-  .button {
-    &, &:hover, &:focus, &:active, &:disabled { 
-      box-shadow: none;
-      border-color: $_bubble_borders_color;
-    }
-    background-color: $bg_color;
-    color: $fg_color;
-    &:hover { background-color: $_hover_bg_color; }
-    &:active { 
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
-    }
-    &:disabled { color: $insensitive_fg_color; }
-  }
-}
-
-/* Tiled window previews */
-.tile-preview {
-  background-color: transparentize($selected_bg_color,0.5);
-  border: 1px solid $selected_bg_color;
-}
-
-  .tile-preview-left.on-primary {
-    border-radius: $panel-corner-radius 0 0 0;
-  }
-
-  .tile-preview-right.on-primary {
-    border-radius: 0 $panel-corner-radius 0 0;
-  }
-
-  .tile-preview-left.tile-preview-right.on-primary {
-    border-radius: $panel-corner-radius $panel-corner-radius 0 0;
-  }
-
-/* TOP BAR */
-
-#panel {
-  background-color: black;
-  font-weight: bold;
-  height: 1.86em;
-  font-feature-settings: "tnum";
-
-  &.unlock-screen,
-  &.login-screen,
-  &.lock-screen {
-    background-color: transparent;
-  }
-
-  #panelLeft, #panelCenter { // spacing between activities<>app menu and such
-    spacing: 4px;
-  }
-
-  .panel-corner {
-    -panel-corner-radius: $panel-corner-radius;
-    -panel-corner-background-color: black;
-    -panel-corner-border-width: 2px;
-    -panel-corner-border-color: transparent;
-
-    &:active, &:overview, &:focus {
-      -panel-corner-border-color: lighten($selected_bg_color,5%);
-    }
-
-    &.lock-screen, &.login-screen, &.unlock-screen {
-      -panel-corner-radius: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent;
-    }
-  }
-
-  .panel-button {
-    -natural-hpadding: 12px;
-    -minimum-hpadding: 6px;
-    font-weight: bold;
-    color: #ccc;
-
-    .app-menu-icon {
-      -st-icon-style: symbolic;
-      margin-left: 4px;
-      margin-right: 4px;
-      //dimensions of the icon are hardcoded
-    }
-
-    &:hover {
-      color: $selected_fg_color;
-    }
-
-    &:active, &:overview, &:focus, &:checked {
-      // Trick due to St limitations. It needs a background to draw
-      // a box-shadow
-      background-color: rgba(0, 0, 0, 0.01);
-      box-shadow: inset 0 -2px 0px lighten($selected_bg_color,5%);
-      color: $selected_fg_color;
-    }
-
-    .system-status-icon { icon-size: 1.09em; padding: 0 5px; }
-    .unlock-screen &,
-    .login-screen &,
-    .lock-screen & {
-      color: lighten($fg_color, 10%);
-      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
-    }
-  }
-
-  .panel-status-indicators-box,
-  .panel-status-menu-box {
-    spacing: 2px;
-  }
-
-  // spacing between power icon and (optional) percentage label
-  .power-status.panel-status-indicators-box {
-    spacing: 0;
-  }
-
-  .screencast-indicator { color: $warning_color; }
-
-  .remote-access-indicator { color: $warning_color; }
-}
-
-  // calendar popover
-  #calendarArea {
-    padding: 0.75em 1.0em;
-  }
-
-  .calendar {
-    margin-bottom: 1em;
-  }
-
-    .calendar,
-    .datemenu-today-button,
-    .datemenu-displays-box,
-    .message-list-sections {
-      margin: 0 1.5em;
-    }
-
-    .datemenu-calendar-column { spacing: 0.5em; }
-    .datemenu-displays-section { padding-bottom: 3em; }
-    .datemenu-displays-box { spacing: 1em; }
-
-    .datemenu-calendar-column {
-      border: 0 solid $_bubble_borders_color;
-      &:ltr { border-left-width: 1px; }
-      &:rtl { border-right-width: 1px; }
-    }
-
-    .datemenu-today-button,
-    .world-clocks-button,
-    .weather-button,
-    .events-section-title {
-      border-radius: 4px;
-      padding: .4em;
-    }
-
-    .message-list-section-list:ltr {
-      padding-left: .4em;
-    }
-
-    .message-list-section-list:rtl {
-      padding-right: .4em;
-    }
-
-    .datemenu-today-button,
-    .world-clocks-button,
-    .weather-button,
-    .events-section-title {
-      &:hover, &:focus { background-color: $_hover_bg_color }
-      &:active { background-color: $_active_bg_color }
-    }
-
-    .datemenu-today-button .day-label {
-    }
-
-    .datemenu-today-button .date-label {
-      font-size: 1.5em;
-      font-weight: 300;
-    }
-
-    .world-clocks-header,
-    .weather-header,
-    .events-section-title {
-      color: darken($fg_color,40%);
-      font-weight: bold;
-    }
-
-    .weather-header.location {
-      font-weight: normal;
-      font-size: 0.9em;
-    }
-
-    .world-clocks-grid,
-    .weather-grid {
-      spacing-rows: 0.4em;
-      spacing-columns: 0.8em;
-    }
-
-    .weather-box {
-      spacing: 0.4em;
-    }
-
-    .world-clocks-city {
-      font-weight: bold;
-      font-size: 0.9em;
-    }
-
-    .world-clocks-time {
-      color: darken($fg_color,20%);
-      font-feature-settings: "tnum";
-      font-size: 1.2em;
-    }
-
-    .world-clocks-timezone {
-      color: $fg_color;
-      font-feature-settings: "tnum";
-      font-size: 0.9em;
-    }
-
-    .weather-forecast-icon {
-      icon-size: 2.18em;
-    }
-
-    .weather-forecast-time {
-      color: darken($fg_color,40%);
-      font-size: 0.8em;
-    }
-
-    .calendar-month-label {
-      color: lighten($fg_color,5%);
-      font-weight: bold;
-      padding: 8px 0;
-      &:focus {}
-    }
-
-    .pager-button {
-      background-color: transparent;
-      width: 32px;
-      border-radius: 4px;
-      &:hover, &:focus { background-color: $_hover_bg_color; }
-      &:active { background-color: transparentize($fg_color, 0.84); }
-    }
-
-      .calendar-change-month-back StIcon, .calendar-change-month-forward StIcon { // arrows
-        icon-size: 1.09em;
-      }
-
-    .calendar-day-base {
-      font-size: 80%;
-      text-align: center;
-      width: 2.4em; height: 2.4em;
-      padding: 0.1em;
-      margin: 2px;
-      border-radius: 1.4em;
-      font-feature-settings: "tnum";
-      &:hover, &:focus { background-color: $_hover_bg_color; }
-      &:active,&:selected {
-        color: lighten($selected_fg_color,5%);
-        background-color: $selected_bg_color;
-        border-color: transparent; //avoid jumparound due to today
-      }
-      &.calendar-day-heading {  //day of week heading
-        color: lighten($fg_color,5%);
-        margin-top: 1em;
-        font-size: 70%;
-      }
-    }
-      .calendar-day { //border collapse hack - see calendar.js
-        border-width: 0;
-      }
-      .calendar-day-top { border-top-width: 1px; }
-      .calendar-day-left { border-left-width: 1px; }
-      .calendar-work-day {
-
-      }
-      .calendar-nonwork-day {
-        color: $insensitive_fg_color;
-      }
-      .calendar-today {
-        font-weight: bold;
-        //color: lighten($fg_color,10%);
-        //background-color: darken($bg_color,5%);
-        border: 1px solid $_bubble_borders_color;
-      }
-      .calendar-day-with-events {
-        color: lighten($fg_color,10%);
-        font-weight: bold;
-        background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
-      }
-      .calendar-other-month-day {
-        color: transparentize($fg_color ,0.5);
-        opacity: 0.5;
-      }
-      .calendar-week-number {
-        font-size: 70%;
-        font-weight: bold;
-        width: 2.3em; height: 1.8em;
-        border-radius: 2px;
-        padding: 0.5em 0 0;
-        margin: 6px;
-        background-color: $_bubble_borders_color;
-        color: $fg_color;
-      }
-
-      /* Message list */
-      .message-list {
-        width: 31.5em;
-      }
-
-        .message-list-clear-button.button {
-	  @extend %button;
-          margin: 1.5em 1.5em 0;
-        }
-
-        .message-list-sections {
-          spacing: 1em;
-        }
-
-        .message-list-section,
-        .message-list-section-list {
-          spacing: 0.4em;
-        }
-
-        .message {
-          border: 1px solid $_bubble_borders_color;
-          background-color: lighten($bg_color, 2%);
-          &:hover,&:focus { background-color: $_hover_bg_color; }
-          &:active { background-color: transparentize($fg_color, 0.84) }
-          border-radius: 5px;
-        }
-
-          .message-icon-bin {
-            padding: 0.68em 0.2em 0.68em 0.68em;
-            &:rtl { padding: 0.68em 0.68em 0.68em 0.2em; }
-          }
-
-          .message-icon-bin > StIcon {
-            color: $fg_color;
-            icon-size: 1.09em;
-            -st-icon-style: symbolic;
-          }
-
-          .message-icon-bin > .fallback-window-icon {
-            width: 1.09em;
-            height: 1.09em;
-          }
-
-          .message-secondary-bin {
-            padding: 0 0.82em;;
-          }
-
-          .message-secondary-bin > .event-time {
-            color: $fg_color;
-            font-size: 0.7em;
-            /* HACK: the label should be baseline-aligned with a 1em label,
-                     fake this with some bottom padding */
-            padding-bottom: 0.13em;
-          }
-
-          .message-secondary-bin > StIcon {
-            icon-size: 1.09em;
-          }
-
-          .message-title {
-            color: $fg_color;            
-          }
-
-          .message-content {
-            color: darken($fg_color, 10%);
-            padding: 10px;
-          }
-
-          .message-media-control {
-            padding: 12px;
-            color: lighten($fg_color, 15%);
-
-            &:last-child:ltr { padding-right: 18px; }
-            &:last-child:rtl { padding-left: 18px; }
-            &:hover { color: $fg_color; }
-            &:insensitive { color: darken($fg_color,40%); }
-          }
-
-          .media-message-cover-icon {
-            icon-size: 48px !important;
-            &.fallback {
-              color: lighten($fg_color,10%);
-              background-color: $bg_color;
-              border: 1px solid $bg_color;
-              border-radius: 2px;
-              icon-size: 32px !important;
-              padding: 6px; }
-          }
-
-
-  // a little unstructured mess:
-
-  #appMenu {
-    spacing: 4px;
-
-    .label-shadow { color: transparent; }
-  }
-
-  .app-menu,
-  .app-well-menu {
-    max-width: 27.25em;
-  }
-
-  .aggregate-menu {
-    min-width: 21em;
-    .popup-menu-icon { padding: 0 4px; }
-    .popup-sub-menu .popup-menu-item > :first-child {
-      &:ltr { /* 12px spacing + 2*4px padding */
-              padding-left: 20px; margin-left: 1.09em; }
-      &:rtl { /* 12px spacing + 2*4px padding */
-              padding-right: 20px; margin-right: 1.09em; }
-    }
-  }
-
-  .system-menu-action {
-    -st-icon-style: symbolic;
-    color: $fg_color;
-    border-radius: 32px; /* wish we could do 50% */
-    padding: 13px;
-    border: 1px solid $_bubble_borders_color;
-
-    &:hover, &:focus {
-      background-color: $_hover_bg_color;
-      color: $fg_color;
-      border: none;
-      padding: 14px;
-    }
-    &:active { 
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
-    }
-
-    & > StIcon { icon-size: 16px; }
-  }
-
-// Activities Ripples
-.ripple-box {
-  width: 52px;
-  height: 52px;
-  border-radius: 0 0 52px 0; // radius the size of the box give us the curve
-  background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
-}
-
-.ripple-box:rtl { border-radius: 0 0 0 52px; } // just a simple change to the border radius position
-
-// Rubberband for select-area screenshots
-.select-area-rubberband {
-  background-color: transparentize($selected_bg_color,0.7);
-  border: 1px solid $selected_bg_color;
-}
-
-// Pointer location
-.ripple-pointer-location {
-  width: 50px;
-  height: 50px;
-  border-radius: 25px 25px 25px 25px; // radius the size of the box give us the curve
-  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
-  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
-}
-
-// not really top bar only
-.popup-menu-arrow { icon-size: 1.09em; }
-.popup-menu-icon { icon-size: 1.09em; }
-
-//close buttons
-
-.window-close {
-  background-color: $selected_bg_color;
-  color: white;
-  border-radius: 24px;
-  border: 2px solid $selected_bg_color;
-  height: 24px;
-  width: 24px;
-  -shell-close-overlap: 11px;
-  box-shadow: -1px 1px 5px 0px transparentize(black, 0.5);
-
-  &:hover {
-    background-color: lighten($selected_bg_color, 5%);
-    border-color: lighten($selected_bg_color, 5%);
-  }
-
-  &:active {
-    background-color: darken($selected_bg_color, 5%);
-    border-color: darken($selected_bg_color, 5%);
-  }
-}
-
-// Pointer accessibility notifications
-.pie-timer {
-  width: 60px;
-  height: 60px;
-  -pie-border-width: 3px;
-  -pie-border-color: $selected_bg_color;
-  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-}
-
-/* NETWORK DIALOGS */
-
-.nm-dialog {
-  @extend %bubble-panel;
-  max-height: 34em;
-  min-height: 31em;
-  min-width: 32em;
-}
-
-  .nm-dialog-content {
-    spacing: 20px;
-    padding: 24px;
-  }
-  .nm-dialog-header-hbox { spacing: 10px; }
-  .nm-dialog-airplane-box { spacing: 12px; }
-
-  .nm-dialog-airplane-headline {
-    font-weight: bold;
-    text-align: center;
-  }
-
-  .nm-dialog-airplane-text { color: $fg_color; }
-  .nm-dialog-header-icon { icon-size: 32px; }
-  .nm-dialog-scroll-view { border: 2px solid $borders_color; }
-  .nm-dialog-header { font-weight: bold; }
-
-  .nm-dialog-item {
-    font-size: 110%;
-    border-bottom: 1px solid $borders_color;
-    padding: 12px;
-    spacing: 20px;
-  }
-
-  .nm-dialog-item:selected {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-
-  .nm-dialog-icons { spacing: .5em; }
-  .nm-dialog-icon { icon-size: 16px; }
-  .no-networks-label { color: #999999; }
-  .no-networks-box { spacing: 12px; }
-
-/* OVERVIEW */
-
-#overview {
-  spacing: 24px; //
-}
-
-.overview-controls {
-  padding-bottom: 32px;
-}
-
-  .window-picker { //container around window thumbnails
-    -horizontal-spacing: 16px;
-    -vertical-spacing: 16px;
-    padding: 0 16px 16px;
-
-    &.external-monitor { padding: 16px; }
-  }
-
-  .window-clone-border {
-    $_bg: transparentize(white, 0.65);
-    border: 7px solid $_bg;
-    border-radius: $modal_radius;
-    // For window decorations with round corners we can't match
-    // the exact shape when the window is scaled. So apply a shadow
-    // to fix that case
-    box-shadow: inset 0 0 0 1px $_bg;
-}
-  .window-caption {
-    spacing: 25px;
-    color: $selected_fg_color;
-    background-color: $selected_bg_color;
-    border-radius: 8px;
-    padding: 4px 12px;
-  }
-
-  //search entry
-  .search-entry, %search_entry {
-    width: 320px;
-    padding: 7px 9px;
-    border-radius: 18px;
-    color: $fg_color;
-    background-color: $base_color;
-    border-color: $borders_color;
-    &:focus {
-      padding: 6px 8px;
-      border-width: 2px;
-      border-color: $selected_bg_color;
-    }
-
-    .search-entry-icon { icon-size: 1em; padding: 0 4px; color: $fg_color; }
-
-    &:hover, &:focus {
-      .search-entry-icon { color: transparentize($fg_color,.3); }
-    }
-  }
-
-  //search results
-
-  #searchResultsContent {
-    max-width: 1000px;
-    padding-left: 20px;
-    padding-right: 20px;
-    spacing: 16px;
-  }
-
-  .search-section { spacing: 16px; } // This should be equal to #searchResultsContent spacing
-  .search-section-content { spacing: 32px; } // This is the space between the provider icon and the results container
-  .search-statustext { // "no results"
-    @extend %status_text;
-  }
-  .list-search-results { spacing: 3px; }
-
-  .search-section-separator { height: 2px; background-color: rgba(255, 255, 255, 0.2); }
-
-  .search-section:last-child .search-section-separator { background-color: transparent; }
-
-  .list-search-result-content { spacing: 30px; }
-  .list-search-result-title { color: darken($osd_fg_color,5%); spacing: 12px; }
-  .list-search-result-description { color: darken($osd_fg_color, 30%); }
-  .list-search-provider-details { width: 150px; color: darken($osd_fg_color,5%); margin-top: 0.24em; }
-  .list-search-provider-content { spacing: 20px; }
-  .search-provider-icon { padding: 15px; }
-
-
-  /* DASHBOARD */
-
-  #dash {
-    @extend %overview-panel;
-    font-size: 9pt;
-    padding: 4px 0;
-    border-radius: 0px 9px 9px 0px;
-
-    &:rtl {
-      border-radius: 9px 0 0 9px;
-    }
-
-    .placeholder {
-      background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
-      background-size: contain;
-      height: 24px;
-    }
-
-    .empty-dash-drop-target {
-      width: 24px;
-      height: 24px;
-    }
-
-  }
-
-  .dash-item-container > StWidget {
-    padding: 4px 8px;
-  }
-
-  .dash-label { //osd tooltip
-    border-radius: 7px;
-    padding: 4px 12px;
-    color: $osd_fg_color;
-    background-color: transparentize($osd_bg_color,0.05);
-    border: 1px solid $osd_outer_borders_color;
-    text-align: center;
-    -x-offset: 8px;
-  }
-
-  /* App Vault/Grid */
-  .icon-grid {
-    spacing: 30px;
-    -shell-grid-horizontal-item-size: 136px;
-    -shell-grid-vertical-item-size: 136px;
-
-    .overview-icon { icon-size: 96px; }
-  }
-  //.app-display { spacing: 20px; }
-
-  .system-action-icon {
-    background-color: black;
-    color: white;
-    border-radius: 99px;
-    icon-size: 48px;
-  }
-
-  .app-view-controls { //favorties | all toggle container
-    padding-bottom: 32px;
-  }
-  .app-view-control { //favorties | all toggle button
-    padding: 4px 32px;
-    margin: 0 4px;
-    &, &:hover, &:checked { @include button(undecorated); }
-
-    &, &:hover { color: darken($osd_fg_color, 25%); }
-
-    &:hover { box-shadow: inset 0 -2px darken($osd_fg_color, 25%); }
-
-    &:active {
-      box-shadow: inset 0 -2px $osd_fg_color;
-    }
-
-    &:checked {
-      color: $osd_fg_color;
-      box-shadow: inset 0 -2px $selected_bg_color;
-    }
-
-    &:first-child {
-      border-right-width: 0;
-      border-radius: 0;
-    }
-
-    &:last-child {
-     border-radius: 0;
-    }
-  }
-
-  //Icon tile
-  .search-provider-icon,
-  .list-search-result {
-    @extend %icon_tile;
-    &:focus, &:selected, &:hover {
-      background-color: transparentize($osd_fg_color,.9);
-      transition-duration: 200ms;
-    }
-    &:active, &:checked { background-color: transparentize(darken($osd_bg_color,10%),.1); }
-  }
-  .app-well-app,
-  .app-well-app.app-folder,
-  .show-apps,
-  .grid-search-result {
-    & .overview-icon {
-      @extend %icon_tile;
-    }
-    &:hover .overview-icon,
-    &:focus .overview-icon,
-    &:selected .overview-icon {
-      background-color: transparentize($osd_fg_color,.9);
-      transition-duration: 0ms;
-      border-image: none;
-      background-image: none;
-    }
-    &:drop .overview-icon {
-      background-color: transparentize($selected_bg_color,.15);
-    }
-    &:active .overview-icon,
-    &:checked .overview-icon {
-      background-color: transparentize(darken($osd_bg_color,10%), 0.5);
-    }
-  }
-
-  .app-well-app-running-dot { //running apps indicator
-    width: 10px; height: 3px;
-    background-color: $selected_bg_color;
-    margin-bottom: 2px;
-  }
-
-  %icon_tile {
-    color: $osd_fg_color;
-    border-radius: $button_radius+4;
-    padding: 6px;
-    border: 1px solid transparent;
-    transition-duration: 100ms;
-    text-align: center;
-  }
-
-  .app-well-app.app-folder > .overview-icon {
-    background-color: transparentize($osd_bg_color,.6);
-  }
-
-  .show-apps:checked .show-apps-icon,
-  .show-apps:focus .show-apps-icon {
-    color: white;
-    transition-duration: 100ms;
-  }
-
-
-  // Collections
-  .app-folder-popup { //expanded collection
-    -arrow-border-radius: 8px;
-    -arrow-background-color: transparentize(darken($osd_bg_color,10%), 0.5);
-    -arrow-base: 24px;
-    -arrow-rise: 11px;
-  }
-  .app-folder-popup-bin { padding: 5px; }
-  .app-folder-icon {
-    padding: 5px;
-    spacing-rows: 5px;
-    spacing-columns: 5px;
-  }
-
-  .page-indicator {
-    padding: 15px 20px;
-
-    .page-indicator-icon {
-      width: 12px;
-      height: 12px;
-      background-color: transparent;
-      border: 2px solid rgba(255, 255, 255, 0.4);
-      border-radius: 12px;
-    }
-
-    &:hover .page-indicator-icon { border-color: white; }
-    &:active .page-indicator-icon { border: none; margin: 2px; background-color: white; }
-    &:checked .page-indicator-icon,
-    &:checked:active .page-indicator-icon { background-color: white;}
-  }
-
-  .no-frequent-applications-label { @extend %status_text; }
-
-  .app-well-app > .overview-icon.overview-icon-with-label,
-  .grid-search-result .overview-icon.overview-icon-with-label {
-    padding: 10px 8px 5px 8px;
-    spacing: 4px;
-  }
-
-  // Workspace pager
-  .workspace-thumbnails { //container ala dash
-    @extend %overview-panel;
-    visible-width: 32px; //amount visible before hover
-    spacing: 11px;
-    padding: 8px;
-    border-radius: 9px 0 0 9px;
-    //border-width: 1px 0 1px 1px; //fixme: can't have non unoform borders :(
-    &:rtl { border-radius: 0 9px 9px 0;}
-
-    .placeholder {
-      background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
-      background-size: contain;
-      height: 24px;
-    }
-  }
-  .workspace-thumbnail-indicator {
-    border: 2px solid $selected_bg_color;
-    padding: 1px;
-  }
-
-  //Some hacks I don't even
-  .all-apps,
-  .frequent-apps > StBoxLayout {
-    // horizontal padding to make sure scrollbars or dash don't overlap content
-    padding: 0px 88px 10px 88px;
-  }
-
-%overview-panel {
-  color: $osd_fg_color;
-  background-color: transparentize($osd_bg_color, 0.1);
-  border: none;
-}
-
+// Text
 %status_text {
   font-size: 2em;
   font-weight: bold;
   color: $osd_fg_color;
 }
 
-/* NOTIFICATIONS & MESSAGE TRAY */
+// osd panels
+%osd_panel {
+  color: $osd_fg_color;
+  background-color: $osd_bg_color;
+  border: 1px solid $osd_outer_borders_color;
+  border-radius: $base_border_radius * 2 + 4px;
+  padding: $base_padding * 2;
+}
 
-  .url-highlighter { link-color: lighten($selected_bg_color,10%); }
+// Overview panels 
+// for the dash and workspace switcher
+%overview_panel {
+  color: $osd_fg_color;
+  background-color: transparentize($osd_bg_color, 0.2);
+  border: 1px solid $osd_outer_borders_color;
+}
 
-  // Banners
-  .notification-banner {
-    font-size: 11pt;
-    width: 34em;
-    margin: 5px;
-    border-radius: $modal_radius;
-    border: if($variant == 'light', none, $_bubble_borders_color);
-    min-height: 64px;
-    box-shadow: 0 1px 2px transparentize(black, 0.7);
-    &:hover { background: $bg_color; }
-    &, &:focus, &:active {
-      background-color: $bg_color;
-      .message-title { color: $fg_color }
-      .message-content { color: $fg_color; }
-    }
+// icon tiles
+%icon_tile {
+  border-radius: $base_border_radius + 4px;
+  padding: $base_padding;
+  border: 2px solid transparent;
+  transition-duration: 100ms;
+  text-align: center;
+}
 
-    .message-icon-bin > StIcon {
-      color: $fg_color;
-    }
+// dialogs
+%bubble_panel {
+  color: $fg_color;
+  background-color: $bg_color;
+  border: 1px solid if($variant=='light', rgba(0,0,0, 0.6), $borders_color);
+}
 
-    StEntry { @extend %bubble-entry; }
+// button styling
+%button {
+  border-radius: $base_border_radius;
+  border-style: solid;
+  border-width: 1px;
+  min-height: 22px;
+  padding: $base_padding * 0.5 $base_padding * 4;
 
-    .notification-icon { padding: 5px; }  
-    .notification-content { padding: 5px; spacing: 5px; }
-    .secondary-icon { icon-size: 1.09em; }
-    .notification-actions {
-      padding-top: 0;
-      color: $fg_color;
-      border-top: 1px solid $_bubble_borders_color;
-      spacing: 0px;
-    }
-    .notification-button {
-      @extend %bubble_button;
-      &:focus { box-shadow: none; }
-      padding: 0 16px;
-      min-height: 35px;
-      border: none;
-    }
-  }
-  .summary-source-counter {
-    font-size: 10pt;
-    font-weight: bold;
-    height: 1.6em; width: 1.6em;
-    -shell-counter-overlap-x: 3px;
-    -shell-counter-overlap-y: 3px;
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-    border: 2px solid $fg_color;
-    box-shadow: 0 2px 2px rgba(0,0,0,0.5);
-    border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
+  @include button(normal);
+  &:focus { @include button(focus);}
+  &:hover { @include button(hover);}
+  &:insensitive { @include button(insensitive);}
+  &:active { @include button(active);}
+}
+
+// buttons in dialogs
+%bubble_button {
+  @include button(normal, $shadow: none);
+  padding: $base_padding * 2;
+  border-style: solid;
+  border-width: 1px;
+  border-left-width: 0;
+  border-bottom-width: 0;
+
+  &:insensitive { @include button(insensitive, $shadow: none); }
+  &:hover { @include button(hover, $shadow: none); }
+  &:focus { @include button(focus, $shadow: none); }
+  &:active { @include button(active, $shadow: none); }
+
+  // radius is 2 pixel less to fit in bubble
+  &:first-child {
+    border-radius: 0 0 0 $modal_radius - 2px;
   }
 
-  .secondary-icon { icon-size: 1.09em; }
-
-  //chat bubbles
-  .chat-body { spacing: 5px; }
-  .chat-response { margin: 5px; }
-  .chat-log-message { color: darken($fg_color,10%); }
-  .chat-new-group { padding-top: 1em; }
-  .chat-received {
-    padding-left: 4px;
-    &:rtl { padding-left: 0px; padding-right: 4px; }
+  &:last-child {
+    border-right-width: 0;
+    border-radius: 0 0 $modal_radius - 2px 0;
   }
-  .chat-sent {
-    padding-left: 18pt;
-    color: lighten($fg_color, 15%);
-    &:rtl { padding-left: 0; padding-right: 18pt; }
-  }
-  .chat-meta-message {
-    padding-left: 4px;
-    font-size: 9pt;
-    font-weight: bold;
-    color: lighten($fg_color,18%);
-    &:rtl { padding-left: 0; padding-right: 4px; }
-  }
-
-  //hotplug
-  .hotplug-transient-box {
-    spacing: 6px;
-    padding: 2px 72px 2px 12px;
-  }
-    .hotplug-notification-item {
-      @extend %bubble_button;
-      border: none; box-shadow: none;
-      padding: 2px 10px;
-      &:focus { padding: 1px 71px 1px 11px; }
-    }
-
-    .hotplug-notification-item-icon {
-      icon-size: 24px;
-      padding: 2px 5px;
-    }
-
-    .hotplug-resident-box { spacing: 8px; }
-
-    .hotplug-resident-mount {
-      spacing: 8px;
-      border-radius: 4px;
-      &:hover { background-color: $_hover_bg_color; }
-    }
-
-    .hotplug-resident-mount-label {
-      color: inherit;
-      padding-left: 6px;
-    }
-
-    .hotplug-resident-mount-icon {
-      icon-size: 24px;
-      padding-left: 6px;
-    }
-
-    .hotplug-resident-eject-icon {
-      icon-size: 16px;
-    }
-
-    .hotplug-resident-eject-button {
-      padding: 7px;
-      border-radius: 5px;
-      color: pink;
-    }
-
-/* Eeeky things */
-
-//magnifier
-
-.magnifier-zoom-region {
-  border: 2px solid $selected_bg_color;
-  &.full-screen { border-width: 0; }
-}
-
-//Keyboard
-/* On-screen Keyboard */
-.word-suggestions {
-    font-size: 14pt;
-    spacing: 12px;
-    min-height: 20pt;
-}
-
-#keyboard {
-    background-color: transparentize($osd_bg_color, 0.3);
-
-    .page-indicator {
-        padding: 4px 4px;
-
-        .page-indicator-icon {
-            width: 6px;
-            height: 6px
-        }
-    }
-}
-
-  .key-container {
-    padding: 4px;
-    spacing: 4px;
-  }
-
-  .keyboard-key {
-    $_key_bg: opacify(lighten($osd_bg_color, 9%), 1);
-    background-color: $_key_bg;
-    min-height: 1.2em;
-    min-width: 1.2em;
-    font-size: 16pt;
-    border-radius: $button_radius;
-    border: 1px solid $osd_outer_borders_color;
-    color: $osd_fg_color;
-    &:focus { @include button(focus); }
-    &:hover, &:checked { background-color: lighten($_key_bg, 3%); }
-    &:active { background-color: darken($_key_bg, 2%); }
-    &:grayed { //FIXME
-      background-color: $osd_bg_color;
-      color: $osd_fg_color;
-      border-color: $osd_borders_color;
-    }
-    &.default-key {
-      $_default_key_bg: opacify($osd_bg_color, 1);
-      border-color: $osd_outer_borders_color;
-      background-color: $_default_key_bg;
-      background-size: 20px;
-      &:hover, &:checked { background-color: lighten($_default_key_bg, 3%); }
-      &:active { background-color: darken($_default_key_bg, 2%); }
-    }
-    &.enter-key {
-      border-color: lighten($selected_bg_color, 5%);
-      background-color: $selected_bg_color;
-      background-image: url("resource:///org/gnome/shell/theme/key-enter.svg");
-      &:hover, &:checked { background-color: lighten($selected_bg_color, 3%); }
-      &:active { background-color: darken($selected_bg_color, 2%); }
-    }
-    &.shift-key-lowercase {
-      background-image: url("resource:///org/gnome/shell/theme/key-shift.svg");
-    }
-    &.shift-key-uppercase {
-      background-image: url("resource:///org/gnome/shell/theme/key-shift-uppercase.svg");
-    }
-    &.shift-key-uppercase:latched {
-      background-image: url("resource:///org/gnome/shell/theme/key-shift-latched-uppercase.svg");
-    }
-    &.hide-key {
-      background-image: url("resource:///org/gnome/shell/theme/key-hide.svg");
-    }
-    &.layout-key {
-      background-image: url("resource:///org/gnome/shell/theme/key-layout.svg");
-    }
-  }
-
-  .keyboard-subkeys { //long press on a key popup
-    color: white;
-    -arrow-border-radius: 10px;
-    -arrow-background-color: transparentize($osd_bg_color, 0.3);
-    -arrow-border-width: 2px;
-    -arrow-border-color: $osd_outer_borders_color;
-    -arrow-base: 20px;
-    -arrow-rise: 10px;
-    -boxpointer-gap: 5px;
-  }
-
-.emoji-page {
-  .keyboard-key {
-    background-color: transparent;
-    border: none;
-  }
-}
-
-.emoji-panel {
-  .keyboard-key:latched {
-    border-color: lighten($selected_bg_color, 5%);
-    background-color: $selected_bg_color;
-  }
-}
-
-// IBus Candidate Popup
-
-.candidate-popup-content {
-  padding: 0.5em;
-  spacing: 0.3em;
-}
-
-  .candidate-index {
-    padding: 0 0.5em 0 0;
-    color: darken($fg_color,10%);
-  }
-
-  .candidate-box {
-    padding: 0.3em 0.5em 0.3em 0.5em;
-    border-radius: 4px;
-    &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
-  }
-
-  .candidate-page-button-box {
-    height: 2em;
-    .vertical & { padding-top: 0.5em; }
-    .horizontal & { padding-left: 0.5em; }
-  }
-
-  .candidate-page-button {
-    padding: 4px;
-  }
-
-  .candidate-page-button-previous { border-radius: 4px 0px 0px 4px; border-right-width: 0; }
-  .candidate-page-button-next { border-radius: 0px 4px 4px 0px;  }
-  .candidate-page-button-icon { icon-size: 1em; }
-
-/* Auth Dialogs & Screen Shield */
-
-.user-icon {
-  background-size: contain;
-  color: $osd_fg_color;
-  border-radius: 99px;
-  &:hover {
-    color: lighten($osd_fg_color,30%);
-  }
-}
-
-// LOGIN DIALOG
-
-.login-dialog-banner-view {
-  padding-top: 24px;
-  max-width: 23em;
-}
-
-.login-dialog {
-  //reset
-  border: none;
-  background-color: transparent;
-
-  $_gdm_fg: #f6f5f4;
-  $_gdm_bg: lighten(#2e3436, 19%);
-
-  StEntry {
-    @extend %search_entry;
-    border-radius: $button_radius;
-    @if $variant=='dark' {
-      $_gdm_entry_bg: transparentize(lighten(desaturate(#241f31, 20%), 2%), 0.5);
-      background-color: $_gdm_entry_bg;
-      border-color: $_gdm_entry_bg;    
-      color: $osd_fg_color;
-    }
-  }
-
-  .modal-dialog-button-box { spacing: 3px; }
-  .modal-dialog-button {
-    padding: 4px 18px;
-    box-shadow: 0 1px 3px transparentize($shadow_color, 0.02);
-    background-color: $_gdm_bg;
-    border-color: $_gdm_bg;
-    color: $_gdm_fg;
-
-    $_hover_c: lighten($_gdm_bg, 5%);
-    &:hover, &:focus {
-      background-color: $_hover_c;
-      border-color: $_hover_c;
-    }
-    &:active {
-      $_active_c: darken($_gdm_bg, 5%);
-      box-shadow: none;
-      background-color: $_active_c;
-      border-color: $_active_c;
-    }
-    &:insensitive {
-      @include button(insensitive);
-      border-color: darken($_gdm_bg, 5%);
-      background-color: darken($_gdm_bg, 5%);
-      color: transparentize($_gdm_fg, 0.3);
-    }
-    &:default {
-      @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
-      border-color: $selected_bg_color;
-      &:hover, &:focus { 
-        @include button(hover,$c:$selected_bg_color, $tc:$selected_fg_color);
-        $_def_hover_c: lighten($selected_bg_color, 5%);
-        background-color: $_def_hover_c;
-        border-color: $_def_hover_c;
-      }
-      &:active {
-        @include button(active,$c:$selected_bg_color, $tc:$selected_fg_color);
-        $_def_active_c: darken($selected_bg_color, 5%);
-        background-color: $_def_active_c;
-        border-color: $_def_active_c;
-      }
-      &:insensitive {
-        @include button(insensitive);
-        border-color: darken($selected_bg_color, 10%);
-        background-color: darken($selected_bg_color, 10%);
-        color: transparentize($selected_fg_color, 0.3);
-      }
-    }
-  }
-}
-
-  .login-dialog-logo-bin { padding: 24px 0px; }
-  .login-dialog-banner { color: darken($osd_fg_color,10%); }
-  .login-dialog-button-box { spacing: 5px; }
-  .login-dialog-message-warning { color: $warning_color; }
-  .login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
-  .login-dialog-user-selection-box { padding: 100px 0px; }
-  .login-dialog-not-listed-label {
-    padding-left: 2px;
-    .login-dialog-not-listed-button:focus &,
-    .login-dialog-not-listed-button:hover & {
-      color: $osd_fg_color;
-    }
-  }
-  .login-dialog-not-listed-label {
-    font-size: 90%;
-    font-weight: bold;
-    color: darken($osd_fg_color,30%);
-    padding-top: 1em;
-  }
-
-  .login-dialog-user-list-view { -st-vfade-offset: 1em; }
-  .login-dialog-user-list {
-    spacing: 12px;
-    width: 23em;
-    &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
-    &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
-  }
-  .login-dialog-user-list-item {
-    border-radius: 5px;
-    padding: 6px;
-    color: darken($osd_fg_color,30%);
-    &:ltr .user-widget { padding-right: 1em; }
-    &:rtl .user-widget { padding-left: 1em; }
-    .login-dialog-timed-login-indicator {
-      height: 2px;
-      margin-top: 6px;
-      background-color: $osd_fg_color;
-    }
-    &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
-  }
-
-  .login-dialog-username,
-  .user-widget-label {
-    color: $osd_fg_color;
-    font-size: 120%;
-    font-weight: bold;
-    text-align: left;
-    padding-left: 15px;
-  }
-    .user-widget-label {
-      &:ltr { padding-left: 14px; }
-      &:rtl { padding-right: 14px; }
-    }
-
-  .login-dialog-prompt-layout {
-      padding-top: 24px;
-      padding-bottom: 12px;
-      spacing: 8px;
-      width: 23em;
-  }
-
-  .login-dialog-prompt-label {
-      color: darken($osd_fg_color, 20%);
-      font-size: 110%;
-      padding-top: 1em;
-  }
-
-  .login-dialog-session-list-button StIcon {
-      icon-size: 1.25em;
-  }
-
-  .login-dialog-session-list-button {
-      color: darken($osd_fg_color,30%);
-      &:hover,&:focus { color: $osd_fg_color; }
-      &:active { color: darken($osd_fg_color, 50%); }
-  }
-
-//SCREEN SHIELD
-
-$_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
-
-.screen-shield-arrows {
-    padding-bottom: 3em;
-}
-
-.screen-shield-arrows Gjs_Arrow {
-    color: white;
-    width: 80px;
-    height: 48px;
-    -arrow-thickness: 12px;
-    -arrow-shadow: $_screenshield_shadow;
-}
-
-.screen-shield-clock {
-  color: white;
-  text-shadow: $_screenshield_shadow;
-  font-weight: bold;
-  text-align: center;
-  padding-bottom: 1.5em;
-}
-
-.screen-shield-clock-time {
-  font-size: 72pt;
-  text-shadow: $_screenshield_shadow;
-  font-feature-settings: "tnum";
-}
-
-.screen-shield-clock-date { 
-  font-size: 28pt;
-  font-weight: normal;
-}
-
-.screen-shield-notifications-container {
-  spacing: 6px;
-  width: 30em;
-  background-color: transparent;
-  max-height: 500px;
-  .summary-notification-stack-scrollview {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-  .notification,
-  .screen-shield-notification-source {
-    padding: 12px 6px;
-    border: 1px solid $osd_outer_borders_color;
-    background-color: transparentize($osd_bg_color,0.5);
-    color: $osd_fg_color;
-    border-radius: 4px;
-  }
-  .notification { margin-right: 15px; } //compensate for space allocated to the scrollbar
-}
-
-
-.screen-shield-notification-label {
-  font-weight: bold;
-  padding: 0px 0px 0px 12px;
-}
-
-.screen-shield-notification-count-text { padding: 0px 0px 0px 12px; }
-
-#panel.lock-screen { background-color: transparentize($osd_bg_color, 0.5); }
-
-.screen-shield-background { //just the shadow, really
-  background: black;
-  box-shadow: 0px 2px 4px transparentize(black,0.6);
-}
-
-#lockDialogGroup {
-  background: lighten(#2e3436, 8%) url(resource:///org/gnome/shell/theme/noise-texture.png);
-  background-repeat: repeat;
-}
-
-#screenShieldNotifications {
-  StButton#vhandle, StButton#hhandle {
-    background-color: transparentize($bg_color,0.7);
-    &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
-    &:active { background-color: transparentize($selected_bg_color,0.5); }
+  
+  &:first-child:last-child {
+    border-radius: 0 0 $modal_radius - 2px $modal_radius - 2px;
   }
 }
 
 
-// Looking Glass
-#LookingGlassDialog {
-  background-color: rgba(0,0,0,0.80);
-  spacing: 4px;
-  padding: 4px;
-  border: 2px solid grey;
-  border-radius: 4px;
-  & > #Toolbar {
-    border: 1px solid grey;
-    border-radius: 4px;
-  }
-  .labels { spacing: 4px; }
-  .notebook-tab {
-    -natural-hpadding: 12px;
-    -minimum-hpadding: 6px;
-    font-weight: bold;
-    color: #ccc;
-    transition-duration: 100ms;
-    padding-left: .3em;
-    padding-right: .3em;
-    &:hover {
-      color: white;
-      text-shadow: black 0px 2px 2px;
-    }
-    &:selected {
-      border-bottom-width: 2px;
-      border-color: lighten($selected_bg_color,5%);
-      color: white;
-      text-shadow: black 0px 2px 2px;
-    }
-  }
-  StBoxLayout#EvalBox { padding: 4px; spacing: 4px; }
-  StBoxLayout#ResultsArea { spacing: 4px; }
-}
+// notification styling
+@mixin notification_bubble($flat: false) {
+  border-width: 1px;
+  border-style: solid;
+  border-radius: $base_border_radius + 2px;
+  margin: $base_margin;
 
-  .lg-dialog {
-    StEntry {
-      selection-background-color: #bbbbbb;
-      selected-color: #333333;
-    }
-    .shell-link {
-      color: #999999;
-      &:hover { color: #dddddd; }
-     }
+  @if $flat {
+    @include button(undecorated);
+  } @else {
+    @include button(normal);
   }
 
-  .lg-completions-text {
-      font-size: .9em;
-      font-style: italic;
+  &:focus {
+    @include button(focus);
   }
 
-  .lg-obj-inspector-title {
-      spacing: 4px;
+  &:hover {
+    @include button(hover);
   }
 
-  .lg-obj-inspector-button {
-      border: 1px solid gray;
-      padding: 4px;
-      border-radius: 4px;
-      &:hover { border: 1px solid #ffffff; }
+  &:active {
+    @include button(active);
   }
-
-  #lookingGlassExtensions { padding: 4px; }
-
-  .lg-extensions-list {
-      padding: 4px;
-      spacing: 6px;
-  }
-
-  .lg-extension {
-      border: 1px solid #6f6f6f;
-      border-radius: 4px;
-      padding: 4px;
-  }
-
-  .lg-extension-name {
-      font-weight: bold;
-  }
-
-  .lg-extension-meta {
-      spacing: 6px;
-  }
-
-  #LookingGlassPropertyInspector {
-    background: rgba(0, 0, 0, 0.8);
-    border: 2px solid grey;
-    border-radius: 4px;
-    padding: 6px;
-  }
+}
diff --git a/data/gnome-shell-sass/_drawing.scss b/data/gnome-shell-sass/_drawing.scss
index 8f4611c..4ca723b 100644
--- a/data/gnome-shell-sass/_drawing.scss
+++ b/data/gnome-shell-sass/_drawing.scss
@@ -2,7 +2,7 @@
 
 // generic drawing of more complex things
 
-@function _widget_edge($c:$borders_edge) {
+@function draw_widget_edge($c:$borders_edge) {
 // outer highlight "used" on most widgets
   @return 0 1px $c;
 }
@@ -13,7 +13,7 @@
   //font-size: ($size / $base) * 1rem;
 }
 
-@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
+@mixin draw_shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
 //
 // Helper function to stack up to 4 box-shadows;
 //
@@ -31,8 +31,7 @@
 //
 // $t: entry type
 // $fc: focus color
-// $edge: set to none to not draw the bottom edge or specify a color to not
-//        use the default one
+// $edge: set to none to not draw the bottom edge or specify a color to not use the default one
 //
 // possible $t values:
 // normal, focus, insensitive
@@ -45,8 +44,9 @@
   }
   @if $t==focus {
     border-color: if($fc==$selected_bg_color,
-                     $selected_borders_color,
-                     darken($fc,35%));
+              $selected_borders_color,
+              darken($fc,35%));
+    box-shadow: inset 0 0 0 1px $fc;
   }
   @if $t==hover { }
   @if $t==insensitive {
@@ -58,36 +58,39 @@
 
 // buttons
 
-@function _border_color ($c) { @return darken($c,25%); } // colored buttons want
-                                                         // the border form the
-                                                         // base color
-
-@function _text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
+@function draw_border_color ($c) {
+  //
+  // colored buttons want the border form the base color
+  //
+  @return if($variant == 'light', darken($c, 18%), darken($c, 4%));
+}
+
+@function draw_text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
 //
 // calculate the color of text shadows
 //
 // $tc is the text color
 // $bg is the background color
 //
-  $_lbg: lightness($bg)/100%;
-  @if lightness($tc)<50% { @return transparentize(white,1-$_lbg/($_lbg*1.3)); }
-  @else { @return transparentize(black,$_lbg*0.8); }
-}
-
-@function _button_hilight_color($c) {
+  $lbg: lightness($bg)/100%;
+  @if lightness($tc)<50% { @return rgba(255,255,255,$lbg/($lbg*1.3)); }
+  @else { @return rgba(0,0,0,1-$lbg*0.8); }
+}
+
+@function draw_button_hilight_color($c) {
 //
 // calculate the right top hilight color for buttons
 //
 // $c: base color;
 //
   @if lightness($c)>90% { @return white; }
-  @else if lightness($c)>80% { @return transparentize(white, 0.3); }
-  @else if lightness($c)>50% { @return transparentize(white, 0.5); }
-  @else if lightness($c)>40% { @return transparentize(white, 0.7); }
-  @else { @return transparentize(white, 0.9); }
-}
-
-@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
+  @else if lightness($c)>80% { @return rgba(255,255,255, 0.7); }
+  @else if lightness($c)>50% { @return rgba(255,255,255, 0.5); }
+  @else if lightness($c)>40% { @return rgba(255,255,255, 0.3); }
+  @else { @return rgba(255,255,255, 0.1); }
+}
+
+@mixin draw_button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
 //
 // helper function for the text emboss effect
 //
@@ -96,19 +99,19 @@
 // TODO: this functions needs a way to deal with special cases
 //
 
-  $_shadow: _text_shadow_color($tc, $bg);
+  $shadow: draw_text_shadow_color($tc, $bg);
 
   @if lightness($tc)<50% {
-    text-shadow: 0 1px $_shadow;
-    icon-shadow: 0 1px $_shadow;
+    text-shadow: 0 1px $shadow;
+    icon-shadow: 0 1px $shadow;
   }
   @else {
-    text-shadow: 0 -1px $_shadow;
-    icon-shadow: 0 -1px $_shadow;
-  }
-}
-
-@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) {
+    text-shadow: 0 -1px $shadow;
+    icon-shadow: 0 -1px $shadow;
+  }
+}
+
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge, $shadow: $shadow_color) {
 //
 // Button drawing function
 //
@@ -117,6 +120,8 @@
 // $tc:   optional text color for colored* types
 // $edge: set to none to not draw the bottom edge or specify a color to not
 //        use the default one
+// $shadow: set to none to not draw the drop shadow or specify a color to not
+//          use the default one
 //
 // possible $t values:
 // normal, hover, active, insensitive, insensitive-active,
@@ -124,59 +129,53 @@
 // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
 //
 
-  $_hilight_color: _button_hilight_color($c);
-  $_button_edge: if($edge == none, none, _widget_edge($edge));
-  $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
-  $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
-
+  $hilight_color: draw_button_hilight_color($c);
+  $button_edge: if($edge == none, none, draw_widget_edge($edge));
+  $blank_edge: if($edge == none, none, draw_widget_edge(transparentize($edge,1)));
+  $button_shadow: if($shadow == none, none, 0 1px 1px 0 $shadow);
+
+  // normal button
   @if $t==normal {
-  //
-  // normal button
-  //
-
-    color: $tc;
-    background-color: $c;
-    border-color: $borders_color;
-    box-shadow: $_button_shadow;
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
-  }
+    color: $tc;
+    background-color: lighten($c, 3%);
+    border-color: draw_border_color($c);
+    @include draw_shadows($button_shadow);
+    // box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+    text-shadow: 0 1px $text_shadow_color;
+    icon-shadow: 0 1px $text_shadow_color;
+  }
+
+  // focused button
   @if $t==focus {
-  //
-  // focused button
-  //  
-    color: $tc;
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
-    box-shadow: inset 0px 0px 0px 2px $selected_bg_color;
+    color: $tc;
+    text-shadow: 0 1px $text_shadow_color;
+    icon-shadow: 0 1px $text_shadow_color;
+    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4);
     //border-color: $selected_bg_color;
   }
 
+  // hover button
   @else if $t==hover {
-  //
-  // active osd button
-  //
-    color: $tc;
-    border-color: $borders_color;
-    background-color: $c;
-    box-shadow: $_button_shadow;
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
-
-  }
+    color: $tc;
+    background-color: lighten($c, if($variant == 'light', 8%, 5%));
+    border-color: if($variant == 'light', draw_border_color(lighten($c, 7%)), draw_border_color($c));
+    @include draw_shadows($button_shadow);
+    text-shadow: 0 1px $text_shadow_color;
+    icon-shadow: 0 1px $text_shadow_color;
+  }
+
+  // active button
   @else if $t==active {
-  //
-  // active osd button
-  //
-    color: $tc;
-    border-color: $borders_color;
-    background-color: $c;
+    color: $tc;
+    background-color: darken($c,3%);
+    border-color: draw_border_color(if($variant == 'light', $c, darken($c,7%)));
     text-shadow: none;
     icon-shadow: none;
     box-shadow: none;
   }
+
+  // insensitive button
   @else if $t==insensitive {
-
     color: $insensitive_fg_color;
     border-color: $insensitive_borders_color;
     background-color: $insensitive_bg_color;
@@ -184,19 +183,49 @@
     text-shadow: none;
     icon-shadow: none;
   }
+
+  // reset
   @else if $t==undecorated {
-  //
-  // reset
-  //
     border-color: transparent;
     background-color: transparent;
     background-image: none;
-
-    @include _shadows(inset 0 1px transparentize(white,1),
-                      $_blank_edge);
-
+    @include draw_shadows(inset 0 1px rgba(255,255,255,0),$blank_edge);
     text-shadow: none;
     icon-shadow: none;
   }
 }
 
+// overview icons
+@mixin overview-icon($color) {
+  .overview-icon {
+    @extend %icon_tile;
+    color: $color;
+  }
+
+  &:hover,
+  &:selected {
+    .overview-icon {
+      background-color: transparentize($color, .9);
+    }
+  }
+
+  &:focus {
+    .overview-icon {
+      background-color: transparentize($color, .7);
+      // border-color: $selected_bg_color;
+    }
+  }
+
+  &:drop {
+    .overview-icon {
+      background-color: transparentize($selected_bg_color, .15);
+    }
+  }
+
+  &:active,
+  &:checked {
+    .overview-icon {
+      background-color: transparentize(darken($osd_bg_color, 10%), .5);
+    }
+  }
+}
diff --git a/data/gnome-shell-sass/_high-contrast-colors.scss b/data/gnome-shell-sass/_high-contrast-colors.scss
index cba0145..7101793 100644
--- a/data/gnome-shell-sass/_high-contrast-colors.scss
+++ b/data/gnome-shell-sass/_high-contrast-colors.scss
@@ -22,11 +22,10 @@
 
 $osd_fg_color: #eeeeec;
 $osd_bg_color: #2e3436;
-$osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.9);
+$osd_borders_color: rgba(0,0,0, 0.7);
+$osd_outer_borders_color: rgba(255,255,255, 0.1);
 
-$tooltip_borders_color: $osd_outer_borders_color;
-$shadow_color: transparentize(black, 0.9);
+$shadow_color: rgba(0,0,0, 0.1);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
diff --git a/data/gnome-shell-sass/_widgets.scss b/data/gnome-shell-sass/_widgets.scss
new file mode 100644
index 0000000..87dab2a
--- /dev/null
+++ b/data/gnome-shell-sass/_widgets.scss
@@ -0,0 +1,51 @@
+//
+// Shell widgets stylesheets are placed in separate .scss files
+// in 'widgets' and imported into the main stylesheet in this file.
+// To create or update a widget for the shell modify the list below.
+//
+
+/* WIDGETS */
+
+// Primary widgets
+@import 'widgets/base';
+@import 'widgets/entries';
+@import 'widgets/buttons';
+@import 'widgets/check-box';
+@import 'widgets/switches';
+@import 'widgets/slider';
+@import 'widgets/scrollbars';
+// Popovers
+@import 'widgets/popovers';
+@import 'widgets/calendar';
+@import 'widgets/message-list';
+@import 'widgets/ibus-popup';
+// Notifications
+@import 'widgets/notifications';
+@import 'widgets/hotplug';
+// Dialogs
+@import 'widgets/dialogs';
+@import 'widgets/network-dialog';
+// OSDs
+@import 'widgets/osd';
+@import 'widgets/switcher-popup';
+@import 'widgets/workspace-switcher';
+// Panel
+@import 'widgets/panel';
+@import 'widgets/corner-ripple';
+// Overview
+@import 'widgets/overview';
+@import 'widgets/window-picker';
+@import 'widgets/search-entry';
+@import 'widgets/search-results';
+@import 'widgets/app-grid';
+@import 'widgets/dash';
+@import 'widgets/workspace-thumbnails';
+// A11y / misc
+@import 'widgets/a11y';
+@import 'widgets/misc';
+@import 'widgets/tiled-previews';
+@import 'widgets/keyboard';
+@import 'widgets/looking-glass';
+// Lock / login screens
+@import 'widgets/login-dialog';
+@import 'widgets/screen-shield';
diff --git a/data/gnome-shell-sass/widgets/_a11y.scss b/data/gnome-shell-sass/widgets/_a11y.scss
new file mode 100644
index 0000000..31b5c4b
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_a11y.scss
@@ -0,0 +1,24 @@
+// Pointer location
+.ripple-pointer-location {
+  width: $ripple_size;
+  height: $ripple_size;
+  border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
+  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
+  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
+}
+
+// Pointer accessibility notifications
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: $selected_bg_color;
+  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
+}
+
+// Screen zoom/Magnifier
+.magnifier-zoom-region {
+  border: 2px solid $selected_bg_color;
+
+  &.full-screen { border-width: 0; }
+}
diff --git a/data/gnome-shell-sass/widgets/_app-grid.scss b/data/gnome-shell-sass/widgets/_app-grid.scss
new file mode 100644
index 0000000..1d2e135
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_app-grid.scss
@@ -0,0 +1,182 @@
+/* App Grid */
+
+$app_icon_size: 96px;
+$app_icon_padding: 24px;
+
+// app icons
+.icon-grid {
+  -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2;
+  -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2;
+  spacing: $base_spacing * 6;
+
+  .overview-icon {
+    icon-size: $app_icon_size;
+  }
+}
+
+//.app-display { spacing: 20px; }
+
+/* App Icons */
+
+$app_grid_fg_color: #fff;
+
+// Icon tiles in the app grid
+.app-well-app,
+%app-well-app {
+  @include overview-icon($app_grid_fg_color);
+
+  .overview-icon.overview-icon-with-label {
+    padding: 10px 8px 5px 8px;
+
+    > StBoxLayout {
+      spacing: $base_spacing;
+    }
+  }
+}
+
+/* App Folders */
+.app-well-app.app-folder {
+  background-color: transparentize($osd_bg_color, 0.8);
+  border-radius: $base_border_radius + 4px; // same as %icon_tile
+}
+
+// expanded folder
+.app-folder-dialog {
+  border-radius: $modal_radius * 1.5;
+  border: 1px solid $osd_outer_borders_color;
+  spacing: 12px;
+  background-color: transparentize(darken($osd_bg_color,10%), 0.05);
+
+  & .folder-name-container {
+    padding: 24px 36px 0;
+    spacing: 12px;
+
+    & .folder-name-label,
+    & .folder-name-entry {
+      font-size: 18pt;
+      font-weight: bold;
+    }
+
+    & .folder-name-entry { width: 300px }
+
+    /* FIXME: this is to keep the label in sync with the entry */
+    & .folder-name-label { padding: 5px 7px; color: $osd_fg_color; }
+
+    & .edit-folder-button {
+      @extend %button;
+
+      padding: 0;
+      width: 36px;
+      height: 36px;
+      border-radius: 18px;
+
+      & > StIcon { icon-size: 16px }
+    }
+  }
+}
+.app-folder-dialog-container {
+  padding: 12px;
+  width: 800px;
+  height: 600px;
+}
+
+.app-folder-icon {
+  padding: $base_padding;
+  spacing-rows: $base_spacing;
+  spacing-columns: $base_spacing;
+}
+
+
+// Running app indicator (also shown in dash)
+.app-well-app-running-dot {
+  height: 5px;
+  width: 5px;
+  border-radius:5px;
+  background-color: $osd_fg_color;
+  margin-bottom: 1px;
+}
+
+// Rename popup for app folders
+.rename-folder-popup {
+  .rename-folder-popup-item {
+    spacing: $base_spacing;
+    &:ltr, &:rtl { padding: 0 $base_padding * 2; }
+  }
+}
+
+// right-click app menu
+.app-menu,
+.app-well-menu {
+  max-width: 27.25em;
+}
+
+// App Grid pagination indicators
+.page-indicator {
+  padding: 15px 20px;
+
+  .page-indicator-icon {
+    width: 10px;
+    height: 10px;
+    border-radius: 10px; // the same as height&width
+    background-color: white;
+  }
+}
+
+// Some hacks I don't even know
+.all-apps,
+.frequent-apps > StBoxLayout {
+  // horizontal padding to make sure scrollbars or dash don't overlap content
+  padding: 0px 88px 10px 88px;
+}
+
+// Label when no frequent apps
+.no-frequent-applications-label { @extend %status_text; }
+
+// shutdown and other actions in the grid
+.system-action-icon {
+  background-color: rgba(0,0,0,0.8);
+  color: #fff;
+  border-radius: 99px;
+  icon-size: $app_icon_size * 0.5;
+}
+
+/* Frequent | All toggle */
+
+// container
+.app-view-controls { 
+  padding-bottom: 32px;
+}
+
+// buttons
+.app-view-control {
+  padding: 4px 32px;
+  margin: 0 4px;
+
+  &, &:hover, &:checked {
+    @include button(undecorated);
+    color: darken($osd_fg_color, 25%);
+  }
+
+  &:hover {
+    color: $osd_fg_color;
+    box-shadow: inset 0 -2px darken($osd_fg_color, 25%);
+  }
+
+  &:active {
+    box-shadow: inset 0 -2px $osd_fg_color;
+  }
+
+  &:checked {
+    color: $osd_fg_color;
+    box-shadow: inset 0 -2px $selected_bg_color;
+  }
+
+  &:first-child {
+    border-right-width: 0;
+    border-radius: 0;
+  }
+
+  &:last-child {
+    border-radius: 0;
+  }
+}
diff --git a/data/gnome-shell-sass/widgets/_base.scss b/data/gnome-shell-sass/widgets/_base.scss
new file mode 100644
index 0000000..914dd59
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_base.scss
@@ -0,0 +1,18 @@
+// Links
+.shell-link {
+  color: $link_color;
+
+  &:hover {
+    color: lighten($link_color, 10%);
+  }
+}
+
+// Outline for low res icons
+.lowres-icon {
+  icon-shadow: 0 1px 2px rgba(black, 0.3);
+}
+
+// Dropshadow for large icons
+.icon-dropshadow {
+  icon-shadow: 0 1px 2px rgba(black, 0.4);
+}
diff --git a/data/gnome-shell-sass/widgets/_buttons.scss b/data/gnome-shell-sass/widgets/_buttons.scss
new file mode 100644
index 0000000..709ac46
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_buttons.scss
@@ -0,0 +1,5 @@
+/* Buttons */
+
+.button {
+  @extend %button; // that's it
+}
diff --git a/data/gnome-shell-sass/widgets/_calendar.scss b/data/gnome-shell-sass/widgets/_calendar.scss
new file mode 100644
index 0000000..8074b21
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_calendar.scss
@@ -0,0 +1,262 @@
+/* Date/Time Menu */
+
+.clock-display-box {
+  spacing: $base_spacing / 2;
+
+  .clock {
+    padding-left: $base_padding;
+    padding-right: $base_padding;
+  }
+}
+
+// overall menu
+#calendarArea {
+  padding:0;
+}
+
+// Calendar menu side column
+.datemenu-calendar-column {
+  spacing: $base_spacing;
+  border: 0 solid $bubble_borders_color;
+  padding: 0 $base_padding * 2;
+
+  &:ltr {margin-right: $base_margin * 2; border-left-width: 1px; }
+  &:rtl {margin-left: $base_margin * 2; border-right-width: 1px; }
+
+  .datemenu-displays-section {
+  }
+
+  .datemenu-displays-box {
+    spacing: $base_spacing;
+  }
+}
+
+.events-section-title {
+  @include notification_bubble($flat: true);
+  color: desaturate(darken($fg_color,40%), 10%);
+  font-weight: bold;
+  padding: .4em;
+}
+
+/* today button (the date) */
+.datemenu-today-button {
+  @include notification_bubble($flat: true);
+  padding: $base_padding * 1.5;
+
+  // weekday label
+  .day-label {
+    @include fontsize($base_font_size+1);
+    font-weight: bold;
+  }
+
+  // date label
+  .date-label {
+    @include fontsize($base_font_size+7);
+    font-weight: 1000;
+  }
+}
+
+/* Calendar */
+.calendar {
+  @include notification_bubble;
+  padding: $base_padding;
+
+  // month
+  .calendar-month-label {
+    color: lighten($fg_color,5%);
+    font-weight: bold;
+    padding: 8px 0;
+    &:focus {}
+  }
+
+  // prev/next month icons
+  .calendar-change-month-back StIcon,
+  .calendar-change-month-forward StIcon {
+    icon-size: $base_icon_size;
+  }
+
+  .pager-button {
+    background-color: transparent;
+    height: 32px;
+    width: 32px;
+    border-radius: $base_border_radius;
+    &:hover, &:focus { background-color: lighten($hover_bg_color, 5%); }
+    &:active { background-color: $active_bg_color; }
+  }
+
+
+  $calendar_day_size: 32px;
+
+  .calendar-day-base {
+    @include fontsize($base_font_size - 3);
+    text-align: center;
+    width: $calendar_day_size;
+    height: $calendar_day_size;
+    padding: 0;
+    margin: 2px;
+    border-radius: $calendar_day_size * 0.5 + 2px;
+    border: 1px solid transparent; //avoid jumparound due to today
+    font-feature-settings: "tnum";
+    &:hover, &:focus { background-color: $hover_bg_color; }
+    &:active,&:selected {
+      color: lighten($fg_color,10%);
+      background-color: darken($bg_color,5%);
+    }
+
+    // day of week heading
+    &.calendar-day-heading {
+      color: lighten($fg_color,10%);
+      margin-top: 1em;
+      @include fontsize($base_font_size - 4);
+    }
+  }
+
+  .calendar-day { //border collapse hack - see calendar.js
+    border-width: 0;
+  }
+
+  .calendar-day-top {
+    border-top-width: 1px;
+  }
+
+  .calendar-day-left {
+    border-left-width: 1px;
+  }
+
+  .calendar-work-day {}
+
+  .calendar-nonwork-day {
+    color: $insensitive_fg_color;
+  }
+
+  // Today
+  .calendar-today {
+    font-weight: bold;
+    border: 1px solid transparent;
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+
+    &:hover,&:focus {
+      background-color:lighten($selected_bg_color, 3%);
+      color: $selected_fg_color;
+    }
+
+    &:active,&:selected {
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+
+      &:hover,&:focus {
+        background-color:lighten($selected_bg_color, 3%);
+        color: $selected_fg_color;
+      }
+    }
+  }
+
+  .calendar-day-with-events {
+    color: lighten($fg_color,10%);
+    font-weight: bold;
+    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
+  }
+
+  .calendar-other-month-day {
+    color: transparentize($fg_color ,0.5);
+  }
+
+  .calendar-week-number {
+    @include fontsize($base_font_size - 4);
+    font-weight: bold;
+    height: 1.8em;
+    width: 2.3em; 
+    border-radius: 2px;
+    padding: 0.5em 0 0;
+    margin: 6px;
+    background-color: darken($bg_color, 2%);
+    color: lighten($fg_color, 5%);
+  }
+}
+
+/* World clocks */
+.world-clocks-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .world-clocks-grid {
+    spacing-rows: $base_spacing;
+    spacing-columns: $base_spacing * 2;
+  }
+
+  // title
+  .world-clocks-header {
+    color: desaturate(darken($fg_color,40%), 10%);
+    font-weight: bold;
+  }
+
+  // city label
+  .world-clocks-city {
+    color: $fg_color;
+    @include fontsize($base_font_size);
+    font-weight: normal;
+  }
+
+  // timezone time
+  .world-clocks-time {
+    font-weight: bold;
+    color: $fg_color;
+    font-feature-settings: "lnum";
+    @include fontsize($base_font_size);
+    text-align: right;
+  }
+
+  // timezone offset label
+  .world-clocks-timezone {
+    color: darken($fg_color,20%);
+    font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 1);
+  }
+}
+
+/* Weather */
+.weather-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .weather-box {
+    spacing: $base_spacing + $base_margin;
+  }
+
+  .weather-header-box {
+    spacing: $base_spacing;
+  }
+
+  .weather-header {
+    color: desaturate(darken($fg_color,40%), 10%);
+    font-weight: bold;
+
+    &.location {
+      font-weight: normal;
+      @include fontsize($base_font_size - 1);
+    }
+  }
+
+  .weather-grid {
+    spacing-rows: $base_spacing;
+    spacing-columns: $base_spacing * 2;
+  }
+
+  .weather-forecast-time {
+    color: darken($fg_color,30%);
+    font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 2);
+    font-weight: normal;
+    padding-top: 0.2em;
+    padding-bottom: 0.4em;
+  }
+
+  .weather-forecast-icon {
+    icon-size: $base_icon_size * 2;
+  }
+
+  .weather-forecast-temp {
+    font-weight: bold;
+  }
+}
diff --git a/data/gnome-shell-sass/widgets/_check-box.scss b/data/gnome-shell-sass/widgets/_check-box.scss
new file mode 100644
index 0000000..fc71467
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_check-box.scss
@@ -0,0 +1,18 @@
+/* Check Boxes */
+
+// these are equal to the size of the SVG assets
+$check_height: 22px;
+$check_width: 24px;
+
+
+.check-box {
+  StBoxLayout { spacing: .8em; }
+  StBin {
+    width: $check_width;
+    height: $check_height;
+    background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg");
+  }
+  &:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
+  &:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
+  &:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_corner-ripple.scss b/data/gnome-shell-sass/widgets/_corner-ripple.scss
new file mode 100644
index 0000000..9137b67
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -0,0 +1,15 @@
+/* Activities Ripple */
+
+$ripple_size: 50px;
+
+.ripple-box {
+  background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
+  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
+  // plus + 2px for the border (box-shadow)
+  width: $ripple_size + 2px;
+  height: $ripple_size + 2px;
+  border-radius: 0 0 $ripple_size + 2px 0; // radius equals the size of the box to give us the curve
+
+  // just a simple change to the border radius position
+  &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
+}
diff --git a/data/gnome-shell-sass/widgets/_dash.scss b/data/gnome-shell-sass/widgets/_dash.scss
new file mode 100644
index 0000000..c639fad
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_dash.scss
@@ -0,0 +1,61 @@
+/* Dash */
+
+$dash_placeholder_size: 32px;
+$dash_spacing: $base_padding + 4px;
+$dash_border_radius: $modal_radius * 1.5;
+
+#dash {
+  @extend %overview_panel;
+  @include fontsize($base_font_size - 2);
+  padding: ($dash_spacing / 2) 0;
+
+  border-radius: 0 $dash_border_radius $dash_border_radius 0; 
+  border-left-width: 0;
+  &:rtl {
+    border-radius: $dash_border_radius 0 0 $dash_border_radius;
+    border-right-width: 0;
+  }
+
+  .placeholder {
+    // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    background-image:none;
+    background-size: contain;
+    height: $dash_placeholder_size;
+  }
+
+  .empty-dash-drop-target {
+    width: $dash_placeholder_size;
+    height: $dash_placeholder_size;
+  }
+}
+
+// Dash Items
+.dash-item-container > StWidget {
+  padding: ($dash_spacing / 2) $dash_spacing;
+}
+
+// OSD Tooltip
+.dash-label {
+  background-color: transparentize($osd_bg_color,0.05);
+  border-radius: $base_border_radius + 2px;
+  border:none;
+  box-shadow:0 0 0 1px $osd_outer_borders_color;
+  color: $osd_fg_color;
+  padding: $base_padding $base_padding + 2px;
+  text-align: center;
+  -x-offset: $base_margin * 2; // distance from the dash edge
+}
+
+// Show apps button
+.show-apps {
+  @include overview-icon($osd_fg_color);
+
+  &:focus,
+  &:checked {
+    .overview-icon {
+      background-color: darken($osd_bg_color,10%);
+      color: $fg_color;
+    }
+  }
+}
+
diff --git a/data/gnome-shell-sass/widgets/_dialogs.scss b/data/gnome-shell-sass/widgets/_dialogs.scss
new file mode 100644
index 0000000..5ad99f8
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_dialogs.scss
@@ -0,0 +1,168 @@
+/* Modal Dialogs */
+
+.headline {
+  @include fontsize($base_font_size + 1);
+}
+
+.modal-dialog {
+  border-radius: $modal_radius;
+  @extend %bubble_panel;
+
+  .modal-dialog-content-box {
+    margin: 32px 40px;
+    spacing: 32px;
+    max-width: 28em;
+  }
+
+  .modal-dialog-linked-button {
+    @extend %bubble_button;
+  }
+}
+
+/* End Session Dialog */
+.end-session-dialog {
+  width: 30em;
+
+  .end-session-dialog-battery-warning,
+  .dialog-list-title {
+    color: $warning_color;
+  }
+}
+
+/* Message Dialog */
+.message-dialog-content {
+  spacing: 18px;
+
+  .message-dialog-title {
+    text-align: center;
+    font-size: 18pt;
+    font-weight: 800;
+
+    &.leightweight {
+      font-size: 13pt;
+      font-weight: 800;
+    }
+  }
+  .message-dialog-description { text-align: center; }
+}
+
+/* Dialog List */
+.dialog-list {
+  spacing: 18px;
+
+  .dialog-list-title {
+    text-align: center;
+    font-weight: bold;
+  }
+
+  .dialog-list-scrollview { max-height: 200px; }
+  .dialog-list-box {
+    spacing: 1em;
+
+    .dialog-list-item {
+      spacing: 1em;
+
+      .dialog-list-item-title { font-weight: bold; }
+      .dialog-list-item-description {
+        color: darken($fg_color,5%);
+        @include fontsize($base_font_size - 1);
+      }
+    }
+  }
+}
+
+/* Run Dialog */
+.run-dialog {
+  .modal-dialog-content-box {
+    margin-top: 24px;
+    margin-bottom: 14px;
+  }
+  .run-dialog-entry { width: 20em; }
+  .run-dialog-description {
+    @include fontsize($base_font_size - 1);
+    text-align: center;
+    color: darken($fg_color, 20%);
+  }
+}
+
+/* Password or Authentication Dialog */
+
+.prompt-dialog {
+  width: 28em;
+
+  .modal-dialog-content-box {
+    margin-bottom: 24px;
+  }
+}
+
+.prompt-dialog-password-grid {
+  spacing-rows: 8px;
+  spacing-columns: 4px;
+
+  .prompt-dialog-password-entry {
+    width: auto;
+
+    // 4px (spacing) + 16px (spinner-width)
+    &:ltr { margin-left: 20px; }
+    &:rtl { margin-right: 20px; }
+  }
+}
+
+.prompt-dialog-password-layout {
+  spacing: 8px;
+}
+
+.prompt-dialog-password-entry {
+  width: 20em;
+}
+
+.prompt-dialog-error-label,
+.prompt-dialog-info-label,
+.prompt-dialog-null-label {
+  text-align: center;
+  @include fontsize($base_font_size - 1);
+}
+
+.prompt-dialog-error-label {
+  color: $warning_color;
+}
+
+
+/* Polkit Dialog */
+
+.polkit-dialog-user-layout {
+  text-align: center;
+  spacing: 8px;
+  margin-bottom: 6px;
+
+  .polkit-dialog-user-icon {
+    border-radius: 99px;
+    background-size: contain;
+  }
+  .polkit-dialog-user-root-label { color: $warning_color; }
+}
+
+/* Audio selection dialog */
+.audio-device-selection-dialog {
+  .modal-dialog-content-box { margin-bottom: 28px; }
+  .audio-selection-box { spacing: 20px; }
+}
+
+.audio-selection-device {
+  border: 1px solid $bubble_borders_color;
+  border-radius: 12px;
+  &:hover,&:focus { background-color: $hover_bg_color; }
+  &:active { 
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+}
+
+.audio-selection-device-box {
+  padding: 20px;
+  spacing: 20px;
+}
+
+.audio-selection-device-icon {
+  icon-size: $base_icon_size * 4;
+}
diff --git a/data/gnome-shell-sass/widgets/_entries.scss b/data/gnome-shell-sass/widgets/_entries.scss
new file mode 100644
index 0000000..0a43e86
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_entries.scss
@@ -0,0 +1,27 @@
+/* Entries */
+
+StEntry {
+  border-radius: $base_border_radius;
+  padding: 8px;
+  border-width: 1px;
+  color: $fg_color;
+  @include entry(normal);
+  //&:hover { @include entry(hover);}
+  &:focus { @include entry(focus);}
+  &:insensitive { @include entry(insensitive);}
+  selection-background-color: $selected_bg_color;
+  selected-color: $selected_fg_color;
+  StIcon.capslock-warning {
+    icon-size: 16px;
+    warning-color: $warning_color;
+    padding: 0 4px;
+  }
+  StIcon.peek-password {
+    icon-size: $base_icon_size;
+    padding: 0 4px;
+  }
+  StLabel.hint-text {
+    margin-left: 2px;
+    color: transparentize($fg_color, 0.3);
+  }
+}
diff --git a/data/gnome-shell-sass/widgets/_hotplug.scss b/data/gnome-shell-sass/widgets/_hotplug.scss
new file mode 100644
index 0000000..acd0265
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_hotplug.scss
@@ -0,0 +1,10 @@
+// hotplug
+
+.hotplug-notification-item {
+  @extend %bubble_button;
+}
+
+.hotplug-notification-item-icon {
+  icon-size: 24px;
+  padding: 0 4px;
+}
diff --git a/data/gnome-shell-sass/widgets/_ibus-popup.scss b/data/gnome-shell-sass/widgets/_ibus-popup.scss
new file mode 100644
index 0000000..eead703
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_ibus-popup.scss
@@ -0,0 +1,35 @@
+// IBus Candidate Popup
+
+.candidate-popup-boxpointer {
+  @extend .popup-menu-boxpointer;
+}
+
+.candidate-popup-content {
+  padding: 0.5em;
+  spacing: 0.3em;
+}
+
+.candidate-index {
+  padding: 0 0.5em 0 0;
+  color: darken($fg_color,10%);
+}
+
+.candidate-box {
+  padding: 0.3em 0.5em 0.3em 0.5em;
+  border-radius: $base_border_radius;
+  &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
+}
+
+.candidate-page-button-box {
+  height: 2em;
+  .vertical & { padding-top: 0.5em; }
+  .horizontal & { padding-left: 0.5em; }
+}
+
+.candidate-page-button {
+  padding: 4px;
+}
+
+.candidate-page-button-previous { border-radius: $base_border_radius 0px 0px $base_border_radius; border-right-width: 0; }
+.candidate-page-button-next { border-radius: 0px $base_border_radius $base_border_radius 0px;  }
+.candidate-page-button-icon { icon-size: 1em; }
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_keyboard.scss b/data/gnome-shell-sass/widgets/_keyboard.scss
new file mode 100644
index 0000000..f866d77
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_keyboard.scss
@@ -0,0 +1,115 @@
+/* On-screen Keyboard */
+
+$key_size: 1.2em;
+$key_border_radius: $base_border_radius + 3px;
+$key_bg_color:  $bg_color;
+// $default_key_bg_color: darken($key_bg_color, 4%);
+$default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten($osd_bg_color, 2%));
+
+
+// draw keys using button function
+#keyboard {
+  background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1);
+  box-shadow: inset 0 1px 0 0 $osd_outer_borders_color;
+
+  .page-indicator {
+    padding: $base_padding;
+
+    .page-indicator-icon {
+      width: 8px;
+      height: 8px;
+    }
+  }
+}
+
+// the container for individual keys
+.key-container {
+  padding: $base_margin;
+  spacing: $base_margin;
+}
+
+// the keys
+.keyboard-key {
+
+  @include button(normal, $c:$key_bg_color);
+
+  &:focus { @include button(focus);}
+  &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
+  &:active { @include button(active, $c: $key_bg_color); }
+
+  @include fontsize($base_font_size + 5);
+  min-height: $key_size;
+  min-width: $key_size;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: $key_border_radius;
+
+  &:grayed { //FIXMEy
+    background-color: darken($bg_color, 3%);
+    color: $osd_fg_color;
+    border-color: $osd_borders_color;
+  }
+
+  // non-character keys
+  &.default-key {
+    @include button(normal, $c:$default_key_bg_color);
+    &:hover, &:checked {@include button(hover, $c: $default_key_bg_color);}
+    &:active { @include button(active, $c: $default_key_bg_color);}
+  }
+
+  // enter key is suggested-action
+  &.enter-key {
+    @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
+    &:hover, &:checked { @include button(hover, $c: lighten($selected_bg_color, 3%));}
+    &:active {@include button(active, $c: darken($selected_bg_color, 2%));}
+  }
+
+  &.shift-key-uppercase { color: $selected_bg_color }
+
+  StIcon { icon-size: 1.125em; }
+}
+
+// long press on a key popup
+.keyboard-subkeys {
+  color: $osd_fg_color;
+  -arrow-border-radius: $modal_radius;
+  -arrow-background-color: $osd_bg_color;
+  -arrow-border-width: 1px;
+  -arrow-border-color: lighten($osd_bg_color, 9%);
+  -arrow-base: 20px;
+  -arrow-rise: 10px;
+  -boxpointer-gap: $base_spacing;
+
+  .keyboard-key {
+    @include button(normal, $c:$key_bg_color);
+
+    &:focus { @include button(focus);}
+    &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
+    &:active { @include button(active, $c: $key_bg_color); }
+
+    border-radius:$base_border_radius;
+  }
+}
+
+// emoji
+.emoji-page {
+  .keyboard-key {
+    background-color: transparent;
+    border: none;
+    color: initial;
+  }
+}
+
+.emoji-panel {
+  .keyboard-key:latched {
+    border-color: lighten($selected_bg_color, 5%);
+    background-color: $selected_bg_color;
+  }
+}
+
+// suggestions
+.word-suggestions {
+  @include fontsize($base_font_size + 3);
+  spacing: 12px;
+  min-height: 20pt;
+}
diff --git a/data/gnome-shell-sass/widgets/_login-dialog.scss b/data/gnome-shell-sass/widgets/_login-dialog.scss
new file mode 100644
index 0000000..0b148be
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_login-dialog.scss
@@ -0,0 +1,170 @@
+/* Login Dialog */
+
+.login-dialog-banner-view {
+  padding-top: 24px;
+  max-width: 23em;
+}
+
+.login-dialog {
+  //reset
+  border: none;
+  background-color: transparent;
+
+  $_gdm_bg: lighten(#2e3436, 19%);
+
+  StEntry {
+    @if $variant=='dark' {
+      $_gdm_entry_bg: transparentize(lighten(desaturate(#241f31, 20%), 2%), 0.5);
+      background-color: $_gdm_entry_bg;
+      color: $osd_fg_color;
+    }
+  }
+
+  .modal-dialog-button-box { spacing: 3px; }
+  .modal-dialog-button {
+    padding: 4px 18px;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+    background-color: $_gdm_bg;
+    border-color: $_gdm_bg;
+    color: $fg_color;
+
+    $_hover_c: lighten($_gdm_bg, 5%);
+    &:hover, &:focus {
+      background-color: $_hover_c;
+      border-color: $_hover_c;
+    }
+    &:active {
+      $_active_c: darken($_gdm_bg, 5%);
+      box-shadow: none;
+      background-color: $_active_c;
+      border-color: $_active_c;
+    }
+    &:insensitive {
+      @include button(insensitive);
+      border-color: darken($_gdm_bg, 5%);
+      background-color: darken($_gdm_bg, 5%);
+      color: transparentize($fg_color, 0.3);
+    }
+    &:default {
+      @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
+      border-color: $selected_bg_color;
+      &:hover, &:focus { 
+        @include button(hover,$c:$selected_bg_color, $tc:$selected_fg_color);
+        $_def_hover_c: lighten($selected_bg_color, 5%);
+        background-color: $_def_hover_c;
+        border-color: $_def_hover_c;
+      }
+      &:active {
+        @include button(active,$c:$selected_bg_color, $tc:$selected_fg_color);
+        $_def_active_c: darken($selected_bg_color, 5%);
+        background-color: $_def_active_c;
+        border-color: $_def_active_c;
+      }
+      &:insensitive {
+        @include button(insensitive);
+        border-color: darken($selected_bg_color, 10%);
+        background-color: darken($selected_bg_color, 10%);
+        color: transparentize($selected_fg_color, 0.3);
+      }
+    }
+  }
+
+  .cancel-button,
+  .switch-user-button,
+  .login-dialog-session-list-button {
+    padding: 0;
+    border-radius: 99px;
+    width: $base_icon_size * 2;
+    height: $base_icon_size * 2;
+    border-color: transparentize($bg_color,0.7);
+    background-color: transparentize($bg_color,0.7);
+
+    StIcon { icon-size: $base_icon_size; }
+  }
+
+  .caps-lock-warning-label,
+  .login-dialog-message-warning {
+    color: $osd_fg_color;
+  }
+}
+
+.login-dialog-logo-bin { padding: 24px 0px; }
+.login-dialog-banner { color: darken($osd_fg_color,10%); }
+.login-dialog-button-box { width: 23em; spacing: 5px; }
+.login-dialog-message { text-align: center; }
+.login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
+.login-dialog-user-selection-box { padding: 100px 0px; }
+.login-dialog-not-listed-label {
+  padding-left: 2px;
+  .login-dialog-not-listed-button:focus &,
+  .login-dialog-not-listed-button:hover & {
+    color: $osd_fg_color;
+  }
+}
+
+.login-dialog-not-listed-label {
+  @include fontsize($base_font_size - 1);
+  font-weight: bold;
+  color: darken($osd_fg_color,30%);
+  padding-top: 1em;
+}
+
+.login-dialog-user-list-view { -st-vfade-offset: 1em; }
+.login-dialog-user-list {
+  spacing: 12px;
+  width: 23em;
+  &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
+  &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
+}
+
+.login-dialog-user-list-item {
+  border-radius: $base_border_radius + 4px;
+  padding: 6px;
+  color: darken($osd_fg_color,30%);
+  &:ltr .user-widget { padding-right: 1em; }
+  &:rtl .user-widget { padding-left: 1em; }
+  .login-dialog-timed-login-indicator {
+    height: 2px;
+    margin-top: 6px;
+    background-color: $osd_fg_color;
+  }
+  &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
+}
+
+.user-widget-label {
+  color: $osd_fg_color;
+}
+
+.user-widget.horizontal .user-widget-label {
+  @include fontsize($base_font_size + 2);
+  font-weight: bold;
+  text-align: left;
+  padding-left: 15px;
+
+  &:ltr { padding-left: 14px; }
+  &:rtl { padding-right: 14px; }
+}
+
+.user-widget.vertical .user-widget-label {
+  @include fontsize($base_font_size + 5);
+  text-align: center;
+  font-weight: normal;
+  padding-top: 16px;
+}
+
+.login-dialog-prompt-layout {
+  padding-top: 24px;
+  padding-bottom: 12px;
+  spacing: $base_spacing * 2;
+  width: 23em;
+}
+
+.login-dialog-prompt-entry {
+  height: 1.5em;
+}
+
+.login-dialog-prompt-label {
+  color: darken($osd_fg_color, 20%);
+  @include fontsize($base_font_size + 1);
+  padding-top: 1em;
+}
diff --git a/data/gnome-shell-sass/widgets/_looking-glass.scss b/data/gnome-shell-sass/widgets/_looking-glass.scss
new file mode 100644
index 0000000..9c38e63
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_looking-glass.scss
@@ -0,0 +1,102 @@
+/* Looking Glass */
+
+// Dialog
+#LookingGlassDialog {
+  background-color: $osd_bg_color;
+  spacing: $base_spacing;
+  padding: 4px;
+  border: 1px solid transparentize($osd_fg_color, 0.8);
+  border-radius: $base_border_radius;
+  color: $osd_fg_color;
+
+  & > #Toolbar {
+    border: none;
+    border-radius: $base_border_radius;
+    background-color: $osd_bg_color;
+  }
+
+  .labels { spacing: $base_spacing; }
+  .notebook-tab {
+    -natural-hpadding: $base_padding * 2;
+    -minimum-hpadding: 6px;
+    font-weight: bold;
+    color: darken($osd_fg_color, 15%);
+    transition-duration: 100ms;
+    padding-left: .3em;
+    padding-right: .3em;
+    border-bottom-width: 2px;
+    &:hover {
+      color: $osd_fg_color;
+    }
+    &:selected {
+      border-bottom-width: 2px;
+      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color, 5%);
+      color: $osd_fg_color;
+    }
+  }
+  StBoxLayout#EvalBox { padding: 4px; spacing: $base_spacing; }
+  StBoxLayout#ResultsArea { spacing: $base_spacing; }
+}
+
+.lg-dialog {
+  StEntry {
+    background-color: transparentize(lighten($osd_bg_color, 5%), 0.4);
+    color: $osd_fg_color;
+    border-color: transparentize($osd_fg_color, 0.8);
+    min-height: 22px;
+    selection-background-color: $selected_bg_color;
+    selected-color: $selected_fg_color;
+  }
+  .shell-link {
+    color: $link_color;
+    &:hover { color: lighten($link_color, 10%); }
+    &:active { color: darken($link_color, 10%); }
+   }
+}
+
+.lg-completions-text {
+    font-size: .9em;
+    font-style: italic;
+}
+
+.lg-obj-inspector-title {
+    spacing: $base_spacing;
+}
+
+.lg-obj-inspector-button {
+    border: 1px solid $osd_borders_color;
+    padding: 4px;
+    border-radius: $base_border_radius;
+    &:hover { border: 1px solid #ffffff; }
+}
+
+// Extensions
+#lookingGlassExtensions { padding: 4px; }
+
+.lg-extensions-list {
+    padding: 4px;
+    spacing: 6px;
+}
+
+.lg-extension {
+    border: 1px solid lighten($osd_borders_color, 5%);
+    background-color: lighten($osd_bg_color, 5%);
+    border-radius: $base_border_radius;
+    padding: 4px;
+}
+
+.lg-extension-name {
+    font-weight: bold;
+}
+
+.lg-extension-meta {
+    spacing: 6px;
+}
+
+// Inspector
+#LookingGlassPropertyInspector {
+  background: $osd_bg_color;
+  border: 1px solid $osd_borders_color;
+  border-radius: $base_border_radius;
+  padding: 6px;
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_message-list.scss b/data/gnome-shell-sass/widgets/_message-list.scss
new file mode 100644
index 0000000..e6a4d92
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_message-list.scss
@@ -0,0 +1,134 @@
+/* Message List */
+// a.k.a. notifications in the menu
+
+// main list
+.message-list {
+  width: 31.5em;
+  padding: 0 $base_padding * 2;
+
+  .message-list-placeholder { spacing: 12px; }
+}
+
+.message-list-sections {
+  spacing: $base_spacing;
+  margin: 0 $base_margin * 4; // to account for scrollbar
+}
+
+.message-list-section,
+.message-list-section-list {
+  spacing: $base_spacing;
+}
+
+// do-not-disturb + clear button
+.message-list-controls {
+  margin: ($base_margin * 2) ($base_margin * 4) 0;
+  // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
+  padding: $base_margin;
+  spacing: $base_spacing * 2;
+}
+
+// message bubbles
+.message {
+  @include notification_bubble;
+
+  // icon container
+  .message-icon-bin {
+    padding: ($base_padding * 3) 0 ($base_padding * 3) ($base_padding * 2);
+
+    &:rtl {
+      padding: ($base_padding * 3) ($base_padding * 2) ($base_padding * 3) 0;
+    }
+
+    // icon size and color
+    > StIcon {
+      icon-size: $base_icon_size*2; // 32px
+      -st-icon-style: symbolic;
+    }
+
+    // fallback
+    > .fallback-app-icon {
+      width: $base_icon_size;
+      height: $base_icon_size;
+    }
+  }
+
+  // content
+  .message-content {
+    padding: $base_padding + $base_margin * 2;
+    spacing: 4px;
+  }
+
+  // title
+  .message-title {
+    font-weight: bold;
+  }
+
+  // secondary container in title box
+  .message-secondary-bin {
+    padding: 0 $base_margin * 2;
+
+    // notification time stamp
+    > .event-time {
+      color: transparentize($fg_color, 0.5);
+      @include fontsize($base_font_size - 2);
+      text-align: right;
+      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
+      padding-bottom: 0.13em;
+    }
+  }
+
+  // close button
+  .message-close-button {
+    color: lighten($fg_color, 15%);
+    &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
+    &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
+  }
+
+  // body
+  .message-body {
+    color: darken($fg_color, 10%);
+  }
+}
+
+// URLs in messages
+.url-highlighter {
+  link-color: $link_color;
+}
+
+/* Media Controls */
+.message-media-control {
+  padding: $base_padding * 2 $base_padding * 4;
+  color: darken($fg_color, 15%);
+
+  // uses $hover_bg_color since the media controls are in a notification_bubble
+  &:hover {
+    background-color: lighten($hover_bg_color, 5%);
+    color: $fg_color;
+  }
+
+  &:active { 
+    background-color: darken($hover_bg_color, 2%);
+    color: $fg_color;
+  }
+
+  &:insensitive { color: darken($fg_color,40%); }
+  
+  // fix border-radius for last button
+  &:last-child:ltr { border-radius: 0 $base_border_radius+2 $base_border_radius+2 0; }
+  &:last-child:rtl { border-radius: $base_border_radius+2 0 0 $base_border_radius+2; }
+}
+
+// album-art
+.media-message-cover-icon {
+  icon-size: $base_icon_size*2 !important; // 48px
+  border-radius: $base_border_radius;
+
+  // when there is no artwork
+  &.fallback {
+    color: darken($fg_color, 17%);
+    background-color: $bg_color;
+    border: 1px solid transparent;
+    border-radius: $base_border_radius;
+    icon-size: $base_icon_size * 2 !important;
+  }
+}
diff --git a/data/gnome-shell-sass/widgets/_misc.scss b/data/gnome-shell-sass/widgets/_misc.scss
new file mode 100644
index 0000000..aa543a0
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_misc.scss
@@ -0,0 +1,55 @@
+// Rubberband for select-area screenshots
+.select-area-rubberband {
+  background-color: transparentize($selected_bg_color,0.7);
+  border: 1px solid $selected_bg_color;
+}
+
+// User icon
+.user-icon {
+  background-size: contain;
+  color: $osd_fg_color;
+  border-radius: 99px;
+  &:hover {
+    color: lighten($osd_fg_color,30%);
+  }
+
+  & StIcon {
+    background-color: transparentize($osd_fg_color,0.95);
+    border-radius: 99px;
+  }
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: $base_icon_size * 6; // 128px
+
+  & StIcon {
+    padding: $base_padding * 3 + 2px; // 20px
+    padding-top: $base_padding * 3; // 18 px
+    padding-bottom: $base_padding * 3 + 4px; // 22px
+    width: $base_icon_size * 5.5; height:  $base_icon_size * 5.5; // 88px;
+  }
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: $base_icon_size * 4; // 64px
+
+  & StIcon {
+    padding: $base_padding * 2 ; // 12px
+    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
+  }
+}
+
+.lightbox { background-color: black; }
+.flashspot { background-color: white; }
+
+
+// Hidden
+.hidden { color: rgba(0,0,0,0);}
+
+// Caps-lock warning
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  @include fontsize($base_font_size - 1);
+  color: $warning_color;
+}
diff --git a/data/gnome-shell-sass/widgets/_network-dialog.scss b/data/gnome-shell-sass/widgets/_network-dialog.scss
new file mode 100644
index 0000000..7973d22
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_network-dialog.scss
@@ -0,0 +1,56 @@
+/* Network Dialogs */
+.nm-dialog {
+  max-height: 34em;
+  min-height: 31em;
+  min-width: 32em;
+}
+
+.nm-dialog-content {
+  spacing: 20px;
+  padding: 24px;
+}
+
+.nm-dialog-airplane-box { spacing: 12px; }
+
+.nm-dialog-airplane-headline {
+  font-weight: bold;
+  text-align: center;
+}
+
+.nm-dialog-airplane-text { color: $fg_color; }
+
+// header
+.nm-dialog-header {
+  font-weight: bold;
+}
+.nm-dialog-header-icon {
+  icon-size: $base_icon_size * 2;
+}
+.nm-dialog-header-hbox { spacing: 10px; }
+
+// list of networks
+.nm-dialog-scroll-view {
+  border: 1px solid $borders_color;
+  padding:0;
+  background-color: darken($bg_color, 3%);
+}
+
+// list item
+.nm-dialog-item {
+  @include fontsize($base_font_size);
+  border-bottom: 1px solid $borders_color;
+  padding: $base_padding * 2;
+  spacing: 0px;
+  &:selected {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+}
+
+// icons in list
+.nm-dialog-icon { icon-size: $base_icon_size; }
+.nm-dialog-icons { spacing: $base_spacing * 2; }
+
+// no networks
+.no-networks-label { color: $insensitive_fg_color; }
+.no-networks-box { spacing: $base_padding; }
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_notifications.scss b/data/gnome-shell-sass/widgets/_notifications.scss
new file mode 100644
index 0000000..7d0cda2
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_notifications.scss
@@ -0,0 +1,57 @@
+/* Notifications & Mesage Tray */
+
+$notification_banner_height: 64px;
+$notification_banner_width: 34em;
+
+// Banner notifications
+.notification-banner {
+  min-height: $notification_banner_height;
+  width: $notification_banner_width;
+
+  .notification-actions {
+    spacing: 0;
+  }
+
+  .notification-button {
+    @extend %bubble_button;
+  }
+}
+
+// counter
+.summary-source-counter {
+  font-size: $base_font_size - 1pt;
+  font-weight: bold;
+  height: 1.6em;
+  width: 1.6em;
+  -shell-counter-overlap-x: 3px;
+  -shell-counter-overlap-y: 3px;
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+  border: 2px solid $fg_color;
+  box-shadow: 0 2px 2px rgba(0,0,0,0.5);
+  border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
+}
+
+// chat bubbles
+.chat-body { spacing: 5px; }
+.chat-response { margin: 5px; }
+.chat-log-message { color: darken($fg_color,10%); }
+.chat-new-group { padding-top: 1em; }
+.chat-received {
+  padding-left: 4px;
+  &:rtl { padding-left: 0px; padding-right: 4px; }
+}
+
+.chat-sent {
+  padding-left: 18pt;
+  color: lighten($fg_color, 15%);
+  &:rtl { padding-left: 0; padding-right: 18pt; }
+}
+
+.chat-meta-message {
+  padding-left: 4px;
+  @include fontsize($base_font_size - 2);
+  font-weight: bold;
+  color: lighten($fg_color,18%);
+  &:rtl { padding-left: 0; padding-right: 4px; }
+}
diff --git a/data/gnome-shell-sass/widgets/_osd.scss b/data/gnome-shell-sass/widgets/_osd.scss
new file mode 100644
index 0000000..f85124c
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_osd.scss
@@ -0,0 +1,45 @@
+/* OSD */
+
+$osd_levelbar_height:8px;
+
+.osd-window {
+  @extend %osd_panel;
+  text-align: center;
+  font-weight: bold;
+  spacing: $base_spacing * 2; // 12px
+  margin: $base_margin * 8; // 32px
+  min-width: 64px;
+  min-height: 64px;
+
+  StIcon {
+    icon-size:$base_icon_size * 6;
+  }
+
+  .osd-monitor-label { font-size: 3em; }
+  
+  .level {
+    height: $osd_levelbar_height;
+    -barlevel-height: $osd_levelbar_height;
+    -barlevel-background-color: transparentize($osd_fg_color, if($variant=='light', 0.7, 0.9));
+    -barlevel-active-background-color: $osd_fg_color;
+    -barlevel-overdrive-color: $destructive_color;
+    -barlevel-overdrive-separator-width: 3px;
+  }
+}
+
+/* Pad OSD */
+.pad-osd-window {
+  padding: 32px;
+  background-color: transparentize(#000, 0.2);
+
+  .pad-osd-title-box { spacing: 12px; }
+  .pad-osd-title-menu-box { spacing: 6px; }
+}
+
+.combo-box-label {
+  width: 15em;
+}
+
+.resize-popup {
+  @extend %osd_panel;
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_overview.scss b/data/gnome-shell-sass/widgets/_overview.scss
new file mode 100644
index 0000000..18497de
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_overview.scss
@@ -0,0 +1,10 @@
+/* OVERVIEW */
+
+#overview {
+  spacing: 24px;
+  background-color: transparent;
+}
+
+.overview-controls {
+  padding-bottom: 32px;
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_panel.scss b/data/gnome-shell-sass/widgets/_panel.scss
new file mode 100644
index 0000000..56c445a
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_panel.scss
@@ -0,0 +1,121 @@
+/* Top Bar */
+// a.k.a. the panel
+
+$panel_corner_radius: $base_border_radius+1;
+$panel_bg_color: #000;
+$panel_fg_color: #ccc;
+$panel_height: 1.86em;
+
+
+#panel {
+  background-color: $panel_bg_color;
+  font-weight: bold;
+  height: $panel_height;
+  font-feature-settings: "tnum";
+
+  // transparent panel on lock & login screens
+  &.unlock-screen,
+  &.login-screen {
+    background-color: transparent;
+
+    .panel-corner {
+      -panel-corner-radius: 0;
+      -panel-corner-background-color: transparent;
+      -panel-corner-border-color: transparent;
+    }
+  }
+
+  // spacing between activities, app menu and such
+  #panelLeft, #panelCenter {
+    spacing: $base_spacing;
+  }
+
+  // the rounded outset corners
+  .panel-corner {
+    -panel-corner-radius: $panel_corner_radius;
+    -panel-corner-background-color: $panel_bg_color;
+    -panel-corner-border-width: 2px;
+    -panel-corner-border-color: transparent;
+
+    &:active, &:overview, &:focus {
+      -panel-corner-border-color: lighten($selected_bg_color,5%);
+    }
+  }
+
+  // panel menus
+  .panel-button {
+    font-weight: bold;
+    color: $panel_fg_color;
+    -natural-hpadding: $base_padding * 2;
+    -minimum-hpadding: $base_padding;
+
+    &:hover {
+      color: lighten($panel_fg_color, 20%);
+    }
+
+    &:active, &:overview, &:focus, &:checked {
+      color: lighten($panel_fg_color, 20%);
+    }
+
+    // status area icons
+    .system-status-icon {
+      icon-size: $base_icon_size;
+      padding: $base_padding - 1px;
+    }
+
+    // app menu icon
+    .app-menu-icon {
+      margin-left: $base_margin;
+      margin-right: $base_margin;
+      -st-icon-style: symbolic;
+      // dimensions of the icon are hardcoded
+    }
+
+    // lock & login screen styles
+    .unlock-screen &,
+    .login-screen & {
+      color: lighten($fg_color, 10%);
+      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
+    }
+  }
+
+  .panel-button {
+    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw a box-shadow
+      background-color: rgba(0, 0, 0, 0.01);
+      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+    }
+  }
+
+  .panel-button.clock-display {
+    // Move highlight from .panel-button to .clock
+    &:active, &:overview, &:focus, &:checked {
+      box-shadow: none;
+
+      .clock {
+        background-color: rgba(0, 0, 0, 0.01);
+        box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+      }
+    }
+  }
+
+  .panel-status-indicators-box,
+  .panel-status-menu-box {
+    spacing: 2px;
+  }
+
+  // spacing between power icon and (optional) percentage label
+  .power-status.panel-status-indicators-box {
+    spacing: 0;
+  }
+
+  // indicator for active
+  .screencast-indicator,
+  .remote-access-indicator { color: $warning_color; }
+}
+
+// App Menu
+#appMenu {
+  spacing: $base_spacing;
+  .label-shadow { color: transparent; }
+}
diff --git a/data/gnome-shell-sass/widgets/_popovers.scss b/data/gnome-shell-sass/widgets/_popovers.scss
new file mode 100644
index 0000000..a693f15
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_popovers.scss
@@ -0,0 +1,129 @@
+/* Popovers/Menus */
+
+$popover_arrow_height: 12px;
+
+//.the popover itself
+.popup-menu-boxpointer {
+  -arrow-border-radius: $base_border_radius+4;
+  -arrow-background-color: $bg_color;
+  -arrow-border-width: 1px;
+  -arrow-border-color: $borders_color;
+  -arrow-base: $popover_arrow_height * 2;
+  -arrow-rise: $popover_arrow_height;
+  -arrow-box-shadow: 0 1px 3px rgba(0,0,0,0.5); // dreaming bugzilla #689995
+}
+
+// container of the popover menu
+.popup-menu {
+  min-width: 15em;
+  color: $fg_color;
+
+  //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is
+  &.panel-menu {
+    -boxpointer-gap: $base_margin; // distance from the panel
+    margin-bottom: 1.75em;
+  }
+}
+
+.popup-menu-content {
+  padding: $base_padding * 2 + $base_margin 0;
+}
+
+// menu items
+.popup-menu-item {
+  spacing: $base_padding;
+  padding: $base_padding;
+
+  &:ltr { padding-right:1.75em; padding-left: 0; }
+  &:rtl { padding-right: 0; padding-left:1.75em; }
+
+  &:checked {
+    background-color: lighten($bg_color, 2%);
+    box-shadow: none;
+  }
+
+  &.selected {
+    background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
+    color: $fg_color;
+  }
+
+  &:active { 
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+
+  &:insensitive { color: transparentize($fg_color,0.5);}
+}
+
+// all icons and other graphical elements
+.popup-inactive-menu-item {
+  color: $fg_color;
+
+  &:insensitive { color: transparentize($fg_color,0.5); }
+}
+
+// symbolic icons in popover
+.popup-menu-arrow,
+.popup-menu-icon { icon-size: $base_icon_size; }
+
+// popover submenus
+.popup-sub-menu {
+  background-color: darken($bg_color, 3%);
+  box-shadow: none;
+  border-top: 1px solid transparentize($borders_color, 0.2);
+  border-bottom: 1px solid transparentize($borders_color, 0.2);
+}
+
+// container for radio and check boxes
+.popup-menu-ornament {
+  text-align: right;
+  width: 1.2em;
+}
+
+// separator
+.popup-separator-menu-item {
+  padding: 0;
+
+  .popup-separator-menu-item-separator {
+    //-margin-horizontal: 24px;
+    height: 1px; //not really the whole box
+    margin: 6px 64px;
+    background-color: lighten($borders_color, 2%);
+    .popup-sub-menu & { //submenu separators
+      margin: 0 64px 0 32px;
+      @if $variant == 'dark' {
+        background-color: lighten($bg_color,10%);
+      }
+    }
+  }
+}
+
+// desktop background menu
+.background-menu {
+  -boxpointer-gap: $base_margin;
+  -arrow-rise: 0px; // hide the beak on the menu
+}
+
+// system status menu
+.aggregate-menu {
+  min-width: 21em;
+
+  // lock screen, shutdown, etc. buttons
+  .popup-menu-icon { 
+    padding:0;
+    margin: 0 $base_margin;
+    -st-icon-style: symbolic;
+  }
+
+  .popup-sub-menu .popup-menu-item > :first-child {
+    // account for icons in submenus with padding
+    &:ltr {
+      padding-left: $base_padding + $base_margin * 2; 
+      margin-left: $base_icon_size;
+    }
+    &:rtl {
+      padding-right: $base_padding + $base_margin * 2; ;
+      margin-right: $base_icon_size;
+    }
+  }
+}
diff --git a/data/gnome-shell-sass/widgets/_screen-shield.scss b/data/gnome-shell-sass/widgets/_screen-shield.scss
new file mode 100644
index 0000000..00c549a
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_screen-shield.scss
@@ -0,0 +1,78 @@
+/* Screen Shield */
+
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+  .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .notification,
+  .unlock-dialog-notification-source {
+    padding: 12px 6px;
+    border: none;
+    background-color: transparentize($osd_bg_color,0.7);
+    color: $osd_fg_color;
+    border-radius: $modal_radius;
+
+    &.critical { background-color: transparentize($osd_bg_color,0.1) }
+  }
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: $osd_bg_color;
+  background-color: transparentize($osd_fg_color, 0.7);
+  border-radius: 99px;
+  margin-right: 12px;
+
+}
+
+.screen-shield-background { //just the shadow, really
+  background: black;
+  box-shadow: 0px 2px 4px rgba(0,0,0,0.6);
+}
+
+#lockDialogGroup {
+  background-color: lighten(#2e3436, 8%);
+}
+
+#unlockDialogNotifications {
+  StButton#vhandle, StButton#hhandle {
+    background-color: transparentize($bg_color,0.7);
+    &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
+    &:active { background-color: transparentize($selected_bg_color,0.5); }
+  }
+}
diff --git a/data/gnome-shell-sass/widgets/_scrollbars.scss b/data/gnome-shell-sass/widgets/_scrollbars.scss
new file mode 100644
index 0000000..5d50994
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_scrollbars.scss
@@ -0,0 +1,29 @@
+/* Scrollbars */
+
+StScrollView {
+  &.vfade { -st-vfade-offset: 68px; }
+  &.hfade { -st-hfade-offset: 68px; }
+}
+
+StScrollBar {
+  padding: 0;
+
+  StScrollView & {
+    min-width: 14px;
+    min-height: 14px;
+  }
+
+  StBin#trough {
+    border-radius: 0;
+    background-color: transparent;
+  }
+
+  StButton#vhandle, StButton#hhandle {
+    border-radius: 8px;
+    background-color: mix($fg_color, $bg_color, 60%);
+    //border: 3px solid transparent; //would be nice to margin or at least to transparent
+    margin: 3px;
+    &:hover { background-color: mix($fg_color, $bg_color, 80%); }
+    &:active { background-color: $selected_bg_color; }
+  }
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_search-entry.scss b/data/gnome-shell-sass/widgets/_search-entry.scss
new file mode 100644
index 0000000..329dbc7
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_search-entry.scss
@@ -0,0 +1,35 @@
+// Search entry
+
+$search_entry_width: 320px;
+$search_entry_height: 36px;
+
+%search_entry,
+.search-entry {
+  width: $search_entry_width;
+  padding: $base_padding+1 $base_padding+3;
+  border-radius: $search_entry_height * 0.5; // half the height
+  color: transparentize($fg_color,0.3);
+  background-color: $bg_color;
+  border-color: $borders_color;
+
+  &:hover {
+    background-color: $hover_bg_color;
+    border-color: $hover_borders_color;
+    color: $hover_fg_color;
+  }
+
+  &:focus {
+    padding: $base_padding $base_padding+2; // 1px less to account for wider border
+    border-width: 2px;
+    border-style: solid;
+    border-color: $selected_bg_color;
+    color: $fg_color;
+    box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.2);
+  }
+
+  .search-entry-icon { 
+    icon-size: $base_icon_size;
+    padding: 0 4px;
+    color: inherit;
+  }
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_search-results.scss b/data/gnome-shell-sass/widgets/_search-results.scss
new file mode 100644
index 0000000..9836724
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_search-results.scss
@@ -0,0 +1,104 @@
+/* Search */
+
+// search overview container
+#searchResultsContent {
+  max-width: 1024px;
+  spacing: $base_margin * 2;
+}
+
+// search results sections "the boxes"
+.search-section {
+  // This should be equal to #searchResultsContent spacing
+  spacing: $base_margin * 2;
+
+  // separator
+  .search-section-separator { 
+    // height: 1px;
+    // background-color: $osd_outer_borders_color;
+    height: 0;
+    background-color: transparent;
+  }
+}
+
+// content
+.search-section-content {
+  background-color: transparentize(lighten($osd_bg_color, 5%), 0.2);
+  border-radius: $modal_radius+3;
+  border: 1px solid $osd_outer_borders_color;
+  box-shadow: 0 2px 4px 0 $shadow_color;
+  text-shadow: 0 1px if($variant == 'light', rgba(255,255,255,0.2), rgba(0,0,0,0.2));
+  color: $osd_fg_color;
+  padding: $base_padding * 3;
+  // This is the space between the provider icon and the results container
+  spacing: $base_margin * 2;
+}
+
+%search-section-content-item {
+  @extend %icon_tile;
+
+  &:focus,
+  &:hover,
+  &:selected {
+    background-color: transparentize($osd_fg_color, .9);
+    transition-duration: 200ms;
+  }
+
+  &:active,
+  &:checked {
+    background-color: transparentize(darken($osd_bg_color, 10%), .1);
+  }
+}
+
+// "no results" text
+.search-statustext {
+  @extend %status_text;
+}
+
+// Search results with icons
+.grid-search-result {
+  @extend %app-well-app;
+}
+
+// search result provider
+.search-provider-icon {
+  @extend %search-section-content-item;
+
+  // content
+  .list-search-provider-content {
+    spacing: $base_spacing * 2;
+
+    // provider labels
+    .list-search-provider-details {
+      width: 120px;
+      margin-top: 0;
+      color: darken($osd_fg_color, 8%);
+      // font-weight: bold;
+    }
+  }
+}
+
+// search results list
+.list-search-results {
+  spacing: $base_spacing;
+}
+
+// search result listitem
+.list-search-result {
+  @extend %search-section-content-item;
+
+  // content
+  .list-search-result-content {
+    spacing: $base_padding;
+  }
+
+  // list item title (with leading icon)
+  .list-search-result-title {
+    spacing: $base_spacing * 2;
+    // font-weight: bold;
+  }
+
+  // list item description
+  .list-search-result-description {
+    color: darken($osd_fg_color, 30%);
+  }
+}
diff --git a/data/gnome-shell-sass/widgets/_slider.scss b/data/gnome-shell-sass/widgets/_slider.scss
new file mode 100644
index 0000000..c0fdbb0
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_slider.scss
@@ -0,0 +1,27 @@
+/* Slider */
+
+$slider_size: 15px;
+
+.slider {
+  height: $slider_size;
+  // slider trough
+  -barlevel-height: 3px; // has to be an odd number
+  -barlevel-background-color: $borders_color; //background of the trough
+  -barlevel-border-width: 1px; 
+  -barlevel-border-color: $borders_color; // trough border color
+  // fill style
+  -barlevel-active-background-color: $selected_bg_color; //active trough fill
+  -barlevel-active-border-color: if($variant == 'light', darken($selected_bg_color, 4%), lighten($selected_bg_color, 2%)); //active trough border
+  // overfill style (red in this case)
+  -barlevel-overdrive-color: $destructive_color;
+  -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red;
+  -barlevel-overdrive-separator-width:1px;
+  // slider hander
+  -slider-handle-radius: $slider_size * 0.5; // half the size of the size
+  -slider-handle-border-width: 1px;
+  -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color);
+
+  color: if($variant == 'light', lighten($bg_color, 10%), $fg_color);
+  &:hover { color: $hover_bg_color; }
+  &:active { color: $active_bg_color; }
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_switcher-popup.scss b/data/gnome-shell-sass/widgets/_switcher-popup.scss
new file mode 100644
index 0000000..32cbbe5
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -0,0 +1,65 @@
+/* App Switcher */
+
+.switcher-popup {
+  padding: 8px;
+  spacing: $base_spacing * 4;
+}
+
+// switcher onscreen panel
+.switcher-list {
+  @extend %osd_panel;
+
+  .item-box {
+    padding: 8px;
+    border-radius: $base_border_radius + 1px;
+    border: 1px solid transparent;
+
+    &:outlined {
+      background-color: transparentize($osd_fg_color, 0.7);
+    }
+
+    &:selected {
+      background-color: transparentize($osd_fg_color, 0.7);
+      color: $osd_fg_color;
+    }
+  }
+
+  // window thumbnails
+  .thumbnail-box {
+    padding: 2px;
+    spacing: $base_spacing;
+  }
+
+  .thumbnail {
+    width: 256px;
+  }
+
+  .separator {
+    width: 1px;
+    background: $borders_color;
+  }
+
+  .switcher-list-item-container {
+    spacing: $base_spacing * 2;
+  }
+}
+
+.switcher-arrow {
+  border-color: rgba(0,0,0,0);
+  color: transparentize($fg_color,0.2);
+  &:highlighted {
+    color: $fg_color;
+  }
+}
+
+// Input Source Switcher
+.input-source-switcher-symbol {
+  font-size: 34pt;
+  width: 96px;
+  height: 96px;
+}
+
+// Window cycler highlight
+.cycler-highlight {
+  border: 5px solid $selected_bg_color;
+}
diff --git a/data/gnome-shell-sass/widgets/_switches.scss b/data/gnome-shell-sass/widgets/_switches.scss
new file mode 100644
index 0000000..fd7472e
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_switches.scss
@@ -0,0 +1,16 @@
+/* Switches */
+
+// these are equal to the size of the SVG assets
+$switch_height: 22px;
+$switch_width: 46px;
+
+.toggle-switch {
+  color: $fg_color;
+  height: $switch_height;
+  width: $switch_width;
+  background-size: contain;
+  background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-off.svg"),url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"));
+  &:checked { 
+    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-on.svg"),url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"));
+  }
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_tiled-previews.scss b/data/gnome-shell-sass/widgets/_tiled-previews.scss
new file mode 100644
index 0000000..a9d000f
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_tiled-previews.scss
@@ -0,0 +1,19 @@
+
+/* Tiled window previews */
+$tile_corner_radius: $base_border_radius + 1px;
+.tile-preview {
+  background-color: transparentize($selected_bg_color,0.5);
+  border: 1px solid $selected_bg_color;
+}
+
+.tile-preview-left.on-primary {
+  border-radius: $tile_corner_radius 0 0 0;
+}
+
+.tile-preview-right.on-primary {
+  border-radius: 0 $tile_corner_radius 0 0;
+}
+
+.tile-preview-left.tile-preview-right.on-primary {
+  border-radius: $tile_corner_radius $tile_corner_radius 0 0;
+}
\ No newline at end of file
diff --git a/data/gnome-shell-sass/widgets/_window-picker.scss b/data/gnome-shell-sass/widgets/_window-picker.scss
new file mode 100644
index 0000000..466b500
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_window-picker.scss
@@ -0,0 +1,66 @@
+/* Window Picker */
+
+$window_picker_spacing: $base_spacing * 2; // 16px
+$window_picker_padding: $base_padding * 2; // 16px
+
+$window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);
+
+$window_close_button_size: 24px;
+$window_close_button_padding: 3px;
+
+
+// Window picker
+.window-picker {
+  // Space between window thumbnails
+  -horizontal-spacing: $window_picker_spacing;
+  -vertical-spacing: $window_picker_spacing;
+  // Padding for container around window thumbnails
+  padding: $window_picker_padding;
+
+  &.external-monitor { padding: $window_picker_padding; }
+}
+
+// Borders on window thumbnails
+.window-clone-border {
+  border-width: 6px;
+  border-style: solid;
+  border-color: $window_thumbnail_border_color;
+  border-radius: $base_border_radius + 2;
+  // For window decorations with round corners we can't match
+  // the exact shape when the window is scaled. So apply a shadow
+  // to fix that case
+  box-shadow: inset 0 0 0 1px transparentize($borders_color, 0.8);
+}
+
+// Window titles
+.window-caption {
+  color: $osd_fg_color;
+  background-color: $osd_bg_color;
+  border:1px solid $osd_outer_borders_color;
+  border-radius: $base_border_radius + 1;
+  padding: $base_padding $base_padding * 2;
+  font-weight: bold;
+  @include fontsize($base_font_size + 1);
+}
+
+// Close button
+.window-close {
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+  border: none;
+  border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
+  padding: $window_close_button_padding;
+  height: $window_close_button_size;
+  width: $window_close_button_size;
+  box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
+
+  -shell-close-overlap: $window_close_button_size * 0.5;
+
+  &:hover {
+    background-color: lighten($selected_bg_color, 5%);
+  }
+
+  &:active {
+    background-color: darken($selected_bg_color, 5%);
+  }
+}
diff --git a/data/gnome-shell-sass/widgets/_workspace-switcher.scss b/data/gnome-shell-sass/widgets/_workspace-switcher.scss
new file mode 100644
index 0000000..5b15a30
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -0,0 +1,36 @@
+/* Workspace Switcher */
+.workspace-switcher-group {
+  padding: $base_padding * 2;
+}
+
+.workspace-switcher-container {
+  @extend %osd_panel;
+}
+
+.workspace-switcher {
+  background: transparent;
+  border: none;
+  border-radius: 0;
+  padding: 0;
+  spacing: $base_spacing * 2;
+}
+
+.ws-switcher-box {
+  background: transparent;
+  height: 50px;
+  background-size: 32px;
+  border: 1px solid transparentize($osd_fg_color,0.9);
+  border-radius: $base_border_radius + 3px;
+}
+
+// active workspace in the switcher
+.ws-switcher-active-up,
+.ws-switcher-active-down,
+.ws-switcher-active-left,
+.ws-switcher-active-right {
+  height: 52px;
+  background-color: $selected_bg_color;
+  border: 1px solid if($variant=='light', darken($selected_bg_color, 8%), lighten($selected_bg_color, 5%));
+  border-radius: $base_border_radius + 3px;
+  color: $selected_fg_color;
+}
diff --git a/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss b/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss
new file mode 100644
index 0000000..da76381
--- /dev/null
+++ b/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss
@@ -0,0 +1,32 @@
+/* Workspace pager */
+
+// thumbnails in overview
+.workspace-thumbnails {
+  @extend %overview_panel;
+  visible-width: 32px; //amount visible before hover
+  spacing: $base_spacing;
+  padding: $base_padding;
+
+  border-radius: $modal_radius 0 0 $modal_radius;
+  border-right-width: 0;
+
+  &:rtl {
+    border-radius: 0 $modal_radius $modal_radius 0;
+    border-left-width: 0;
+  }
+
+  // drag and drop indicator
+  .placeholder {
+    background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    background-size: contain;
+    height: 24px;
+  }
+}
+
+// selected indicator
+.workspace-thumbnail-indicator {
+  border: 3px solid $selected_bg_color;
+  border-radius: 3px;
+  padding: 0px;
+  // background-color: transparentize($selected_bg_color, 0.9);
+}
diff --git a/debian/changelog b/debian/changelog
index dbc6fa6..e7a1081 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+gnome-shell-extensions (3.36.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+    - Update Ukrainian translation
+    - Update Gnome Shell CSS
+  * Upload to unstable (part of transition: #954422)
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 10 Apr 2020 15:12:29 +0100
+
+gnome-shell-extensions (3.36.0-1) experimental; urgency=medium
+
+  * New upstream translation release
+
+ -- Iain Lane <laney@debian.org>  Mon, 16 Mar 2020 12:39:02 +0000
+
+gnome-shell-extensions (3.35.91-1) experimental; urgency=medium
+
+  * New upstream release
+    - Fixes and adjustments to latest gnome-shell
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Mon, 24 Feb 2020 18:29:29 +0000
+
 gnome-shell-extensions (3.34.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
index 70383af..9d46506 100644
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -557,10 +557,8 @@
         this.mainBox = new St.BoxLayout({ vertical: false });
         this.leftBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox = new St.ScrollView({
-            x_fill: true,
-            y_fill: false,
-            y_align: St.Align.START,
             style_class: 'apps-menu vfade',
+            x_expand: true,
         });
         this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let vscroll = this.applicationsScrollBox.get_vscroll_bar();
@@ -571,21 +569,13 @@
             this.menu.passEvents = false;
         });
         this.categoriesScrollBox = new St.ScrollView({
-            x_fill: true,
-            y_fill: false,
-            y_align: St.Align.START,
             style_class: 'vfade',
         });
         this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         vscroll = this.categoriesScrollBox.get_vscroll_bar();
         vscroll.connect('scroll-start', () => (this.menu.passEvents = true));
         vscroll.connect('scroll-stop', () => (this.menu.passEvents = false));
-        this.leftBox.add(this.categoriesScrollBox, {
-            expand: true,
-            x_fill: true,
-            y_fill: true,
-            y_align: St.Align.START,
-        });
+        this.leftBox.add_child(this.categoriesScrollBox);
 
         this.applicationsBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox.add_actor(this.applicationsBox);
@@ -593,16 +583,8 @@
         this.categoriesScrollBox.add_actor(this.categoriesBox);
 
         this.mainBox.add(this.leftBox);
-        this.mainBox.add(this._createVertSeparator(), {
-            expand: false,
-            x_fill: false,
-            y_fill: true,
-        });
-        this.mainBox.add(this.applicationsScrollBox, {
-            expand: true,
-            x_fill: true,
-            y_fill: true,
-        });
+        this.mainBox.add_child(this._createVertSeparator());
+        this.mainBox.add_child(this.applicationsScrollBox);
         section.actor.add_actor(this.mainBox);
     }
 
diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js
index eed46be..84f98ae 100644
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -22,9 +22,8 @@
     ADJUSTMENT: 4,
 };
 
-const Widget = GObject.registerClass({
-    GTypeName: 'AutoMoveWindowsPrefsWidget',
-}, class Widget extends Gtk.Grid {
+const Widget = GObject.registerClass(
+class Widget extends Gtk.Grid {
     _init(params) {
         super._init(params);
         this.set_orientation(Gtk.Orientation.VERTICAL);
diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
index f2c32a3..879702a 100644
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -17,7 +17,7 @@
         super._init();
 
         this.label = new St.Label({ text: mount.get_name() });
-        this.add(this.label, { expand: true });
+        this.add_child(this.label);
         this.label_actor = this.label;
 
         this.mount = mount;
@@ -69,7 +69,7 @@
     _eject() {
         let unmountArgs = [
             Gio.MountUnmountFlags.NONE,
-            (new ShellMountOperation.ShellMountOperation(this.mount)).mountOp,
+            new ShellMountOperation.ShellMountOperation(this.mount).mountOp,
             null, // Gio.Cancellable
         ];
 
diff --git a/extensions/meson.build b/extensions/meson.build
index d1bf92c..ed7a2ed 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -33,11 +33,11 @@
 )
 
 foreach js_source : js_sources
-  if (js60.found())
+  if (js68.found())
     path_array = '@0@'.format(js_source).split('/')
     name = join_paths(path_array[-2], path_array[-1])
 
-    test('Checking syntax of ' + name, js60,
+    test('Checking syntax of ' + name, js68,
       args: ['-s', '-c', js_source],
       workdir: meson.current_source_dir()
     )
diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js
index 201452f..3d3b516 100644
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -200,7 +200,7 @@
     eject() {
         let unmountArgs = [
             Gio.MountUnmountFlags.NONE,
-            (new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
+            new ShellMountOperation.ShellMountOperation(this._mount).mountOp,
             null, // Gio.Cancellable
         ];
 
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index 6521552..2c9dcf4 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -132,9 +132,8 @@
     }
 }
 
-const WindowTitle = GObject.registerClass({
-    GTypeName: 'WindowListWindowTitle',
-}, class WindowTitle extends St.BoxLayout {
+const WindowTitle = GObject.registerClass(
+class WindowTitle extends St.BoxLayout {
     _init(metaWindow) {
         this._metaWindow = metaWindow;
 
@@ -147,6 +146,7 @@
         this._icon = new St.Bin({ style_class: 'window-button-icon' });
         this.add(this._icon);
         this.label_actor = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
+        this.label_actor.clutter_text.single_line_mode = true;
         this.add(this.label_actor);
 
         this._textureCache = St.TextureCache.get_default();
@@ -205,7 +205,6 @@
 
 
 const BaseButton = GObject.registerClass({
-    GTypeName: 'WindowListBaseButton',
     GTypeFlags: GObject.TypeFlags.ABSTRACT,
     Properties: {
         'ignore-workspace': GObject.ParamSpec.boolean(
@@ -348,9 +347,8 @@
 });
 
 
-const WindowButton = GObject.registerClass({
-    GTypeName: 'WindowListWindowButton',
-}, class WindowButton extends BaseButton {
+const WindowButton = GObject.registerClass(
+class WindowButton extends BaseButton {
     _init(metaWindow, perMonitor, monitorIndex) {
         super._init(perMonitor, monitorIndex);
 
@@ -480,9 +478,8 @@
     }
 }
 
-const AppButton = GObject.registerClass({
-    GTypeName: 'WindowListAppButton',
-}, class AppButton extends BaseButton {
+const AppButton = GObject.registerClass(
+class AppButton extends BaseButton {
     _init(app, perMonitor, monitorIndex) {
         super._init(perMonitor, monitorIndex);
 
@@ -672,9 +669,8 @@
 });
 
 
-const WindowList = GObject.registerClass({
-    GTypeName: 'WindowListWindowList',
-}, class WindowList extends St.Widget {
+const WindowList = GObject.registerClass(
+class WindowList extends St.Widget {
     _init(perMonitor, monitor) {
         this._perMonitor = perMonitor;
         this._monitor = monitor;
@@ -706,7 +702,7 @@
             x_expand: true,
             y_expand: true,
         });
-        box.add(this._windowList, { expand: true });
+        box.add_child(this._windowList);
 
         this._windowList.connect('style-changed', () => {
             let node = this._windowList.get_theme_node();
@@ -719,7 +715,7 @@
         box.add(indicatorsBox);
 
         this._workspaceIndicator = new WorkspaceIndicator();
-        indicatorsBox.add(this._workspaceIndicator.container, { expand: false, y_fill: true });
+        indicatorsBox.add_child(this._workspaceIndicator.container);
 
         this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
         this._workspacesOnlyOnPrimaryChangedId = this._mutterSettings.connect(
@@ -923,11 +919,11 @@
     }
 
     _updateKeyboardAnchor() {
-        if (!Main.keyboard.actor)
+        if (!Main.keyboard.keyboardActor)
             return;
 
         let translationY = Main.overview.visible ? 0 : this.height;
-        Main.keyboard.actor.translation_y = -translationY;
+        Main.keyboard.keyboardActor.translation_y = -translationY;
     }
 
     _onAppStateChanged(appSys, app) {
diff --git a/extensions/window-list/windowPicker.js b/extensions/window-list/windowPicker.js
index 5a26bd2..522313d 100644
--- a/extensions/window-list/windowPicker.js
+++ b/extensions/window-list/windowPicker.js
@@ -6,17 +6,31 @@
 const Overview = imports.ui.overview;
 const { WorkspacesDisplay } = imports.ui.workspacesView;
 
-let MyWorkspacesDisplay = class extends WorkspacesDisplay {
-    constructor() {
-        super();
-
-        this.actor.add_constraint(
+let MyWorkspacesDisplay = GObject.registerClass(
+class MyWorkspacesDisplay extends WorkspacesDisplay {
+    _init() {
+        let workspaceManager = global.workspace_manager;
+
+        this._workspaceAdjustment = new St.Adjustment({
+            value: workspaceManager.get_active_workspace_index(),
+            lower: 0,
+            page_increment: 1,
+            page_size: 1,
+            step_increment: 0,
+            upper: workspaceManager.n_workspaces,
+        });
+
+        this._nWorkspacesChangedId =
+            workspaceManager.connect('notify::n-workspaces',
+                this._updateAdjustment.bind(this));
+
+        super._init(this._workspaceAdjustment);
+
+        this.add_constraint(
             new Layout.MonitorConstraint({
                 primary: true,
                 work_area: true,
             }));
-
-        this.actor.connect('destroy', this._onDestroy.bind(this));
 
         this._workareasChangedId = global.display.connect('workareas-changed',
             this._onWorkAreasChanged.bind(this));
@@ -46,12 +60,20 @@
         this.setWorkspacesFullGeometry(workarea);
     }
 
+    _updateAdjustment() {
+        let workspaceManager = global.workspace_manager;
+        this._workspaceAdjustment.set({
+            upper: workspaceManager.n_workspaces,
+            value: workspaceManager.get_active_workspace_index(),
+        });
+    }
+
     _updateWorkspacesViews() {
         super._updateWorkspacesViews();
 
         this._workspacesViews.forEach(v => {
-            Main.layoutManager.overviewGroup.remove_actor(v.actor);
-            Main.windowPicker.add_actor(v.actor);
+            Main.layoutManager.overviewGroup.remove_actor(v);
+            Main.windowPicker.add_actor(v);
         });
     }
 
@@ -59,11 +81,16 @@
         if (this._workareasChangedId)
             global.display.disconnect(this._workareasChangedId);
         this._workareasChangedId = 0;
-    }
-};
+
+        if (this._nWorkspacesChangedId)
+            global.workspace_manager.disconnect(this._nWorkspacesNotifyId);
+        this._nWorkspacesNotifyId = 0;
+
+        super._onDestroy();
+    }
+});
 
 var WindowPicker = GObject.registerClass({
-    GTypeName: 'WindowListWindowPicker',
     Signals: {
         'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
     },
@@ -98,7 +125,7 @@
         Main.overview.addAction = a => this._backgroundGroup.add_action(a);
 
         this._workspacesDisplay = new MyWorkspacesDisplay();
-        this.add_child(this._workspacesDisplay.actor);
+        this.add_child(this._workspacesDisplay);
 
         Main.overview.addAction = addActionOrig;
 
@@ -174,12 +201,12 @@
     }
 
     _fakeOverviewAnimation(onComplete) {
-        Main.overview.animationInProgress = true;
+        Main.overview._animationInProgress = true;
         GLib.timeout_add(
             GLib.PRIORITY_DEFAULT,
             Overview.ANIMATION_TIME,
             () => {
-                Main.overview.animationInProgress = false;
+                Main.overview._animationInProgress = false;
                 if (onComplete)
                     onComplete();
             });
@@ -187,7 +214,7 @@
 
     _fakeOverviewVisible(visible) {
         // Fake overview state for WorkspacesDisplay
-        Main.overview.visible = visible;
+        Main.overview._visible = visible;
 
         // Hide real windows
         Main.layoutManager._inOverview = visible;
diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js
index f14217e..1617efe 100644
--- a/extensions/window-list/workspaceIndicator.js
+++ b/extensions/window-list/workspaceIndicator.js
@@ -9,9 +9,8 @@
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
-let WindowPreview = GObject.registerClass({
-    GTypeName: 'WindowListWindowPreview',
-}, class WindowPreview extends St.Button {
+let WindowPreview = GObject.registerClass(
+class WindowPreview extends St.Button {
     _init(window) {
         super._init({
             style_class: 'window-list-window-preview',
@@ -98,9 +97,8 @@
     }
 });
 
-let WorkspaceThumbnail = GObject.registerClass({
-    GTypeName: 'WindowListWorkspaceThumbnail',
-}, class WorkspaceThumbnail extends St.Button {
+let WorkspaceThumbnail = GObject.registerClass(
+class WorkspaceThumbnail extends St.Button {
     _init(index) {
         super._init({
             style_class: 'workspace',
@@ -205,9 +203,8 @@
     }
 });
 
-var WorkspaceIndicator = GObject.registerClass({
-    GTypeName: 'WindowListWorkspaceIndicator',
-}, class WorkspaceIndicator extends PanelMenu.Button {
+var WorkspaceIndicator = GObject.registerClass(
+class WorkspaceIndicator extends PanelMenu.Button {
     _init() {
         super._init(0.0, _('Workspace Indicator'), true);
         this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
diff --git a/extensions/windowsNavigator/extension.js b/extensions/windowsNavigator/extension.js
index 99a2d5d..088cd3f 100644
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -1,12 +1,12 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported init */
-const { Clutter, St } = imports.gi;
+const { Clutter, GObject, St } = imports.gi;
 
 const Main = imports.ui.main;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;
 
-var MyWindowOverlay = class extends Workspace.WindowOverlay {
+class MyWindowOverlay extends Workspace.WindowOverlay {
     constructor(windowClone, parentActor) {
         super(windowClone, parentActor);
 
@@ -19,7 +19,7 @@
     }
 
     showTooltip() {
-        this._text.raise_top();
+        this._parentActor.set_child_below_sibling(this._text, null);
         this._text.show();
         this._text.text = (this._windowClone.slotId + 1).toString();
     }
@@ -37,23 +37,24 @@
         let textX = cloneX - 2;
         let textY = cloneY - 2;
         this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
-        this._text.raise_top();
-    }
-};
-
-var MyWorkspace = class extends Workspace.Workspace {
-    constructor(metaWorkspace, monitorIndex) {
-        super(metaWorkspace, monitorIndex);
+        this._parentActor.set_child_below_sibling(this._text, null);
+    }
+}
+
+var MyWorkspace = GObject.registerClass(
+class MyWorkspace extends Workspace.Workspace {
+    _init(metaWorkspace, monitorIndex) {
+        super._init(metaWorkspace, monitorIndex);
 
         if (metaWorkspace && metaWorkspace.index() < 9) {
             this._tip = new St.Label({
                 style_class: 'extension-windowsNavigator-window-tooltip',
                 visible: false,
             });
-            this.actor.add_actor(this._tip);
-
-            this.actor.connect('notify::scale-x', () => {
-                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
+            this.add_actor(this._tip);
+
+            this.connect('notify::scale-x', () => {
+                this._tip.set_scale(1 / this.scale_x, 1 / this.scale_x);
             });
         } else {
             this._tip = null;
@@ -67,7 +68,7 @@
 
         // Hand code this instead of using _getSpacingAndPadding
         // because that fails on empty workspaces
-        let node = this.actor.get_theme_node();
+        let node = this.get_theme_node();
         let padding = {
             left: node.get_padding(St.Side.LEFT),
             top: node.get_padding(St.Side.TOP),
@@ -79,7 +80,7 @@
         this._tip.x = area.x;
         this._tip.y = area.y;
         this._tip.show();
-        this._tip.raise_top();
+        this.set_child_below_sibling(this._tip, null);
     }
 
     hideTooltip() {
@@ -111,11 +112,12 @@
                 this._windowOverlays[i].hideTooltip();
         }
     }
-};
-
-var MyWorkspacesView = class extends WorkspacesView.WorkspacesView {
-    constructor(width, height, x, y, workspaces) {
-        super(width, height, x, y, workspaces);
+});
+
+var MyWorkspacesView = GObject.registerClass(
+class MyWorkspacesView extends WorkspacesView.WorkspacesView {
+    _init(width, height, x, y, workspaces) {
+        super._init(width, height, x, y, workspaces);
 
         this._pickWorkspace = false;
         this._pickWindow = false;
@@ -238,7 +240,7 @@
         }
         return false;
     }
-};
+});
 
 class Extension {
     constructor() {
diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js
index fb86ce5..6ea3eeb 100644
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -15,9 +15,8 @@
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
-let WindowPreview = GObject.registerClass({
-    GTypeName: 'WorkspaceIndicatorWindowPreview',
-}, class WindowPreview extends St.Button {
+let WindowPreview = GObject.registerClass(
+class WindowPreview extends St.Button {
     _init(window) {
         super._init({
             style_class: 'workspace-indicator-window-preview',
@@ -104,9 +103,8 @@
     }
 });
 
-let WorkspaceThumbnail = GObject.registerClass({
-    GTypeName: 'WorkspaceIndicatorWorkspaceThumbnail',
-}, class WorkspaceThumbnail extends St.Button {
+let WorkspaceThumbnail = GObject.registerClass(
+class WorkspaceThumbnail extends St.Button {
     _init(index) {
         super._init({
             style_class: 'workspace',
diff --git a/meson.build b/meson.build
index da61e4e..a307e6f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.34.2',
+  version: '3.36.1',
   meson_version: '>= 0.44.0',
   license: 'GPL2+'
 )
@@ -20,7 +20,7 @@
 sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
 xsessiondir = join_paths(datadir, 'xsessions')
 
-js60 = find_program('js60', required: false)
+js68 = find_program('js68', required: false)
 
 ver_arr = meson.project_version().split('.')
 if ver_arr[1].to_int().is_even()
diff --git a/po/en_GB.po b/po/en_GB.po
index 92ae445..69be654 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,21 +4,23 @@
 # Bruce Cowan <bruce@bcowan.eu>, 2011, 2018.
 # Chris Leonard <cjlhomeaddress@gmail.com>, 2012.
 # Philip Withnall <philip@tecnocode.co.uk>, 2014.
+# Zander Brown <zbrown@gnome.org>, 2019.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2018-02-20 23:07+0000\n"
-"PO-Revision-Date: 2018-03-10 18:03+0000\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.eu>\n"
-"Language-Team: Sugar Labs\n"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-08-25 16:49+0100\n"
+"Last-Translator: Zander Brown <zbrown@gnome.org>\n"
+"Language-Team: English - United Kingdom <en_GB@li.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Gtranslator 3.32.1\n"
 "X-Project-Style: gnome\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -29,72 +31,11 @@
 msgid "This session logs you into GNOME Classic"
 msgstr "This session logs you into GNOME Classic"
 
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgid "Attach modal dialog to the parent window"
-msgstr "Attach modal dialogue to the parent window"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Arrangement of buttons on the titlebar"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Enable edge tiling when dropping windows on screen edges"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
-msgid "Workspaces only on primary monitor"
-msgstr "Workspaces only on primary monitor"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Delay focus changes in mouse mode until the pointer stops moving"
-
-#: extensions/alternate-tab/prefs.js:19
-msgid "Thumbnail only"
-msgstr "Thumbnail only"
-
-#: extensions/alternate-tab/prefs.js:20
-msgid "Application icon only"
-msgstr "Application icon only"
-
-#: extensions/alternate-tab/prefs.js:21
-msgid "Thumbnail and application icon"
-msgstr "Thumbnail and application icon"
-
-#: extensions/alternate-tab/prefs.js:34
-msgid "Present windows as"
-msgstr "Present windows as"
-
-#: extensions/alternate-tab/prefs.js:65
-msgid "Show only windows in the current workspace"
-msgstr "Show only windows in the current workspace"
-
-#: extensions/apps-menu/extension.js:37
-msgid "Activities Overview"
-msgstr "Activities Overview"
-
-#: extensions/apps-menu/extension.js:130
+#: extensions/apps-menu/extension.js:113
 msgid "Favorites"
 msgstr "Favourites"
 
-#: extensions/apps-menu/extension.js:417
+#: extensions/apps-menu/extension.js:368
 msgid "Applications"
 msgstr "Applications"
 
@@ -110,32 +51,31 @@
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 
-#: extensions/auto-move-windows/prefs.js:53
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Application"
 
-#: extensions/auto-move-windows/prefs.js:62
-#: extensions/auto-move-windows/prefs.js:117
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Workspace"
 
-#: extensions/auto-move-windows/prefs.js:78
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: extensions/auto-move-windows/prefs.js:98
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Create new matching rule"
 
-#: extensions/auto-move-windows/prefs.js:103
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Add"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:103
-#: extensions/places-menu/placeDisplay.js:219
+#: extensions/drive-menu/extension.js:102
+#: extensions/places-menu/placeDisplay.js:232
 #, javascript-format
-#| msgid "Ejecting drive '%s' failed:"
 msgid "Ejecting drive “%s” failed:"
 msgstr "Ejecting drive “%s” failed:"
 
@@ -143,46 +83,9 @@
 msgid "Removable devices"
 msgstr "Removable devices"
 
-#: extensions/drive-menu/extension.js:143
-#| msgid "Open File"
+#: extensions/drive-menu/extension.js:145
 msgid "Open Files"
 msgstr "Open Files"
-
-#: extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Hello, world!"
-
-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
-msgid "Alternative greeting text."
-msgstr "Alternative greeting text."
-
-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-
-#: extensions/example/prefs.js:27
-msgid "Message"
-msgstr "Message"
-
-#. TRANSLATORS: Example is the name of the extension, should not be
-#. translated
-#: extensions/example/prefs.js:40
-#| msgid ""
-#| "Example aims to show how to build well behaved extensions for the Shell "
-#| "and as such it has little functionality on its own.\n"
-#| "Nevertheless it's possible to customize the greeting message."
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customize the greeting message."
-msgstr ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customise the greeting message."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
@@ -212,32 +115,31 @@
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 
-#: extensions/places-menu/extension.js:79
-#: extensions/places-menu/extension.js:82
+#: extensions/places-menu/extension.js:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Places"
 
-#: extensions/places-menu/placeDisplay.js:66
+#: extensions/places-menu/placeDisplay.js:46
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "Failed to launch “%s”"
+
+#: extensions/places-menu/placeDisplay.js:61
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Failed to mount volume for “%s”"
 
-#: extensions/places-menu/placeDisplay.js:79
-#, javascript-format
-#| msgid "Failed to launch \"%s\""
-msgid "Failed to launch “%s”"
-msgstr "Failed to launch “%s”"
-
-#: extensions/places-menu/placeDisplay.js:135
-#: extensions/places-menu/placeDisplay.js:158
+#: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Computer"
 
-#: extensions/places-menu/placeDisplay.js:336
+#: extensions/places-menu/placeDisplay.js:358
 msgid "Home"
 msgstr "Home"
 
-#: extensions/places-menu/placeDisplay.js:378
+#: extensions/places-menu/placeDisplay.js:403
 msgid "Browse Network"
 msgstr "Browse Network"
 
@@ -246,7 +148,6 @@
 msgstr "Cycle Screenshot Sizes"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
 msgid "Cycle Screenshot Sizes Backward"
 msgstr "Cycle Screenshot Sizes Backward"
 
@@ -258,52 +159,47 @@
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:106
+#: extensions/window-list/extension.js:99
 msgid "Close"
 msgstr "Close"
 
-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:119
 msgid "Unminimize"
 msgstr "Unminimise"
 
-#: extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:119
 msgid "Minimize"
 msgstr "Minimise"
 
-#: extensions/window-list/extension.js:132
+#: extensions/window-list/extension.js:126
 msgid "Unmaximize"
 msgstr "Unmaximise"
 
-#: extensions/window-list/extension.js:133
+#: extensions/window-list/extension.js:126
 msgid "Maximize"
 msgstr "Maximise"
 
-#: extensions/window-list/extension.js:408
+#: extensions/window-list/extension.js:431
 msgid "Minimize all"
 msgstr "Minimise all"
 
-#: extensions/window-list/extension.js:414
+#: extensions/window-list/extension.js:437
 msgid "Unminimize all"
 msgstr "Unminimise all"
 
-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:443
 msgid "Maximize all"
 msgstr "Maximise all"
 
-#: extensions/window-list/extension.js:429
+#: extensions/window-list/extension.js:451
 msgid "Unmaximize all"
 msgstr "Unmaximise all"
 
-#: extensions/window-list/extension.js:438
+#: extensions/window-list/extension.js:459
 msgid "Close all"
 msgstr "Close all"
 
-#: extensions/window-list/extension.js:646
-#: extensions/workspace-indicator/extension.js:26
-msgid "Workspace Indicator"
-msgstr "Workspace Indicator"
-
-#: extensions/window-list/extension.js:811
+#: extensions/window-list/extension.js:741
 msgid "Window List"
 msgstr "Window List"
 
@@ -312,9 +208,6 @@
 msgstr "When to group windows"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
-#| msgid ""
-#| "Decides when to group windows from the same application on the window "
-#| "list. Possible values are \"never\", \"auto\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
@@ -323,10 +216,23 @@
 "Possible values are “never”, “auto” and “always”."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: extensions/window-list/prefs.js:82
+#| msgid "Show only windows in the current workspace"
+msgid "Show windows from all workspaces"
+msgstr "Show windows from all workspaces"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#| msgid ""
+#| "Whether to show the window list on all connected monitors or only on the "
+#| "primary one."
+msgid "Whether to show windows from all workspaces or only the current one."
+msgstr "Whether to show windows from all workspaces or only the current one."
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Show the window list on all monitors"
 
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
@@ -334,38 +240,114 @@
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 
-#: extensions/window-list/prefs.js:28
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Window Grouping"
 
-#: extensions/window-list/prefs.js:46
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Never group windows"
 
-#: extensions/window-list/prefs.js:47
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Group windows when space is limited"
 
-#: extensions/window-list/prefs.js:48
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Always group windows"
 
-#: extensions/window-list/prefs.js:71
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Show on all monitors"
 
-#: extensions/workspace-indicator/prefs.js:134
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
+msgid "Workspace Indicator"
+msgstr "Workspace Indicator"
+
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Workspace Names"
 
-#: extensions/workspace-indicator/prefs.js:150
+#: extensions/workspace-indicator/prefs.js:151
 msgid "Name"
 msgstr "Name"
 
-#: extensions/workspace-indicator/prefs.js:190
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Workspace %d"
+
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Attach modal dialogue to the parent window"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Arrangement of buttons on the titlebar"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr "Enable edge tiling when dropping windows on screen edges"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Workspaces only on primary monitor"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr "Delay focus changes in mouse mode until the pointer stops moving"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "Thumbnail only"
+
+#~ msgid "Application icon only"
+#~ msgstr "Application icon only"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "Thumbnail and application icon"
+
+#~ msgid "Present windows as"
+#~ msgstr "Present windows as"
+
+#~ msgid "Activities Overview"
+#~ msgstr "Activities Overview"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Hello, world!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "Alternative greeting text."
+
+#~ msgid ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+#~ msgstr ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+
+#~ msgid "Message"
+#~ msgstr "Message"
+
+#~| msgid ""
+#~| "Example aims to show how to build well behaved extensions for the Shell "
+#~| "and as such it has little functionality on its own.\n"
+#~| "Nevertheless it's possible to customize the greeting message."
+#~ msgid ""
+#~ "Example aims to show how to build well behaved extensions for the Shell "
+#~ "and as such it has little functionality on its own.\n"
+#~ "Nevertheless it’s possible to customize the greeting message."
+#~ msgstr ""
+#~ "Example aims to show how to build well behaved extensions for the Shell "
+#~ "and as such it has little functionality on its own.\n"
+#~ "Nevertheless it’s possible to customise the greeting message."
 
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "GNOME Shell Classic"
diff --git a/po/gl.po b/po/gl.po
index 6eda49a..3eecf3a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,8 +8,8 @@
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2019-08-09 22:24+0000\n"
-"PO-Revision-Date: 2019-08-25 18:13+0200\n"
+"POT-Creation-Date: 2019-11-21 21:24+0000\n"
+"PO-Revision-Date: 2019-12-25 15:24+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician\n"
 "Language: gl\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.4\n"
 "X-Project-Style: gnome\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -32,25 +32,25 @@
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: extensions/apps-menu/extension.js:368
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
-msgstr "Aplicativos"
+msgstr "Aplicacións"
 
 #: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
-msgstr "Lista de aplicativos e espazos de traballo"
+msgstr "Lista de aplicacións e espazos de traballo"
 
 #: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"Unha lista de cadeas, cada unha das cales contén un id de aplicativo (nome de "
+"Unha lista de cadeas, cada unha das cales contén un id de aplicación (nome de "
 "ficheiro desktop), seguido por unha coma e o número do espazo de traballo"
 
 #: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
-msgstr "Aplicativo"
+msgstr "Aplicación"
 
 #: extensions/auto-move-windows/prefs.js:71
 #: extensions/auto-move-windows/prefs.js:134
@@ -70,17 +70,17 @@
 msgstr "Engadir"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:102
-#: extensions/places-menu/placeDisplay.js:232
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Fallo ao extraer a unidade «%s»:"
 
-#: extensions/drive-menu/extension.js:118
+#: extensions/drive-menu/extension.js:119
 msgid "Removable devices"
 msgstr "Dispositivos extraíbeis"
 
-#: extensions/drive-menu/extension.js:145
+#: extensions/drive-menu/extension.js:146
 msgid "Open Files"
 msgstr "Abrir ficheiros"
 
@@ -131,11 +131,11 @@
 msgid "Computer"
 msgstr "Computador"
 
-#: extensions/places-menu/placeDisplay.js:358
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "Cartafol persoal"
 
-#: extensions/places-menu/placeDisplay.js:403
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Explorar a rede"
 
@@ -155,23 +155,23 @@
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "O nome do tema, a cargar desde ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Pechar"
 
-#: extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Restabelecer"
 
-#: extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Restaurar"
 
-#: extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Maximizar"
 
@@ -208,7 +208,7 @@
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
 msgstr ""
-"Decide cando agrupar as xanelas do mesmo aplicativo na lista de xanelas. Os "
+"Decide cando agrupar as xanelas da mesma aplicación na lista de xanelas. Os "
 "valores posíbeis son «never» (nunca), «auto» (automático) e «always» (sempre)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
@@ -258,374 +258,15 @@
 msgid "Workspace Indicator"
 msgstr "Indicador de espazo de traballo"
 
-#: extensions/workspace-indicator/prefs.js:131
+#: extensions/workspace-indicator/prefs.js:129
 msgid "Workspace Names"
 msgstr "Nomes dos espazos de traballo"
 
-#: extensions/workspace-indicator/prefs.js:151
+#: extensions/workspace-indicator/prefs.js:149
 msgid "Name"
 msgstr "Nome"
 
-#: extensions/workspace-indicator/prefs.js:191
+#: extensions/workspace-indicator/prefs.js:189
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Espazos de traballo %d"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Anexar o diálogo modal á xanela pai"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Esta chave sobrescribe a chave en org.gnome.mutter cando executa GNOME Shell."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Ordenación dos botóns na barra de título"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when running "
-#~ "GNOME Shell."
-#~ msgstr ""
-#~ "Esta chave sobrescribe a chave en org.gnome.desktop.wm.preferences ao "
-#~ "executar GNOME Shell."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr "Activar o mosaico nos bordos ao arrastrar xanelas aos bordos da xanela"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Espazos de traballo só no monitor primario"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "Atrasar o cambio de foco no modo rato até que o punteiro se deteña ao moverse"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Só miniaturas"
-
-#~ msgid "Application icon only"
-#~ msgstr "Só icona do aplicativo"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Miniatura e icona do aplicativo"
-
-#~ msgid "Present windows as"
-#~ msgstr "Presentar xanelas como"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Vista xeral de actividades"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Hola, mundo!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Texto de benvida alternativo"
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on the "
-#~ "panel."
-#~ msgstr ""
-#~ "Se non está baleiro, contén o texto que se despregará ao premer sobre o panel"
-
-#~ msgid "Message"
-#~ msgstr "Mensaxe"
-
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell and "
-#~ "as such it has little functionality on its own.\n"
-#~ "Nevertheless it’s possible to customize the greeting message."
-#~ msgstr ""
-#~ "«Exemplo» pretende mostrar como construir extensións de bo comportamento "
-#~ "para a Shell e por iso ten pouca funcionalidade por si só.\n"
-#~ "Porén, é posíbel personalizar a mensaxe de benvida."
-
-#~ msgid "CPU"
-#~ msgstr "CPU"
-
-#~ msgid "Memory"
-#~ msgstr "Memoria"
-
-#~ msgid "GNOME Shell Classic"
-#~ msgstr "GNOME Shell clásico"
-
-#~ msgid "Window management and application launching"
-#~ msgstr "Xestor de xanelas e inicio de aplicativos"
-
-#~ msgid "Suspend"
-#~ msgstr "Suspender"
-
-#~ msgid "Hibernate"
-#~ msgstr "Hibernar"
-
-#~ msgid "Power Off"
-#~ msgstr "Apagar"
-
-#~ msgid "Enable suspending"
-#~ msgstr "Activar a suspensión"
-
-#~ msgid "Control the visibility of the Suspend menu item"
-#~ msgstr "Controla a visibilidade do elemento de menú «Suspender»"
-
-#~ msgid "Enable hibernating"
-#~ msgstr "Activar hibernación"
-
-#~ msgid "Control the visibility of the Hibernate menu item"
-#~ msgstr "Controla a visibilidade do elemento de menú «Hibernar»"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid "Left"
-#~ msgstr "Esquerda"
-
-#~ msgid "Right"
-#~ msgstr "Dereita"
-
-#~ msgid "Upside-down"
-#~ msgstr "Co de arriba cara abaixo"
-
-#~ msgid "Display"
-#~ msgstr "Pantalla"
-
-#~ msgid "Display Settings"
-#~ msgstr "Preferencias da pantalla"
-
-#~ msgid "Devices"
-#~ msgstr "Dispositivos"
-
-#~ msgid "Bookmarks"
-#~ msgstr "Marcadores"
-
-#~ msgid "Network"
-#~ msgstr "Rede"
-
-#~ msgid "File System"
-#~ msgstr "Sistema de ficheiros"
-
-#~ msgid "The application icon mode."
-#~ msgstr "O modo da icona do aplicativo."
-
-#~ msgid ""
-#~ "Configures how the windows are shown in the switcher. Valid possibilities "
-#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-#~ "only' (shows only the application icon) or 'both'."
-#~ msgstr ""
-#~ "Configura como se mostran as xanelas no intercambiador. As opcións posíbeis "
-#~ "son «thumbnail-only» (mostra unha miniatura da xanela, «app-icon-only» (só "
-#~ "mostra a icona do aplicativo) ou «both» (móstranse ambas cosas)."
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "Arrastre aquí para engadir aos favoritos"
-
-#~ msgid "New Window"
-#~ msgstr "Nova xanela"
-
-#~ msgid "Quit Application"
-#~ msgstr "Saír do aplicativo"
-
-#~ msgid "Remove from Favorites"
-#~ msgstr "Eliminar dos favoritos"
-
-#~ msgid "Position of the dock"
-#~ msgstr "Posición da doca"
-
-#~ msgid ""
-#~ "Sets the position of the dock in the screen. Allowed values are 'right' or "
-#~ "'left'"
-#~ msgstr ""
-#~ "Estabelece a posición da doca na pantalla. Os valores permitidos son «right» "
-#~ "e «left»"
-
-#~ msgid "Icon size"
-#~ msgstr "Tamaño da icona"
-
-#~ msgid "Sets icon size of the dock."
-#~ msgstr "Estabelece o tamaño das iconas na doca."
-
-#~ msgid "Enable/disable autohide"
-#~ msgstr "Activar/desactivar autoagochado"
-
-#~ msgid "Autohide effect"
-#~ msgstr "Efecto de autoagochado"
-
-#~ msgid ""
-#~ "Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' and "
-#~ "'move'"
-#~ msgstr ""
-#~ "Estabelece o efecto de agochado da doca. Os valores permitidos son "
-#~ "«resize» (redimensionar( e «rescale» (re-escalar) e «move» (mover)"
-
-#~ msgid "Autohide duration"
-#~ msgstr "Duración do autoagochado"
-
-#~ msgid "Sets the time duration of the autohide effect."
-#~ msgstr "Estabelece a duración do efecto de autoagochado."
-
-#~ msgid "Monitor"
-#~ msgstr "Pantalla"
-
-#~ msgid ""
-#~ "Sets monitor to display dock in. The default value (-1) is the primary "
-#~ "monitor."
-#~ msgstr ""
-#~ "Estabelece a pantalla na que mostrar o taboleiro. O valor predeterminado es "
-#~ "(-1), que é a pantalla principal."
-
-#~ msgid "%s is away."
-#~ msgstr "%s está ausente."
-
-#~ msgid "%s is offline."
-#~ msgstr "%s está desconectado."
-
-#~ msgid "%s is online."
-#~ msgstr "%s está conectado."
-
-#~ msgid "%s is busy."
-#~ msgstr "%s está ocupado."
-
-#~ msgid "Removable Devices"
-#~ msgstr "Dispositivos extraíbeis"
-
-#~ msgid "Configure display settings..."
-#~ msgstr "Configurar as preferencias de pantalla…"
-
-#~ msgid "The alt tab behaviour."
-#~ msgstr "O comportamento de Alt+Tab"
-
-#~ msgid ""
-#~ "Sets the Alt-Tab behaviour. Possible values are: all_thumbnails and "
-#~ "workspace_icons. See the configuration dialogs for details."
-#~ msgstr ""
-#~ "Estabelece o comportamento do Alt+Tab. Os valores posíbeis son: "
-#~ "«native» (nativo), «all_thumbnails» (todo e miniaturas) e "
-#~ "«worspace_icons» (iconas de áreas de traballo). Para obter información máis "
-#~ "detallada, consulte a configuración dos diálogos."
-
-#~ msgid ""
-#~ "This mode presents all applications from all workspaces in one selection "
-#~ "list. Instead of using the application icon of every window, it uses small "
-#~ "thumbnails resembling the window itself."
-#~ msgstr ""
-#~ "Este modo presenta todos os aplicativos de todas as áreas de traballo nunha "
-#~ "lista de selección. No lugar de usar a icona de aplicativo de cada xanela, "
-#~ "usa pequenas miniaturas que semellan a propia xanela."
-
-#~ msgid "Workspace & Icons"
-#~ msgstr "Espazos de traballo e iconas"
-
-#~ msgid ""
-#~ "This mode let's you switch between the applications of your current "
-#~ "workspace and gives you additionally the option to switch to the last used "
-#~ "application of your previous workspace. This is always the last symbol in "
-#~ "the list and is segregated by a separator/vertical line if available. \n"
-#~ "Every window is represented by its application icon."
-#~ msgstr ""
-#~ "Este modo permítelle alternar entre os aplicativos da súa área de traballo "
-#~ "actual e dálle a opción de cambiar ao último aplicativo empregada da súa "
-#~ "área de traballo anterior. Este sempre é o último símbolo da lista e está "
-#~ "separado por un separador/liña vertical se está dispoñíbel.\n"
-#~ "Cada xanela está representada pola súa icona de aplicativo."
-
-#~ msgid "Move current selection to front before closing the popup"
-#~ msgstr "Mover a selección actual ao frente antes de pechar a xanela emerxente"
-
-#~ msgid ""
-#~ "The Alternate Tab can be used in different modes, that affect the way "
-#~ "windows are chosen and presented."
-#~ msgstr ""
-#~ "A combinación de teclas Alt+Tab pódese usar en diferentes modos, que afectan "
-#~ "á maneira na que se elixen e presentan as xanelas."
-
-#~ msgid "Notifications"
-#~ msgstr "Notificacións"
-
-#~ msgid "Online Accounts"
-#~ msgstr "Contas en liña"
-
-#~ msgid "Lock Screen"
-#~ msgstr "Bloquear Pantaia"
-
-#~ msgid "Switch User"
-#~ msgstr "Trocar de Usario"
-
-#~ msgid "Log Out..."
-#~ msgstr "Sair da sesión"
-
-#~ msgid ""
-#~ "This is the first time you use the Alternate Tab extension. \n"
-#~ "Please choose your preferred behaviour:\n"
-#~ "\n"
-#~ "All & Thumbnails:\n"
-#~ "    This mode presents all applications from all workspaces in one "
-#~ "selection \n"
-#~ "    list. Instead of using the application icon of every window, it uses "
-#~ "small \n"
-#~ "    thumbnails resembling the window itself. \n"
-#~ "\n"
-#~ "Workspace & Icons:\n"
-#~ "    This mode let's you switch between the applications of your current \n"
-#~ "    workspace and gives you additionally the option to switch to the last "
-#~ "used \n"
-#~ "    application of your previous workspace. This is always the last symbol "
-#~ "in \n"
-#~ "    the list and is segregated by a separator/vertical line if available. \n"
-#~ "    Every window is represented by its application icon.  \n"
-#~ "\n"
-#~ "Native:\n"
-#~ "    This mode is the native GNOME 3 behaviour or in other words: Clicking \n"
-#~ "    native switches the Alternate Tab extension off. \n"
-#~ msgstr ""
-#~ "É a primeira vez que usa a extensión de Tab alternativo.\n"
-#~ "Seleccione o comportamento prefirido:\n"
-#~ "\n"
-#~ "Todo e miniaturas:\n"
-#~ "    Este modo mostra tódolos aplicativos de tódolos espazos de traballa "
-#~ "nunha\n"
-#~ "    lista de selección. No lugar de usar as iconas de aplicativos para cada\n"
-#~ "    xanela, usa miniaturas pequenas que representan as xanelas.\n"
-#~ "\n"
-#~ "Espazos de traballo e iconas:\n"
-#~ "    Este modo permítelle cambiar entre os aplicativos do seu espazo de "
-#~ "traballo \n"
-#~ "    actual e permítelle engadir a opción de cambiar entre o último "
-#~ "aplicativo\n"
-#~ "    usado do seu espazo de traballo anterior. Sempre é o último símbolo na\n"
-#~ "    lista e está separado por unha liña separador/vertical se está "
-#~ "dispoñíbel.\n"
-#~ "    Cada xanela está representada pola icona do aplicativo.\n"
-#~ "\n"
-#~ "Nativo:\n"
-#~ "    Este modo é o comportamento nativo de GNOME 3 ou noutras palabras: ao \n"
-#~ "    seleccionar nativo desactiva a extensión Tab alternativo.\n"
-
-#~ msgid "Alt Tab Behaviour"
-#~ msgstr "Comportamento do Alt Tab"
-
-#~ msgid "Native"
-#~ msgstr "Nativa"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Ask the user for a default behaviour if true."
-#~ msgstr "Preguntarlle o comportamento predeterminado ao usuario se é certo."
-
-#~ msgid "Indicates if Alternate Tab is newly installed"
-#~ msgstr "Indica se o Tab alternativo está instalado recentemente"
-
-#~ msgid ""
-#~ "The algorithm used to layout thumbnails in the overview. 'grid' to use the "
-#~ "default grid based algorithm, 'natural' to use another one that reflects "
-#~ "more the position and size of the actual window"
-#~ msgstr ""
-#~ "O algoritmo usado pola disposición de miniaturas na vista previa. «grid» "
-#~ "para usar o algoritmo predeterminado baseado na grella, «natural» para usar "
-#~ "outro que reflexa máis a posición e tamaño da xanela actual"
-
-#~ msgid "Window placement strategy"
-#~ msgstr "Estratexia de disposición de xanelas"
-
-#~ msgid "Available"
-#~ msgstr "Dispoñible"
-
-#~ msgid "Busy"
-#~ msgstr "Ocupado"
diff --git a/po/ja.po b/po/ja.po
index afa1e55..3573141 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,20 +1,20 @@
 # gnome-shell-extensions ja.po
-# Copyright (C) 2011-2013 gnome-shell-extensions's COPYRIGHT HOLDER
+# Copyright (C) 2011-2015, 2019-2020 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Takeshi AIHANA <takeshi.aihana@gmail.com>, 2011.
 # Jiro Matsuzawa <jmatsuzawa@gnome.org>, 2011, 2013, 2015
 # Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 2013.
 # Ikuya Awashiro <ikuya@fruitsbasket.info>, 2014.
 # Hajime Taira <htaira@redhat.com>, 2014, 2015.
-# sicklylife <translation@sicklylife.jp>, 2019.
+# sicklylife <translation@sicklylife.jp>, 2019-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2019-08-09 22:24+0000\n"
-"PO-Revision-Date: 2019-08-27 21:57+0900\n"
+"POT-Creation-Date: 2019-12-11 18:09+0000\n"
+"PO-Revision-Date: 2020-01-20 00:00+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@@ -35,7 +35,7 @@
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: extensions/apps-menu/extension.js:368
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "アプリケーション"
 
@@ -51,39 +51,39 @@
 "アプリケーションの識別子 (.desktop ファイル名) とコロンの後にワークスペース番"
 "号を付与した文字列を要素とするリストです"
 
-#: extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:59
 msgid "Application"
 msgstr "アプリケーション"
 
-#: extensions/auto-move-windows/prefs.js:71
-#: extensions/auto-move-windows/prefs.js:134
+#: extensions/auto-move-windows/prefs.js:70
+#: extensions/auto-move-windows/prefs.js:133
 msgid "Workspace"
 msgstr "ワークスペース"
 
-#: extensions/auto-move-windows/prefs.js:89
+#: extensions/auto-move-windows/prefs.js:88
 msgid "Add Rule"
 msgstr "ルールを追加"
 
-#: extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:110
 msgid "Create new matching rule"
 msgstr "新規ルールの作成"
 
-#: extensions/auto-move-windows/prefs.js:117
+#: extensions/auto-move-windows/prefs.js:116
 msgid "Add"
 msgstr "追加"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:102
-#: extensions/places-menu/placeDisplay.js:232
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "ドライブ“%s”の取り出しに失敗しました:"
 
-#: extensions/drive-menu/extension.js:118
+#: extensions/drive-menu/extension.js:119
 msgid "Removable devices"
 msgstr "リムーバブルデバイス"
 
-#: extensions/drive-menu/extension.js:145
+#: extensions/drive-menu/extension.js:146
 msgid "Open Files"
 msgstr "ファイルを開く"
 
@@ -113,9 +113,9 @@
 "restarting the shell to have any effect."
 msgstr ""
 "TRUE にすると、ウィンドウのサムネイルの上端にそのウィンドウのタイトルバーを表"
-"示します (これは、サムネイルの下端にタイトルバーを表示する GNOME シェルのデ"
-"フォルト値よりも優先されます)。この設定を適用する際は GNOME シェルを再起動し"
-"てください。"
+"示します (これは、サムネイルの下端にタイトルバーを表示する GNOME shellのデフ"
+"ォルト値よりも優先されます)。この設定を適用する際は GNOME shellを再起動してく"
+"ださい。"
 
 #: extensions/places-menu/extension.js:80
 #: extensions/places-menu/extension.js:84
@@ -137,11 +137,11 @@
 msgid "Computer"
 msgstr "コンピューター"
 
-#: extensions/places-menu/placeDisplay.js:358
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "ホーム"
 
-#: extensions/places-menu/placeDisplay.js:403
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "ネットワークを表示"
 
@@ -161,47 +161,47 @@
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "テーマの名前です (~/.themes/name/gnome-shell 配下に格納します)"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "閉じる"
 
-#: extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "最小化解除"
 
-#: extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "最小化"
 
-#: extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "最大化解除"
 
-#: extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "最大化"
 
-#: extensions/window-list/extension.js:431
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
-msgstr "全て最小化"
-
-#: extensions/window-list/extension.js:437
+msgstr "すべて最小化"
+
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
-msgstr "全て最小化解除"
-
-#: extensions/window-list/extension.js:443
+msgstr "すべて最小化解除"
+
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
-msgstr "全て最大化"
-
-#: extensions/window-list/extension.js:451
+msgstr "すべて最大化"
+
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
-msgstr "全て最大化解除"
-
-#: extensions/window-list/extension.js:459
+msgstr "すべて最大化解除"
+
+#: extensions/window-list/extension.js:456
 msgid "Close all"
-msgstr "全て閉じる"
-
-#: extensions/window-list/extension.js:741
+msgstr "すべて閉じる"
+
+#: extensions/window-list/extension.js:736
 msgid "Window List"
 msgstr "ウィンドウのリスト"
 
@@ -225,8 +225,8 @@
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
 msgid "Whether to show windows from all workspaces or only the current one."
 msgstr ""
-"ウィンドウをすべてのワークスペースから表示するか現在のワークスペースにあるウィン"
-"ドウのみ表示するかの設定です。"
+"ウィンドウをすべてのワークスペースから表示するか現在のワークスペースにある"
+"ウィンドウのみ表示するかの設定です。"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
@@ -260,20 +260,20 @@
 msgid "Show on all monitors"
 msgstr "すべてのモニターに表示する"
 
-#: extensions/window-list/workspaceIndicator.js:211
-#: extensions/workspace-indicator/extension.js:216
+#: extensions/window-list/workspaceIndicator.js:209
+#: extensions/workspace-indicator/extension.js:215
 msgid "Workspace Indicator"
 msgstr "ワークスペースインジケーター"
 
-#: extensions/workspace-indicator/prefs.js:131
+#: extensions/workspace-indicator/prefs.js:129
 msgid "Workspace Names"
 msgstr "ワークスペース名"
 
-#: extensions/workspace-indicator/prefs.js:151
+#: extensions/workspace-indicator/prefs.js:149
 msgid "Name"
 msgstr "名前"
 
-#: extensions/workspace-indicator/prefs.js:191
+#: extensions/workspace-indicator/prefs.js:189
 #, javascript-format
 msgid "Workspace %d"
 msgstr "ワークスペース %d"
diff --git a/po/ms.po b/po/ms.po
index d1e746e..908bad3 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,15 +8,16 @@
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2019-11-13 18:42+0000\n"
-"PO-Revision-Date: 2019-12-09 18:36+0800\n"
+"POT-Creation-Date: 2019-12-25 14:29+0000\n"
+"PO-Revision-Date: 2020-01-27 03:22+0800\n"
 "Last-Translator: abuyop <abuyop@gmail.com>\n"
 "Language-Team: Pasukan Terjemahan GNOME Malaysia\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -46,24 +47,24 @@
 "Satu senarai rentetan, yang setiap satunya mengandungi id aplikasi (nama "
 "fail atas meja) diikuti dengan tanda titik bertindih dan nombor ruang kerja"
 
-#: extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:59
 msgid "Application"
 msgstr "Aplikasi"
 
-#: extensions/auto-move-windows/prefs.js:71
-#: extensions/auto-move-windows/prefs.js:134
+#: extensions/auto-move-windows/prefs.js:70
+#: extensions/auto-move-windows/prefs.js:133
 msgid "Workspace"
 msgstr "Ruang Kerja"
 
-#: extensions/auto-move-windows/prefs.js:89
+#: extensions/auto-move-windows/prefs.js:88
 msgid "Add Rule"
 msgstr "Tambah Peraturan"
 
-#: extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:110
 msgid "Create new matching rule"
 msgstr "Cipta peraturan baharu yang sepadan"
 
-#: extensions/auto-move-windows/prefs.js:117
+#: extensions/auto-move-windows/prefs.js:116
 msgid "Add"
 msgstr "Tambah"
 
@@ -71,6 +72,7 @@
 #: extensions/drive-menu/extension.js:103
 #: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
+#| msgid "Ejecting drive '%s' failed:"
 msgid "Ejecting drive “%s” failed:"
 msgstr "Melentingkan pemacu \"%s\" gagal:"
 
@@ -79,6 +81,7 @@
 msgstr "Peranti boleh tanggal"
 
 #: extensions/drive-menu/extension.js:146
+#| msgid "Open File"
 msgid "Open Files"
 msgstr "Buka Fail"
 
@@ -118,6 +121,7 @@
 
 #: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
+#| msgid "Failed to launch \"%s\""
 msgid "Failed to launch “%s”"
 msgstr "Gagal melancarkan “%s”"
 
@@ -175,27 +179,27 @@
 msgid "Maximize"
 msgstr "Maksimum"
 
-#: extensions/window-list/extension.js:431
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "Minimum semua"
 
-#: extensions/window-list/extension.js:437
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
 msgstr "Nyahminimum semua"
 
-#: extensions/window-list/extension.js:443
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "Maksimum semua"
 
-#: extensions/window-list/extension.js:451
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
 msgstr "Nyahmaksimum semua"
 
-#: extensions/window-list/extension.js:459
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "Tutup semua"
 
-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:736
 msgid "Window List"
 msgstr "Senarai Tetingkap"
 
@@ -204,6 +208,9 @@
 msgstr "Bila mahu kelompokkan tetingkap"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#| msgid ""
+#| "Decides when to group windows from the same application on the window "
+#| "list. Possible values are \"never\", \"auto\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
@@ -214,6 +221,7 @@
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 #: extensions/window-list/prefs.js:82
+#| msgid "Show only windows in the current workspace"
 msgid "Show windows from all workspaces"
 msgstr "Tunjuk tetingkap pada semua ruang kerja"
 
@@ -255,8 +263,8 @@
 msgid "Show on all monitors"
 msgstr "Tunjuk pada semua monitor"
 
-#: extensions/window-list/workspaceIndicator.js:211
-#: extensions/workspace-indicator/extension.js:216
+#: extensions/window-list/workspaceIndicator.js:209
+#: extensions/workspace-indicator/extension.js:215
 msgid "Workspace Indicator"
 msgstr "Penunjuk Ruang Kerja"
 
diff --git a/po/ru.po b/po/ru.po
index a109991..c18c0ba 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions gnome-3-0\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"issues\n"
-"POT-Creation-Date: 2019-10-13 20:14+0000\n"
-"PO-Revision-Date: 2019-11-13 21:41+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2017-08-11 01:33+0000\n"
+"PO-Revision-Date: 2017-09-20 11:37+0300\n"
 "Last-Translator: Stas Solovey <whats_up@tut.by>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@@ -19,7 +19,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -29,11 +29,73 @@
 msgid "This session logs you into GNOME Classic"
 msgstr "Данный сеанс использует классический рабочий стол GNOME"
 
-#: extensions/apps-menu/extension.js:113
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Прикреплять модальное диалоговое окно к родительскому окну"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Этот ключ переопределяет ключ в org.gnome.mutter при запуске GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Расположение кнопок в заголовке"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+"Этот ключ переопределяет ключ в org.gnome.desktop.wm.preferences при запуске "
+"GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Автоматически изменять размеры окна при перемещении окна к краям экрана"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Рабочие места только на основном мониторе"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr "Задержка изменения фокуса в режиме мыши после остановки указателя"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Только миниатюры"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Только значок приложения"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Миниатюра и значок приложения"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Отображать окна как"
+
+#: extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Отображать окна только текущей рабочей области"
+
+#: extensions/apps-menu/extension.js:41
+msgid "Activities Overview"
+msgstr "Обзор"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Избранное"
 
-#: extensions/apps-menu/extension.js:369
+#: extensions/apps-menu/extension.js:436
 msgid "Applications"
 msgstr "Приложения"
 
@@ -53,37 +115,68 @@
 msgid "Application"
 msgstr "Приложение"
 
-#: extensions/auto-move-windows/prefs.js:71
-#: extensions/auto-move-windows/prefs.js:134
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
 msgid "Workspace"
 msgstr "Рабочая область"
 
-#: extensions/auto-move-windows/prefs.js:89
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Добавить правило"
 
-#: extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
 msgstr "Создать новое правило соответствия"
 
-#: extensions/auto-move-windows/prefs.js:117
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Add"
 msgstr "Добавить"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:103
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:107
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Не удалось извлечь диск «%s»:"
 
-#: extensions/drive-menu/extension.js:119
+#: extensions/drive-menu/extension.js:125
 msgid "Removable devices"
 msgstr "Съёмные устройства"
 
-#: extensions/drive-menu/extension.js:146
+#: extensions/drive-menu/extension.js:150
 msgid "Open Files"
 msgstr "Открыть файлы"
+
+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Привет, мир!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Альтернативный текст приветствия."
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+msgid ""
+"If not empty, it contains the text that will be shown when clicking on the "
+"panel."
+msgstr ""
+"Если строка не пуста, то содержащийся в ней текст будет показан при нажатии "
+"на панель."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Сообщение"
+
+#. TRANSLATORS: Example is the name of the extension, should not be
+#. translated
+#: extensions/example/prefs.js:43
+msgid ""
+"Example aims to show how to build well behaved extensions for the Shell and "
+"as such it has little functionality on its own.\n"
+"Nevertheless it’s possible to customize the greeting message."
+msgstr ""
+"Цель расширения Example — показать, как создавать расширения для Shell, само "
+"по себе оно имеет малую функциональность.\n"
+"Тем не менее, можно настроить приветственное сообщение."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
@@ -114,31 +207,31 @@
 "умолчанию заголовки располагаются снизу). При изменении этого параметра, "
 "чтобы оно вступило в силу, необходимо перезапустить Shell."
 
-#: extensions/places-menu/extension.js:80
-#: extensions/places-menu/extension.js:84
+#: extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Места"
 
-#: extensions/places-menu/placeDisplay.js:46
+#: extensions/places-menu/placeDisplay.js:65
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr "Не удалось смонтировать том для «%s»"
+
+#: extensions/places-menu/placeDisplay.js:78
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Не удалось запустить «%s»"
 
-#: extensions/places-menu/placeDisplay.js:61
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Не удалось смонтировать том для «%s»"
-
-#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "Компьютер"
 
-#: extensions/places-menu/placeDisplay.js:359
+#: extensions/places-menu/placeDisplay.js:303
 msgid "Home"
 msgstr "Домашняя папка"
 
-#: extensions/places-menu/placeDisplay.js:404
+#: extensions/places-menu/placeDisplay.js:347
 msgid "Browse Network"
 msgstr "Обзор сети"
 
@@ -158,49 +251,54 @@
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Название темы, загружаемой из ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Закрыть"
 
 # ну или "восстановить", правда тогда появляется неоднозначный повтор (unmaximize)
-#: extensions/window-list/extension.js:118
+#: extensions/window-list/extension.js:129
 msgid "Unminimize"
 msgstr "Вернуть"
 
-#: extensions/window-list/extension.js:118
+#: extensions/window-list/extension.js:130
 msgid "Minimize"
 msgstr "Свернуть"
 
-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:136
 msgid "Unmaximize"
 msgstr "Восстановить"
 
-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:137
 msgid "Maximize"
 msgstr "Развернуть"
 
-#: extensions/window-list/extension.js:431
+#: extensions/window-list/extension.js:420
 msgid "Minimize all"
 msgstr "Свернуть все"
 
 # ну или "восстановить", правда тогда появляется неоднозначный повтор (unmaximize)
-#: extensions/window-list/extension.js:437
+#: extensions/window-list/extension.js:428
 msgid "Unminimize all"
 msgstr "Вернуть все"
 
-#: extensions/window-list/extension.js:443
+#: extensions/window-list/extension.js:436
 msgid "Maximize all"
 msgstr "Развернуть все"
 
-#: extensions/window-list/extension.js:451
+#: extensions/window-list/extension.js:445
 msgid "Unmaximize all"
 msgstr "Восстановить все"
 
-#: extensions/window-list/extension.js:459
+#: extensions/window-list/extension.js:454
 msgid "Close all"
 msgstr "Закрыть все"
 
-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:678
+#: extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Индикатор рабочей области"
+
+#: extensions/window-list/extension.js:842
 msgid "Window List"
 msgstr "Список окон"
 
@@ -218,19 +316,10 @@
 "«always» — всегда."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:82
-msgid "Show windows from all workspaces"
-msgstr "Отображать окна из всех рабочих областей"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr "Показывать ли окна из всех рабочих областей или только из текущей."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Показывать список окон на всех мониторах"
 
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
@@ -238,19 +327,19 @@
 "Показывать ли список окон на всех подключенных мониторах или только на "
 "основном."
 
-#: extensions/window-list/prefs.js:25
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Группировка окон"
 
-#: extensions/window-list/prefs.js:47
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Никогда не группировать окна"
 
-#: extensions/window-list/prefs.js:48
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Группировать окна, если место ограничено"
 
-#: extensions/window-list/prefs.js:49
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Всегда группировать окна"
 
@@ -258,92 +347,19 @@
 msgid "Show on all monitors"
 msgstr "Показывать на всех мониторах"
 
-#: extensions/window-list/workspaceIndicator.js:211
-#: extensions/workspace-indicator/extension.js:216
-msgid "Workspace Indicator"
-msgstr "Индикатор рабочей области"
-
-#: extensions/workspace-indicator/prefs.js:129
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Названия рабочих областей"
 
-#: extensions/workspace-indicator/prefs.js:149
+#: extensions/workspace-indicator/prefs.js:157
 msgid "Name"
 msgstr "Название"
 
-#: extensions/workspace-indicator/prefs.js:189
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Рабочая область %d"
 
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Прикреплять модальное диалоговое окно к родительскому окну"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Этот ключ переопределяет ключ в org.gnome.mutter при запуске GNOME Shell."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Расположение кнопок в заголовке"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Этот ключ переопределяет ключ в org.gnome.desktop.wm.preferences при "
-#~ "запуске GNOME Shell."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr ""
-#~ "Автоматически изменять размеры окна при перемещении окна к краям экрана"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Рабочие места только на основном мониторе"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr "Задержка изменения фокуса в режиме мыши после остановки указателя"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Только миниатюры"
-
-#~ msgid "Application icon only"
-#~ msgstr "Только значок приложения"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Миниатюра и значок приложения"
-
-#~ msgid "Present windows as"
-#~ msgstr "Отображать окна как"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Обзор"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Привет, мир!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Альтернативный текст приветствия."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr ""
-#~ "Если строка не пуста, то содержащийся в ней текст будет показан при "
-#~ "нажатии на панель."
-
-#~ msgid "Message"
-#~ msgstr "Сообщение"
-
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell "
-#~ "and as such it has little functionality on its own.\n"
-#~ "Nevertheless it’s possible to customize the greeting message."
-#~ msgstr ""
-#~ "Цель расширения Example — показать, как создавать расширения для Shell, "
-#~ "само по себе оно имеет малую функциональность.\n"
-#~ "Тем не менее, можно настроить приветственное сообщение."
-
 #~ msgid "CPU"
 #~ msgstr "ЦП"
 
diff --git a/po/uk.po b/po/uk.po
index 8ea5aaf..3e316d8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,95 +3,46 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Alexandr Toorchyn <ilex@mail.ua>, 2011.
 # Daniel Korostil <ted.korostiled@gmail.com>, 2013, 2014, 2015, 2017.
+# vikaig <vikaig99@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-02-20 13:55+0200\n"
-"PO-Revision-Date: 2017-02-20 13:56+0300\n"
-"Last-Translator: Daniel Korostil <ted.korostiled@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2019-10-13 18:56+0000\n"
+"PO-Revision-Date: 2019-10-18 18:01+0300\n"
+"Last-Translator: vikaig <vikaig99@gmail.com>\n"
 "Language-Team: linux.org.ua\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.2.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Приєднати модальне вікно до батьківського вікна"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Цей ключ нехтує ключем у org.gnome.mutter, коли запущено оболонку GNOME."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Компонування кнопок на смужці заголовку"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:4
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Цей ключ нехтує ключем у org.gnome.desktop.wm.preferences, коли запущено "
-"GNOME Shell."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Увімкнути розбиття країв, коли кладуться вікна на краї екрана"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Робочий простір лише на основному моніторі"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Затримувати зміни фокусу миші, поки вказівник не перестане рухатись"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Тільки мініатюри"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Тільки піктограми програми"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Мініатюри та піктограми програм"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Представляти вікна як"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Показувати вікна тільки з поточного робочого простору"
-
-#: ../extensions/apps-menu/extension.js:38
-msgid "Activities Overview"
-msgstr "Огляд діяльності"
-
-#: ../extensions/apps-menu/extension.js:109
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+msgid "GNOME Classic"
+msgstr "Класичний GNOME"
+
+#: data/gnome-classic.desktop.in:4
+msgid "This session logs you into GNOME Classic"
+msgstr "Це — сеанс входу в класичний GNOME"
+
+#: extensions/apps-menu/extension.js:113
 msgid "Favorites"
 msgstr "Улюблене"
 
-#: ../extensions/apps-menu/extension.js:266
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Програми"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "Програма і список робочих просторів"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.h:2
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -99,77 +50,47 @@
 "Список рядків, що містять ідентифікатор програми (назва файла стільниці),"
 "двокрапка і номер робочого простору"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Програма"
 
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Робочий простір"
 
-#: ../extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Додати правило"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Створити нове відповідне правило"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Додати"
 
-#: ../extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Не вдалося витягнути пристрій «%s»:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:119
 msgid "Removable devices"
 msgstr "Змінні пристрої"
 
-#: ../extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "Відкрити Файли"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Привіт, світе!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.h:1
-msgid "Alternative greeting text."
-msgstr "Додатковий вітальний текст."
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Якщо це поле не порожнє, воно містить текст, який буде показуватись, коли "
-"натискаєте на панель."
-
-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Надпис"
-
-#. TRANSLATORS: Example is the name of the extension, should not be
-#. translated
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customize the greeting message."
-msgstr ""
-"Приклад зроблено, щоб показувати, як зібрати правильні розширення для "
-"оболонки і саме по собі воно не має багато функціональності.\n"
-"Попри це, воно змінює вітальний текст. "
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:1
+#: extensions/drive-menu/extension.js:146
+msgid "Open Files"
+msgstr "Відкрити файли"
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Використовувати додаткову площу екрана для вікон"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:2
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -180,11 +101,11 @@
 "розмірів обмежувальної рамки. Цей параметр застосовується тільки для "
 "алгоритму розміщенням мініатюр «natural»."
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "Розміщувати заголовки вікон зверху"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:4
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -194,95 +115,99 @@
 "в нижній, як це робиться типово. Зміна цього параметра вимагає перезапуску "
 "оболонки, щоб зміна вступила в силу."
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Місця"
 
-#: ../extensions/places-menu/placeDisplay.js:59
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Не вдалося запустити «%s»"
 
-#: ../extensions/places-menu/placeDisplay.js:101
-#: ../extensions/places-menu/placeDisplay.js:124
+#: extensions/places-menu/placeDisplay.js:61
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr "Не вдалося змонтувати том до «%s»"
+
+#: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Комп'ютер"
 
-#: ../extensions/places-menu/placeDisplay.js:267
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "Домівка"
 
-#: ../extensions/places-menu/placeDisplay.js:311
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Огляд мережі"
 
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "Розміри циклічних знімків"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "Змінювати розміри циклічних знімків в зворотному напрямку"
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Назва теми"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Назва теми, що завантажується з ~/.themes/name/gnome-shell"
 
-#: ../extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Закрити"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Відновити згорнуте"
 
-#: ../extensions/window-list/extension.js:121
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Згорнути"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Відновити розгорнуте"
 
-#: ../extensions/window-list/extension.js:128
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Розгорнути"
 
-#: ../extensions/window-list/extension.js:411
+#: extensions/window-list/extension.js:431
 msgid "Minimize all"
 msgstr "Згорнути все"
 
-#: ../extensions/window-list/extension.js:419
+#: extensions/window-list/extension.js:437
 msgid "Unminimize all"
 msgstr "Відновити все згорнуте"
 
-#: ../extensions/window-list/extension.js:427
+#: extensions/window-list/extension.js:443
 msgid "Maximize all"
 msgstr "Розгорнути все"
 
-#: ../extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:451
 msgid "Unmaximize all"
 msgstr "Відновити все розгорнуте"
 
-#: ../extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:459
 msgid "Close all"
 msgstr "Закрити все"
 
-#: ../extensions/window-list/extension.js:669
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Покажчик робочого простору"
-
-#: ../extensions/window-list/extension.js:833
+#: extensions/window-list/extension.js:741
 msgid "Window List"
 msgstr "Перелік вікон"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Умови групування вікон"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:2
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
@@ -290,11 +215,20 @@
 "Визначає правила групування вікон програм у списку вікон. Можливими "
 "значеннями є «never», «auto» і «always»."
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:3
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: extensions/window-list/prefs.js:82
+msgid "Show windows from all workspaces"
+msgstr "Показувати вікна з усіх робочих просторів"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid "Whether to show windows from all workspaces or only the current one."
+msgstr "Чи показувати вікна з усіх робочих просторів або тільки з поточного."
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Показати перелік вікон на всіх моніторах"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:4
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
@@ -302,44 +236,110 @@
 "Чи показувати переліку вікон на всіх під'єднаних моніторах, чи тільки на "
 "основному."
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Групування вікон"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
-msgstr "ніколи не групувати вікна"
-
-#: ../extensions/window-list/prefs.js:51
+msgstr "Ніколи не групувати вікна"
+
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Групувати вікна коли простір обмежено"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Завжди групувати вікна"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Показувати на всіх моніторах"
 
-#: ../extensions/workspace-indicator/prefs.js:141
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
+msgid "Workspace Indicator"
+msgstr "Покажчик робочого простору"
+
+#: extensions/workspace-indicator/prefs.js:129
 msgid "Workspace Names"
 msgstr "Назви робочих просторів"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:149
 msgid "Name"
 msgstr "Назва"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:189
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Робочий простір %d"
 
-#~ msgid "GNOME Classic"
-#~ msgstr "Класичний GNOME"
-
-#~ msgid "This session logs you into GNOME Classic"
-#~ msgstr "Це — сеанс входу в класичний GNOME"
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Приєднати модальне вікно до батьківського вікна"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "Цей ключ нехтує ключем у org.gnome.mutter, коли запущено оболонку GNOME."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Компонування кнопок на смужці заголовку"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "Цей ключ нехтує ключем у org.gnome.desktop.wm.preferences, коли запущено "
+#~ "GNOME Shell."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr "Увімкнути розбиття країв, коли кладуться вікна на краї екрана"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Робочий простір лише на основному моніторі"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr "Затримувати зміни фокусу миші, поки вказівник не перестане рухатись"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "Тільки мініатюри"
+
+#~ msgid "Application icon only"
+#~ msgstr "Тільки піктограми програми"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "Мініатюри та піктограми програм"
+
+#~ msgid "Present windows as"
+#~ msgstr "Представляти вікна як"
+
+#~ msgid "Activities Overview"
+#~ msgstr "Огляд діяльності"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Привіт, світе!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "Додатковий вітальний текст."
+
+#~ msgid ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+#~ msgstr ""
+#~ "Якщо це поле не порожнє, воно містить текст, який буде показуватись, коли "
+#~ "натискаєте на панель."
+
+#~ msgid "Message"
+#~ msgstr "Надпис"
+
+#~ msgid ""
+#~ "Example aims to show how to build well behaved extensions for the Shell "
+#~ "and as such it has little functionality on its own.\n"
+#~ "Nevertheless it’s possible to customize the greeting message."
+#~ msgstr ""
+#~ "Приклад зроблено, щоб показувати, як зібрати правильні розширення для "
+#~ "оболонки і саме по собі воно не має багато функціональності.\n"
+#~ "Попри це, воно змінює вітальний текст. "
 
 #~ msgid "CPU"
 #~ msgstr "Процесор"