diff --git a/install.sh b/install.sh
index 14522e32..7a099c48 100755
--- a/install.sh
+++ b/install.sh
@@ -408,23 +408,23 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-if [[ "${#themes[@]}" -eq 0 ]] ; then
+if [[ "${#themes[@]}" -eq 0 ]]; then
   themes=("${THEME_VARIANTS[0]}")
 fi
 
-if [[ "${#colors[@]}" -eq 0 ]] ; then
+if [[ "${#colors[@]}" -eq 0 ]]; then
   colors=("${COLOR_VARIANTS[@]}")
 fi
 
-if [[ "${#lcolors[@]}" -eq 0 ]] ; then
+if [[ "${#lcolors[@]}" -eq 0 ]]; then
   lcolors=("${COLOR_VARIANTS[1]}")
 fi
 
-if [[ "${#sizes[@]}" -eq 0 ]] ; then
+if [[ "${#sizes[@]}" -eq 0 ]]; then
   sizes=("${SIZE_VARIANTS[0]}")
 fi
 
-if [[ "${#schemes[@]}" -eq 0 ]] ; then
+if [[ "${#schemes[@]}" -eq 0 ]]; then
   schemes=("${SCHEME_VARIANTS[0]}")
 fi
 
diff --git a/src/sass/gnome-shell/_widgets-47-0.scss b/src/sass/gnome-shell/_widgets-47-0.scss
index 58264b10..1e41d28d 100644
--- a/src/sass/gnome-shell/_widgets-47-0.scss
+++ b/src/sass/gnome-shell/_widgets-47-0.scss
@@ -1,9 +1,7 @@
 @import 'common/a11y';
 @import 'common/base';
 @import 'common/buttons';
-@import 'common/check-box';
 @import 'common/corner-ripple';
-@import 'common/dialogs';
 @import 'common/entries';
 @import 'common/hotplug';
 @import 'common/ibus-popup';
@@ -19,17 +17,17 @@
 @import 'common/screen-shield';
 @import 'common/scrollbars';
 @import 'common/search-entry';
-@import 'common/slider';
 @import 'common/switcher-popup';
-@import 'common/switches';
 @import 'common/tiled-previews';
 @import 'common/workspace-switcher';
 @import 'widgets-46-0/app-grid';
 @import 'widgets-46-0/calendar';
+@import 'widgets-47-0/check-box';
 @import 'widgets-46-0/dash';
-@import 'widgets-46-0/message-list';
+@import 'widgets-47-0/dialogs';
+@import 'widgets-47-0/message-list';
 @import 'widgets-40-0/misc';
-@import 'widgets-46-0/notifications';
+@import 'widgets-47-0/notifications';
 @import 'widgets-40-0/overview';
 @import 'widgets-42-0/osd';
 @import 'widgets-40-0/panel';
@@ -38,5 +36,7 @@
 @import 'widgets-40-0/search-entry';
 @import 'widgets-46-0/search-results';
 @import 'widgets-42-0/screenshot';
+@import 'widgets-47-0/slider';
+@import 'widgets-47-0/switches';
 @import 'widgets-40-0/window-picker';
 @import 'widgets-40-0/workspace-thumbnails';
diff --git a/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
index fa7b7c8e..5279ca72 100644
--- a/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
+++ b/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
@@ -18,7 +18,7 @@
     color: white;
     background-color: rgba(black, 0.75);
     text-align: center;
-    padding: 0.2em 0.4em;
+    padding: 0.32em 0.4em;
   }
 
   .notification-badge {
@@ -29,7 +29,7 @@
     box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.25);
     border-radius: $circular-radius;
     margin: 2px 3px 5px;
-    padding: 0.2em 0.4em;
+    padding: 0.3em 0.4em;
     font-weight: bold;
     text-align: center;
   }
diff --git a/src/sass/gnome-shell/widgets-46-0/_dash.scss b/src/sass/gnome-shell/widgets-46-0/_dash.scss
index 77215b20..27b68d8b 100644
--- a/src/sass/gnome-shell/widgets-46-0/_dash.scss
+++ b/src/sass/gnome-shell/widgets-46-0/_dash.scss
@@ -23,7 +23,7 @@ $dash_spacing: $base_margin * 0.5;
     padding-bottom: $dash_padding;
     padding-left: $dash_padding - $dash_spacing; // subtract the margins added to .overview-tile below
     padding-right: $dash_padding - $dash_spacing;
-    box-shadow: inset 0 1px rgba(white, 0.08);
+    box-shadow: inset 0 0.5px rgba(white, 0.08);
   }
 
   // items on the dash
diff --git a/src/sass/gnome-shell/widgets-47-0/_app-grid.scss b/src/sass/gnome-shell/widgets-47-0/_app-grid.scss
deleted file mode 100644
index 8fdb8bec..00000000
--- a/src/sass/gnome-shell/widgets-47-0/_app-grid.scss
+++ /dev/null
@@ -1,209 +0,0 @@
-
-/* App Icons */
-
-$app_icon_size: 96px;
-$app_folder_size: 720px;
-
-// app icons
-.icon-grid {
-  row-spacing: 12px;
-  column-spacing: 12px;
-  max-row-spacing: 36px;
-  max-column-spacing: 36px;
-  page-padding-top: 24px;
-  page-padding-bottom: 24px;
-  page-padding-left: 18px;
-  page-padding-right: 18px;
-}
-
-.overview-tile {
-  color: on($osd, secondary);
-  border-radius: $base_radius * 2.5;
-  padding: 6px;
-  border: none;
-  transition-duration: 100ms;
-  text-align: center;
-  background-color: transparent;
-
-  &:hover,
-  &:focus,
-  &:selected {
-    color: on($osd);
-    background-color: on($osd, divider);
-    border-image: none;
-    background-image: none;
-  }
-
-  &:active,
-  &:checked, {
-    color: on($osd);
-    background-color: on($osd, track);
-    box-shadow: none;
-  }
-}
-
-// App Folders
-.app-folder {
-  background-color: on($osd, divider);
-  border-radius: $base_radius * 2.5;
-  color: on($osd, secondary);
-
-  .overview-icon {
-    background-color: transparent;
-    border-radius: $base_radius * 2.5;
-  }
-
-  &:hover {
-    background-color: overlay($osd, active);
-    color: on($osd);
-  }
-
-  &:active {
-    background-color: on($osd, track);
-    color: on($osd);
-  }
-}
-
-// Running app indicator (also shown in dash)
-.app-grid-running-dot {
-  width: $base_padding;
-  height: 3px;
-  border-radius: 2px;
-  background-color: on($osd, track);
-  margin-bottom: 0;
-
-  StWidget.focused & {
-    width: $base_padding * 4;
-    background-color: $inverse-indicator !important;
-  }
-}
-
-.app-folder-dialog-container {
-  // pad the top with panel height so the folder doesn't overlap the panel on smaller resolutions
-  padding-top: $item_size;
-}
-
-// expanded folder
-.app-folder-dialog {
-  width: $app_folder_size;
-  height: $app_folder_size;
-  border-radius: $menu_radius * 3;
-  padding: $base_padding * 2;
-  background-color: $osd;
-
-  @if $rimless == 'false' {
-    border: 1px solid black;
-    box-shadow: inset 0 0 0 1px highlight($osd);
-  } @else {
-    border: none;
-    box-shadow: none;
-  }
-
-  .folder-name-container {
-    padding: $base_padding * 4 $base_padding * 6;
-    padding-bottom: 0;
-
-    .folder-name-label,
-    .folder-name-entry {
-      @extend %title_1;
-    }
-
-    .folder-name-entry {
-      width: 12em;
-      border: none;
-      caret-color: on($osd);
-
-      &:focus {
-        background-color: on($osd, divider);
-        color: on($osd);
-      }
-    }
-  }
-
-  .icon-button {
-    background-color: overlay($osd);
-    color: on($osd, secondary);
-    border: none;
-    padding: 0;
-    width: 36px;
-    height: 36px;
-    border-radius: $circular_radius;
-
-    > StIcon { icon-size: $base_icon_size; }
-
-    &:hover { background-color: overlay($osd, hover); }
-    &:checked, &:active { background-color: $inverse-indicator; color: on($inverse-indicator); }
-  }
-
-  .page-indicators {
-    margin-bottom: 18px;
-  }
-}
-
-// Rename popup for app folders
-.rename-folder-popup {
-  .rename-folder-popup-item {
-    spacing: $base_padding;
-    &:ltr, &:rtl { padding: 0 $base_padding * 2; }
-  }
-}
-
-// shutdown and other actions in the grid
-.system-action-icon {
-  box-shadow: 0 4px 4px rgba(0, 0, 0, 0.2); // FIXME: this should really have a highlight
-  background-color: $osd;
-  color: on($osd);
-  border-radius: $circular_radius;
-  icon-size: $app_icon_size * 0.5;
-}
-
-// page navigation
-.page-navigation-hint {
-  &.dnd {
-    background: rgba(255, 255, 255, 0.1);
-  }
-
-  &.next:ltr,
-  &.previous:rtl {
-    background-gradient-start: rgba(255, 255, 255, 0.05);
-    background-gradient-end: transparent;
-    background-gradient-direction: horizontal;
-    border-radius: $modal_radius * 1.5 0px 0px $modal_radius * 1.5;
-  }
-
-  &.previous:ltr,
-  &.next:rtl {
-    background-gradient-start: transparent;
-    background-gradient-end: rgba(255, 255, 255, 0.05);
-    background-gradient-direction: horizontal;
-    border-radius: 0px $modal_radius * 1.5 $modal_radius * 1.5 0px;
-  }
-}
-
-.page-navigation-arrow {
-  margin: $base_padding;
-  padding: $base_padding * 3;
-  width: $medium_icon_size;
-  height: $medium_icon_size;
-  border-radius: $circular_radius;
-  transition-duration: 100ms;
-  color: on($osd, secondary);
-  background-color: transparent;
-
-  > StIcon { color: on($osd); }
-
-  &:insensitive {
-    background-color: transparent;
-    color: on($osd, disabled);
-  }
-
-  &:hover {
-    background-color: on($osd, divider);
-    color: on($osd);
-  }
-
-  &:active {
-    background-color: on($osd, track);
-    color: on($osd);
-  }
-}
diff --git a/src/sass/gnome-shell/widgets-47-0/_calendar.scss b/src/sass/gnome-shell/widgets-47-0/_calendar.scss
deleted file mode 100644
index ccb92bf8..00000000
--- a/src/sass/gnome-shell/widgets-47-0/_calendar.scss
+++ /dev/null
@@ -1,387 +0,0 @@
-/* Date/Time Menu */
-
-%popover_bubble {
-  color: $text-secondary;
-  background-color: $fill;
-  border-radius: $base_radius;
-  border: none;
-  box-shadow: none;
-  text-shadow: none;
-
-  &:hover, &:focus {
-    color: $text;
-    background-color: overlay($base, hover);
-    box-shadow: none;
-  }
-
-  &:active {
-    color: $text;
-    background-color: overlay($base, active);
-    box-shadow: none;
-  }
-}
-
-// overall menu
-#calendarArea {
-  padding: $base_padding / 2;
-}
-
-.datemenu-popover {
-  border-radius: $base_radius + $base_padding * 2 !important;
-}
-
-// Calendar menu side column
-.datemenu-calendar-column {
-  spacing: $base_spacing;
-  border: none;
-  padding: 0 !important;
-  margin: 0 !important;
-
-  &:ltr { margin-right: 0; border-left-width: 0; }
-  &:rtl { margin-left: 0; border-right-width: 0; }
-
-  .datemenu-displays-section { padding-bottom: 0; }
-
-  .datemenu-displays-box {
-    spacing: $base_spacing;
-  }
-}
-
-.world-clocks-header,
-.weather-header,
-.events-section-title {
-  color: $text-secondary;
-  font-weight: bold;
-}
-
-.datemenu-today-button,
-.datemenu-displays-box {
-  margin: $base_margin $base_spacing;
-}
-
-/* today button (the date) */
-.datemenu-today-button {
-  border: none;
-  box-shadow: none;
-  background: none;
-  padding: $base_padding $base_padding * 2;
-  margin: 0;
-  text-shadow: none;
-  color: $text-secondary;
-  border-radius: $base_radius;
-  margin: $base_margin;
-
-  &:ltr { margin-left: $base_margin; }
-  &:rtl { margin-right: $base_margin; }
-
-  &:hover, &:focus {
-    background-color: overlay($base, hover);
-  }
-
-  &:active {
-    background-color: overlay($base, active);
-  }
-
-  // weekday label
-  .day-label {
-    @include fontsize($font_size + 1);
-    font-weight: bold;
-  }
-
-  // date label
-  .date-label {
-    @include fontsize($font_size + 7);
-    font-weight: normal;
-  }
-}
-
-/* Calendar */
-.calendar {
-  border: none;
-  box-shadow: none;
-  background-color: transparent;
-  padding: $base_padding / 2 !important;
-  margin: 0 !important;
-  text-shadow: none;
-  border-radius: $menu_radius;
-  color: $text-secondary;
-
-  // month
-  .calendar-month-label {
-    @extend %heading;
-    padding: $base_padding 0;
-    color: $text-secondary !important;
-    font-weight: bold;
-    text-align: center;
-    text-shadow: none;
-    background-color: transparent;
-  }
-
-  // prev/next month icons
-  .calendar-change-month-back,
-  .calendar-change-month-forward {
-    padding: 0 !important;
-    margin: ($base_padding / 2) 0 !important;
-
-    StIcon {
-      icon-size: $base_icon_size;
-    }
-  }
-
-  .pager-button {
-    width: $item_size !important;
-    height: $item_size !important;
-    margin: 2px !important;
-    border-radius: $circular_radius;
-    background-color: transparent;
-    color: $text;
-    box-shadow: none !important;
-
-    &:hover, &:focus { background-color: $divider; box-shadow: none !important; }
-    &:active { background-color: $track; box-shadow: none !important; }
-  }
-
-  .calendar-day {
-    @include fontsize($font_size - 1);
-    text-align: center;
-    width: $item_size + 2px !important;
-    height: $item_size + 2px !important;
-    padding: 0 !important;
-    margin: 2px !important;
-    border-radius: $circular_radius;
-    color: $text-secondary !important;
-    border: none;
-    font-feature-settings: "tnum";
-    background-color: transparent;
-
-    &:hover, &:focus {
-      background-color: $divider;
-      box-shadow: none !important;
-      outline: none !important;
-    }
-
-    &:active, &:selected {
-      color: $text !important;
-      background-color: $track;
-      border-color: transparent !important; //avoid jumparound due to today
-      box-shadow: none !important;
-      outline: none !important;
-    }
-
-    &.calendar-weekday {}
-
-    &.calendar-weekend {
-      color: $text-disabled !important;
-      // font-weight: normal;
-    }
-  }
-
-  .calendar-day { //border collapse hack - see calendar.js
-    border-width: 0;
-  }
-
-  .calendar-day-top {
-    border-top-width: 0;
-  }
-
-  .calendar-day-left {
-    border-left-width: 0;
-  }
-
-  .calendar-nonwork-day {
-    color: $text;
-    // font-weight: normal;
-  }
-
-  // Today
-  .calendar-today {
-    font-weight: bold;
-    color: $text-secondary !important;
-    background-color: overlay($base);
-    border: none;
-
-    &:hover, &:focus {
-      background-color: overlay($base, hover);
-      color: $text !important;
-    }
-
-    &:active {
-      background-color: darken($primary, 5%);
-      color: on($primary) !important;
-    }
-
-    &:selected {
-      background-color: $primary;
-      color: on($primary) !important;
-
-      &:hover, &:focus {
-        background-color: lighten($primary, 8%);
-        color: on($primary) !important;
-      }
-    }
-  }
-
-  .calendar-day-with-events {
-    color: $text-secondary;
-    background-image: url("assets/calendar-today.svg");
-
-    &.calendar-work-day {
-      color: $text-secondary;
-      font-weight: bold;
-    }
-  }
-
-  .calendar-other-month {
-    color: $text-secondary-disabled !important;
-    font-weight: normal;
-
-    &.calendar-weekend {
-      color: $text-secondary-disabled !important;
-    }
-  }
-
-  // day of week heading
-  .calendar-day-heading {
-    @extend %numeric;
-    @extend %smaller;
-    font-weight: bold;
-    text-align: center;
-    margin: $base_margin;
-    padding: $base_padding * 0.5 $base_padding;
-    border-radius: $base_radius;
-    background-color: transparent;
-    color: $text;
-  }
-
-  .calendar-week-number {
-    width: $item_size - 6px;
-    height: $item_size - 12px;
-    margin: 6px $base_margin / 2 !important;
-    padding: 0;
-    border-radius: $base_radius;
-    background-color: $fill;
-    color: $text-disabled;
-    @extend %smaller;
-    font-weight: bold;
-    font-feature-settings: "tnum";
-    text-align: center;
-  }
-}
-
-.world-clocks-button,
-.weather-button,
-.events-button {
-  @extend %popover_bubble;
-  padding: $base_padding * 2 !important;
-  margin: $base_margin / 2 0 !important;
-}
-
-// Events
-.events-button {
-  .events-box {
-    spacing: $base_spacing;
-  }
-
-  .events-list {
-    spacing: 2 * $base_spacing;
-    text-shadow: none;
-    color: $text-secondary;
-  }
-
-  .events-title {
-    font-weight: bold;
-    text-shadow: none;
-    color: $text-disabled;
-  }
-
-  .event-time {
-    font-feature-settings: "tnum";
-    @include fontsize($font_size - 1);
-    color: $text-disabled;
-  }
-}
-
-// World Clock
-.world-clocks-button {
-  .world-clocks-grid {
-    spacing-rows: $base_padding;
-    spacing-columns: $base_padding * 2;
-  }
-
-  // title
-  .world-clocks-header {
-    @extend %heading;
-    color: $text-disabled;
-  }
-
-  .world-clocks-city {
-    font-weight: bold;
-    @include fontsize($font_size);
-    color: $text-secondary;
-  }
-
-  .world-clocks-time {
-    font-feature-settings: "tnum";
-    @include fontsize($font_size);
-    color: $text;
-
-    &:ltr { text-align: right; }
-    &:rtl { text-align: left; }
-  }
-
-  .world-clocks-timezone {
-    font-feature-settings: "tnum";
-    @include fontsize($font_size - 1);
-    color: $text-disabled;
-  }
-}
-
-.world-clocks-grid,
-.weather-grid {
-  spacing-rows: 0.4em;
-  spacing-columns: 0.8em;
-}
-
-// Weather
-.weather-button {
-  .weather-box {
-    spacing: $base_spacing + $base_margin;
-  }
-
-  .weather-header-box {
-    spacing: $base_spacing;
-  }
-
-  .weather-header {
-    font-weight: bold;
-    color: $text-secondary;
-
-    &.location {
-      font-weight: normal;
-      @include fontsize($font_size - 1);
-      color: $text-disabled;
-    }
-  }
-
-  .weather-grid {
-    spacing-rows: $base_spacing;
-    spacing-columns: $base_spacing * 2;
-  }
-
-  .weather-forecast-time {
-    font-feature-settings: "tnum";
-    @include fontsize($font_size - 2);
-    font-weight: normal;
-    padding-top: 0.2em;
-    padding-bottom: 0.4em;
-    color: $text-secondary;
-  }
-
-  .weather-forecast-icon {
-    icon-size: 32px;
-  }
-
-  .weather-forecast-temp {
-    font-weight: bold;
-  }
-}
diff --git a/src/sass/gnome-shell/widgets-47-0/_check-box.scss b/src/sass/gnome-shell/widgets-47-0/_check-box.scss
new file mode 100644
index 00000000..bb039926
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-47-0/_check-box.scss
@@ -0,0 +1,53 @@
+/* Check Boxes */
+
+.check-box {
+  StBoxLayout { spacing: .8em; }
+
+  StBin {
+    width: 24px;
+    height: 24px;
+    padding: $base_padding / 2;
+  }
+
+  StBin, &:focus StBin {
+    background-image: url("assets/checkbox-off.svg");
+    background-color: transparent;
+    box-shadow: none;
+  }
+
+  &:hover StBin {
+    background-color: $divider;
+  }
+
+  &:active StBin {
+    background-color: $track;
+  }
+
+  &:checked StBin, &:focus:checked StBin {
+    @if $theme == 'default' {
+      background-image: url("assets/checkbox#{$asset_suffix}.svg");
+    }
+    @else {
+      background-image: url("assets/checkbox.svg");
+    }
+  }
+
+  StIcon {
+    icon-size: 0;
+    padding: 0;
+    color: transparent;
+    border: none;
+  }
+
+  &:hover StIcon,
+  &:active StIcon {
+    border: none;
+  }
+
+  &:checked StIcon,
+  &:checked:hover StIcon,
+  &:checked:active StIcon {
+    background-color: transparent;
+    color: transparent;
+  }
+}
diff --git a/src/sass/gnome-shell/widgets-47-0/_dash.scss b/src/sass/gnome-shell/widgets-47-0/_dash.scss
deleted file mode 100644
index 77215b20..00000000
--- a/src/sass/gnome-shell/widgets-47-0/_dash.scss
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Dash */
-
-// uses system colors
-$dash_background_color: on($osd, divider);
-
-$dash_placeholder_size: 32px;
-$dash_padding: $base_padding * 2;
-$dash_edge_offset: $base_margin * 3;
-$dash_border_radius: $modal_radius + $dash_padding;
-$dash_spacing: $base_margin * 0.5;
-
-// container for the dash
-#dash {
-  // a bit of spacing so that dash doesn't touch the screen edges
-  padding-left: $base_padding;
-  padding-right: $base_padding;
-
-  // background behind item container
-  .dash-background {
-    background-color: $dash_background_color;
-    border-radius: $dash_border_radius;
-    padding-top: $dash_padding;
-    padding-bottom: $dash_padding;
-    padding-left: $dash_padding - $dash_spacing; // subtract the margins added to .overview-tile below
-    padding-right: $dash_padding - $dash_spacing;
-    box-shadow: inset 0 1px rgba(white, 0.08);
-  }
-
-  // items on the dash
-  .dash-item-container {
-    .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;
-    }
-
-    // IMPORTANT: items on the dash need to extend to the edge to be adequate click targets
-    // as such the %tile style is overriden and button styles are applied to the child class .overview-icon
-    .show-apps,
-    .overview-tile {
-      background: none;
-      box-shadow: none;
-      border: none;
-      border-radius: 0;
-      padding: 0;
-      margin: 0 $dash_spacing;
-      padding-bottom: $dash_edge_offset; // align with other items
-
-      .overview-icon {
-        border-radius: $modal_radius;
-        padding: $base_padding;
-        spacing: $base_padding;
-        text-align: center;
-        transition-duration: 100ms;
-        background-color: transparent;
-        color: on($osd);
-      }
-
-      &:focus .overview-icon { background-color: on($osd, divider); }
-      &:hover .overview-icon { background-color: on($osd, divider); }
-      &:active .overview-icon { background-color: on($osd, track); }
-      &:checked .overview-icon { background-color: on($osd, divider); }
-    }
-
-    // running app dot
-    .app-grid-running-dot {
-      // manually position the dot within the dash item
-      offset-y: -$dash_padding;
-    }
-  }
-
-  // separator between pinned and running apps
-  .dash-separator {
-    width: 1px;
-    margin-left: $base_margin;
-    margin-right: $base_margin;
-    background-color: on($osd, divider);
-  }
-
-  // make sure all dash components have same margin from screen edge
-  .dash-separator,
-  .dash-background {
-    margin-bottom: $dash_edge_offset;
-  }
-}
-
-// OSD Tooltip
-.dash-label {
-  color: rgba(white, 0.9);
-  background-color: rgba(black, 0.75);
-  border-radius: $circular_radius;
-  padding: $base_padding $base_padding * 2;
-  margin: $base_margin * 2;
-  box-shadow: none;
-  border: none;
-  text-align: center;
-  -y-offset: $base_margin; // distance from the dash edge
-  -x-offset: 8px;
-}
diff --git a/src/sass/gnome-shell/widgets-47-0/_dialogs.scss b/src/sass/gnome-shell/widgets-47-0/_dialogs.scss
new file mode 100644
index 00000000..01ce1208
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-47-0/_dialogs.scss
@@ -0,0 +1,243 @@
+/* Modal Dialogs */
+
+%theme_dialogs {
+  background-color: $popover;
+  border-radius: $modal_radius + $base_padding / 2;
+
+  @if $rimless == 'false' {
+    border: 1px solid $window-border;
+    box-shadow: inset 0 0 0 1px highlight($popover);
+  } @else {
+    border: none;
+    box-shadow: 0 3px 6px rgba(black, 0.35);
+  }
+}
+
+
+%dialog_button {
+  min-height: $item_size;
+  padding: $base_padding;
+  margin: 0;
+  border: none !important;
+  border-radius: $base_radius;
+  @extend %flat_button;
+
+  &:first-child {
+    background-color: $fill;
+    &:focus { @include button(flat-focus); }
+    &:hover { @include button(flat-hover); }
+    &:active { @include button(flat-active); }
+  }
+
+  &:last-child {
+    color: on($primary);
+    background-color: $primary;
+
+    &:hover {
+      color: on($primary);
+      background-color: lighten($primary, 9%);
+    }
+
+    &:active {
+      color: on($primary);
+      background-color: darken($primary, 5%);
+    }
+
+   &:insensitive {
+      background-color: rgba($primary, 0.05);
+      color: rgba($primary, 0.35);
+    }
+  }
+}
+
+// modal dialog
+.modal-dialog {
+  color: $text-secondary;
+  padding: $base_padding * 1.5;
+  @extend %theme_dialogs;
+
+  .modal-dialog-content-box {
+    margin: $base_padding * 5 $base_padding * 7;
+    spacing: $base_padding * 5;
+    max-width: 28em;
+  }
+
+  .modal-dialog-button-box {
+    padding-top: $base_padding;
+
+    .modal-dialog-button {
+      @extend %dialog_button;
+    }
+  }
+}
+
+// Dialog List
+.dialog-list {
+  spacing: $base_spacing * 3;
+
+  .dialog-list-title {
+    text-align: center;
+    @extend %heading;
+  }
+
+  .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: $text-secondary;
+        @extend %caption;
+      }
+    }
+  }
+}
+
+// End Session Dialog
+.end-session-dialog {
+  width: if($compact == 'true', 24em, 26em);
+  // border: none;
+
+  .end-session-dialog-battery-warning,
+  .dialog-list-title {
+    color: $warning;
+    background-color: transparentize($warning, 0.9);
+    padding: $base_padding * 1.5;
+    border-radius: $base_radius;
+    margin: $base_margin 0;
+  }
+}
+
+// Message Dialog
+.message-dialog-content {
+  spacing: $base_padding * 3;
+
+  .message-dialog-title {
+    text-align: center;
+    @extend %title_2;
+
+    &.lightweight {
+      @extend %title_4;
+    }
+  }
+  .message-dialog-description {
+    text-align: center;
+  }
+}
+
+// Run Dialog
+.run-dialog {
+  width: if($compact == 'true', 24em, 26em);
+  // run dialog needs to override bottom padding
+  // to account for inexplicable extra padding
+  padding-bottom: $base_padding;
+
+  .run-dialog-entry {
+    padding: $base_padding * 2 $base_padding * 1.5;
+  }
+  .run-dialog-description {
+    @extend %caption;
+    color: $text-secondary;
+  }
+}
+
+// Password or Authentication Dialog
+.prompt-dialog {
+  //this is the width of the entire modal popup
+  width: if($compact == 'true', 22em, 26em);
+  // border: none;
+
+  .prompt-dialog-password-grid {
+    spacing-rows: $base_margin * 2;
+    spacing-columns: $base_margin;
+
+    .prompt-dialog-password-entry {
+      width: auto;
+      // 4px (spacing) + 16px (spinner-width)
+      &:ltr { margin-left: $base_margin+$base_icon_size; }
+      &:rtl { margin-right: $base_margin+$base_icon_size; }
+    }
+  }
+
+  .prompt-dialog-password-layout {
+    spacing: $base_margin * 2;
+  }
+
+  .prompt-dialog-password-entry {
+    width: 20em;
+    padding: $base_padding * 2 $base_padding * 1.5;
+  }
+
+  .prompt-dialog-error-label,
+  .prompt-dialog-info-label,
+  .prompt-dialog-null-label {
+    @extend %caption;
+    text-align: center;
+  }
+
+  .prompt-dialog-error-label {
+    color: $warning;
+  }
+}
+
+// Polkit Dialog
+.polkit-dialog-user-layout {
+  text-align: center;
+  spacing: $base_margin * 2;
+  margin-bottom: $base_margin * 1.5;
+
+  .polkit-dialog-user-label,
+  .polkit-dialog-user-root-label {
+    @extend %title_4;
+  }
+
+  .polkit-dialog-user-root-label {
+    color: $warning;
+  }
+}
+
+// Audio selection dialog
+.audio-device-selection-dialog {
+  .modal-dialog-content-box { margin-bottom: $base_margin * 7; }
+  .audio-selection-box { spacing: $base_margin * 5; }
+}
+
+.audio-selection-device {
+  border: 1px solid $border;
+  border-radius: $base_radius;
+  &:hover, &:focus { background-color: overlay($popover, hover); }
+  &:active {
+    background-color: $primary;
+    color: on($primary);
+  }
+}
+
+.audio-selection-device-box {
+  padding: $base_padding * 3;
+  spacing: $base_padding * 3;
+}
+
+.audio-selection-device-icon {
+  icon-size: $base_icon_size * 4;
+}
+
+// Welcome dialog
+.welcome-dialog-image {
+  background-image: url("resource:///org/gnome/shell/theme/gnome-shell-start.svg");
+  background-size: contain;
+  height: 300px;
+  width: 300px;
+}
+
+/* Access portal dialog */
+.access-dialog {
+  text-align: center;
+}
+
+// specific label style for restart message
+.restart-message {
+  @extend %title_4;
+}
diff --git a/src/sass/gnome-shell/widgets-47-0/_message-list.scss b/src/sass/gnome-shell/widgets-47-0/_message-list.scss
index a2f3b346..0e3dbae0 100644
--- a/src/sass/gnome-shell/widgets-47-0/_message-list.scss
+++ b/src/sass/gnome-shell/widgets-47-0/_message-list.scss
@@ -65,7 +65,7 @@
 
 // message bubbles
 .message {
-  padding: 0;
+  padding: $base_spacing;
   margin: $base_spacing / 2;
   border-radius: $window_radius;
 
@@ -73,37 +73,19 @@
     border-radius: $base_radius;
     @extend %popover_bubble;
 
-    .notification-button {
-      &:first-child:ltr {
-        border-radius: 0 0 0 $base_radius;
-      }
-    
-      &:last-child:ltr {
-        border-radius: 0 0 $base_radius;
-      }
-    
-      &:first-child:rtl {
-        border-radius: 0 0 $base_radius;
-      }
-    
-      &:last-child:rtl {
-        border-radius: 0 0 0 $base_radius;
-      }
-    
-      &:first-child:last-child {
-        border-radius: 0 0 $base_radius $base_radius;
-      }
-    }
+    .notification-button { border-radius: $base_radius / 2; }
   }
 
   // message header
   .message-header {
     padding: 0 $scaled_padding;
-    margin: $base_padding;
-    margin-bottom: 0;
     spacing: $base_padding;
     color: $text-disabled;
 
+    // remove side padding to accommodate the close button
+    &:ltr { padding-right: 0; }
+    &:rtl { padding-left: 0; }
+
     // header source icon
     .message-source-icon {
       icon-size: $scalable_icon_size; // 16px
@@ -238,4 +220,4 @@
       icon-size: $large_icon_size !important; // 32px
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/sass/gnome-shell/widgets-47-0/_notifications.scss b/src/sass/gnome-shell/widgets-47-0/_notifications.scss
index 03c8ff66..c3b4e2be 100644
--- a/src/sass/gnome-shell/widgets-47-0/_notifications.scss
+++ b/src/sass/gnome-shell/widgets-47-0/_notifications.scss
@@ -12,7 +12,8 @@ $notification_banner_width: 34em;
   color: $text-secondary;
   background-color: $popover;
   text-shadow: none;
-  border-radius: $menu_radius;
+  border-radius: $base_radius + $base_padding * 2;
+  padding: $base_padding;
 
   @if $rimless == 'false' and $variant == 'dark' {
     border: 1px solid $window-border;
@@ -29,10 +30,7 @@ $notification_banner_width: 34em;
 }
 
 .notification-buttons-bin {
-  background-color: transparent;
-  padding-top: 0;
   border: none;
-  border-top: 1px solid $border;
   spacing: 0;
 }
 
@@ -43,6 +41,7 @@ $notification_banner_width: 34em;
   color: $text-secondary;
   font-weight: 500;
   border: none;
+  border-radius: $base_radius;
 
   &:focus {
     background-color: transparent;
@@ -60,28 +59,4 @@ $notification_banner_width: 34em;
     background-color: $track;
     color: $text;
   }
-
-  &:first-child:ltr {
-    border-radius: 0 0 0 $menu_radius;
-  }
-
-  &:last-child:ltr {
-    border-radius: 0 0 $menu_radius;
-    margin-right: 0 !important;
-  }
-
-  &:first-child:rtl {
-    border-radius: 0 0 $menu_radius;
-  }
-
-  &:last-child:rtl {
-    border-radius: 0 0 0 $menu_radius;
-    margin-left: 0 !important;
-  }
-
-  &:first-child:last-child {
-    border-radius: 0 0 $menu_radius $menu_radius;
-    margin-left: 0 !important;
-    margin-right: 0 !important;
-  }
 }
diff --git a/src/sass/gnome-shell/widgets-47-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-47-0/_quick-settings.scss
deleted file mode 100644
index 013e32d8..00000000
--- a/src/sass/gnome-shell/widgets-47-0/_quick-settings.scss
+++ /dev/null
@@ -1,265 +0,0 @@
-.quick-settings {
-  padding: $base_padding * 3 !important;
-  border-radius: $base_radius + $base_padding * 3 !important;
-  margin-top: 4px !important;
-
-  .icon-button, .button {
-    padding: $base_padding * 1.75;
-
-    > StIcon {
-      icon-size: $base_icon_size;
-    }
-  }
-}
-
-.quick-settings-grid {
-  spacing-rows: $base_padding * 2;
-  spacing-columns: $base_padding * 2;
-}
-
-.quick-toggle, .quick-menu-toggle {
-  border-radius: $base_radius;
-  min-width: 12em;
-  max-width: 12em;
-  min-height: 44px;
-  border: none;
-}
-
-.quick-toggle {
-  background-color: $button !important;
-
-  &:hover {
-    background-color: $divider !important;
-  }
-
-  &:active {
-    background-color: rgba($text, 0.15) !important;
-  }
-
-  &:checked {
-    background-color: $primary !important;
-    color: on($primary);
-
-    &:hover {
-      background-color: mix($text, $primary, 6%) !important;
-      color: on($primary);
-    }
-
-    &:active {
-      background-color: mix($text, $primary, 15%) !important;
-      color: on($primary);
-    }
-  }
-
-  & > StBoxLayout { spacing: $base_padding; }
-
-  /* Move padding into the box; this is to allow menu arrows
-     to extend to the border */
-  &.button { padding: 0; }
-  & > StBoxLayout { padding: 0 $base_padding * 2; }
-  &:ltr > StBoxLayout { padding-left: $base_padding * 2.5; }
-  &:rtl > StBoxLayout { padding-right: $base_padding * 2.5; }
-
-  .quick-toggle-title { font-weight: bold; }
-
-  & StBoxLayout > .quick-toggle-subtitle {
-    font-weight: normal;
-    font-size: 12px;
-  }
-
-  .quick-toggle-icon { icon-size: $base_icon_size; }
-}
-
-.quick-menu-toggle {
-  & .quick-toggle {
-    min-width: auto;
-    max-width: auto;
-
-    &:ltr { border-radius: $base_radius 0 0 $base_radius; }
-    &:ltr > StBoxLayout { padding-right: $base_padding * 1.5; }
-    &:rtl { border-radius: 0 $base_radius $base_radius 0; }
-    &:rtr > StBoxLayout { padding-left: $base_padding * 1.5; }
-
-    &:ltr:last-child { border-radius: $base_radius; }
-    &:rtl:last-child { border-radius: $base_radius; }
-  }
-
-  .quick-toggle-arrow {
-    background-color: $button !important;
-    padding: $base_padding $base_padding * 1.75;
-    border: none !important;
-    color: $text;
-
-    &:hover {
-      background-color: $divider !important;
-    }
-  
-    &:active {
-      background-color: rgba($text, 0.15) !important;
-    }
-  
-    &:checked {
-      background-color: $primary !important;
-      color: on($primary);
-  
-      &:hover {
-        background-color: mix($text, $primary, 6%) !important;
-        color: on($primary);
-      }
-  
-      &:active {
-        background-color: mix($text, $primary, 15%) !important;
-        color: on($primary);
-      }
-    }
-
-    &:ltr { border-radius: 0 $base_radius $base_radius 0; }
-    &:rtl { border-radius: $base_radius 0 0 $base_radius; }
-  }
-}
-
-.quick-slider {
-  & > StBoxLayout { spacing: $base_padding; }
-
-  .slider-bin {
-    &:focus { @include button(focus); }
-    min-height: 16px; // slider size
-    padding: $base_padding;
-    border-radius: $circular_radius;
-  }
-
-  .quick-toggle-icon {
-    icon-size: $base_icon_size;
-  }
-
-  .icon-button {
-    background-color: transparent;
-    color: $text !important;
-    padding: $base_padding * 1.5;
-
-    &:hover {
-      background-color: $fill;
-    }
-
-    &:active {
-      background-color: $divider;
-    }
-  }
-}
-
-.quick-toggle-menu {
-  background-color: $popover !important;
-  color: $text !important;
-  border-radius: $base_radius + $base_padding * 2 !important;
-  padding: $base_padding * 2;
-  margin: $base_padding * 2 $base_padding * 3 0;
-
-  .popup-menu-item {
-    border-radius: $base_radius !important;
-
-    &:focus, &:hover, &.selected {
-      color: $text !important;
-      background-color: rgba($text, 0.1) !important;
-    }
-
-    &:active {
-      color: $text !important;
-      background-color: rgba($text, 0.2) !important;
-    }
-
-    > StIcon { -st-icon-style: symbolic; }
-  }
-
-  & .header {
-    spacing-rows: 0.5 * $base_padding;
-    spacing-columns: $base_padding * 2;
-    padding-bottom: 2 * $base_padding;
-
-    & .icon {
-      icon-size: $base_icon_size * 1.5; // a non-standard symbolic size but ok
-      border-radius: $base_radius;
-      padding: 1.5 * $base_padding;
-      background-color: on($popover, divider) !important;
-
-      &.active {
-        background-color: $primary !important;
-        color: on($primary);
-      }
-    }
-
-    & .title {
-      @extend %title_3;
-    }
-
-    & .subtitle {
-      @extend %caption_heading;
-    }
-  }
-}
-
-.quick-settings-system-item {
-  & > StBoxLayout { spacing: 2 * $base_padding; }
-
-  .icon-button {
-    background-color: $button;
-    color: $text;
-    border-radius: $base_radius;
-    @extend %button;
-
-    > StIcon {
-      -st-icon-style: symbolic;
-      icon-size: $base_icon_size;
-    }
-  }
-
-  & .power-item {
-    min-height: 0;
-    min-width: 0;
-
-    &:insensitive {
-      @include button(normal);
-      background-color: transparent;
-    }
-  }
-}
-
-.nm-network-item {
-  .wireless-secure-icon { icon-size: 0.5 * $base_icon_size; }
-}
-
-.bt-device-item {
-  .popup-menu-icon { -st-icon-style: symbolic; }
-}
-
-.bt-menu-placeholder.popup-menu-item {
-  @extend %title_4;
-  text-align: center;
-
-  padding: 2em 4em;
-}
-
-.device-subtitle { color: $text-disabled; }
-
-// background apps
-
-.background-apps-quick-toggle {
-  min-height: 40px;
-  background-color: transparent;
-
-  & StIcon { icon-size: $base_icon_size !important; }
-}
-
-.background-app-item {
-  & .title { @extend %heading; }
-  & .subtitle { @extend %caption; }
-  & .popup-menu-icon {
-    icon-size: $base_icon_size * 2 !important;
-    -st-icon-style: regular !important;
-  }
-  & .close-button {
-    @extend .icon-button;
-    padding: $base_padding;
-  }
-
-  &.popup-inactive-menu-item { color: $text; }
-}
diff --git a/src/sass/gnome-shell/widgets-47-0/_search-results.scss b/src/sass/gnome-shell/widgets-47-0/_search-results.scss
deleted file mode 100644
index 009cb5ec..00000000
--- a/src/sass/gnome-shell/widgets-47-0/_search-results.scss
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Search */
-
-%search-section-content-item {
-  border-radius: $base_radius;
-  padding: $base_padding;
-  transition-duration: 100ms;
-  text-align: center;
-  background-color: transparent;
-
-  &:focus,
-  &:hover,
-  &:selected {
-    background-color: overlay($osd, hover);
-    transition-duration: 0;
-  }
-
-  &:active,
-  &:checked {
-    background-color: overlay($osd, active);
-  }
-}
-
-// search overview container
-#searchResults {
-  margin: 0 $base_margin;
-}
-
-#searchResultsContent {
-  max-width: 1044px;
-}
-
-// search results sections "the boxes"
-.search-section {
-  // This should be equal to #searchResultsContent spacing
-  spacing: $base_padding * 3;
-
-  // separator (unstyled)
-  .search-section-separator {
-    height: $base_margin * 2; // use it as a spacer
-    background-color: transparent;
-  }
-}
-
-// content
-.search-section-content {  // This is the space between the provider icon and the results container
-  border-radius: $modal_radius * 1.5;
-  padding: $base_padding * 2;
-  margin:0 $base_margin * 3;
-  border: none;
-  box-shadow: none;
-  background: none;
-  text-shadow: none;
-  color: on($osd, secondary);
-  background-color: on($osd, divider);
-}
-
-// "no results" text
-.search-statustext {
-  @extend %title_1;
-  color: on($osd, disabled);
-}
-
-.grid-search-results {
-  spacing: $base_padding * 5;
-  margin:0 $base_margin * 3;
-}
-
-// Search results with icons
-.grid-search-result {
-  @extend .overview-tile;
-}
-
-// search result provider
-.search-provider-icon {
-  @extend %search-section-content-item;
-
-  &:ltr { margin-right: $base_margin; }
-  &:rtl { margin-left: $base_margin; }
-
-  // content
-  .list-search-provider-content {
-    spacing: $base_spacing * 2;
-
-    // provider labels
-    .list-search-provider-details {
-      width: 120px;
-      color: on($osd, secondary);
-    }
-  }
-}
-
-// 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;
-  }
-
-  // list item description
-  .list-search-result-description { color: on($osd, secondary); }
-}
diff --git a/src/sass/gnome-shell/widgets-47-0/_slider.scss b/src/sass/gnome-shell/widgets-47-0/_slider.scss
new file mode 100644
index 00000000..7033c920
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-47-0/_slider.scss
@@ -0,0 +1,22 @@
+/* Slider */
+
+$slide_color: if($variant == 'dark' and $theme == 'grey', white, $primary);
+$slide_active_color: if($variant == 'dark' and $theme == 'grey', rgba(white, 0.85), $primary);
+$slide_size: if($compact == 'false', 7px, 6px);
+
+.slider {
+  color: $slide_color;
+
+  -slider-handle-radius: $slide_size;
+
+  // barlevels are for >= 3.29.90
+  -barlevel-height: 2px;
+  -barlevel-background-color: $track;
+  -barlevel-active-background-color: $slide_active_color;
+  -barlevel-overdrive-color: $destructive;
+  -barlevel-overdrive-separator-width: 2px;
+
+  &:hover {
+    color: lighten($slide_color, 7%);
+  }
+}
diff --git a/src/sass/gnome-shell/widgets-47-0/_switches.scss b/src/sass/gnome-shell/widgets-47-0/_switches.scss
new file mode 100644
index 00000000..7ea19c8a
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-47-0/_switches.scss
@@ -0,0 +1,34 @@
+/* Switches */
+
+.toggle-switch {
+  width: 46px;
+  height: 24px;
+  background-size: contain;
+  background-color: transparent;
+  color: transparent;
+
+  &, .popup-sub-menu & {
+    background-image: url("assets/toggle-off.svg");
+
+    &:checked {
+      background-image: url("assets/toggle-on#{$asset_suffix}.svg");
+    }
+  }
+
+  StIcon {
+    icon-size: 0;
+  }
+
+  .handle {
+    margin: 0;
+    background: none;
+    box-shadow: none;
+    transition-duration: 0;
+  }
+
+  &:checked {
+    .handle {
+      background: none;
+    }
+  }
+}