diff --git a/NEWS b/NEWS
index dcbdece0..83e6e082 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+3.36.0
+======
+
+Contributors:
+  Florian Müllner
+
 3.35.91
 =======
 
diff --git a/data/gnome-shell-sass/_drawing.scss b/data/gnome-shell-sass/_drawing.scss
index 4c0383e3..4ca723bc 100644
--- a/data/gnome-shell-sass/_drawing.scss
+++ b/data/gnome-shell-sass/_drawing.scss
@@ -150,7 +150,7 @@
     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.7);
+    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4);
     //border-color: $selected_bg_color;
   }
 
diff --git a/data/gnome-shell-sass/widgets/_app-grid.scss b/data/gnome-shell-sass/widgets/_app-grid.scss
index 8c68d372..02091080 100644
--- a/data/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/gnome-shell-sass/widgets/_app-grid.scss
@@ -60,7 +60,7 @@ $app_grid_fg_color: #fff;
     & .folder-name-entry { width: 300px }
 
     /* FIXME: this is to keep the label in sync with the entry */
-    & .folder-name-label { padding: 5px 7px }
+    & .folder-name-label { padding: 5px 7px; color: $osd_fg_color; }
 
     & .edit-folder-button {
       @extend %button;
diff --git a/data/gnome-shell-sass/widgets/_calendar.scss b/data/gnome-shell-sass/widgets/_calendar.scss
index 207a3026..8074b210 100644
--- a/data/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/gnome-shell-sass/widgets/_calendar.scss
@@ -1,6 +1,13 @@
 /* Date/Time Menu */
 
-.clock-display-box { spacing: $base_spacing; }
+.clock-display-box {
+  spacing: $base_spacing / 2;
+
+  .clock {
+    padding-left: $base_padding;
+    padding-right: $base_padding;
+  }
+}
 
 // overall menu
 #calendarArea {
diff --git a/data/gnome-shell-sass/widgets/_keyboard.scss b/data/gnome-shell-sass/widgets/_keyboard.scss
index 1842ebe0..f866d77c 100644
--- a/data/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/gnome-shell-sass/widgets/_keyboard.scss
@@ -52,10 +52,6 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
 
   // non-character keys
   &.default-key {
-
-    // size of the icon asset
-    background-size: 24px;
-
     @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);}
@@ -63,19 +59,14 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
 
   // enter key is suggested-action
   &.enter-key {
-    background-image: url("resource:///org/gnome/shell/theme/key-enter.svg");
-
     @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%));}
   }
 
-  // key assets
-  &.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");}
+  &.shift-key-uppercase { color: $selected_bg_color }
+
+  StIcon { icon-size: 1.125em; }
 }
 
 // long press on a key popup
diff --git a/data/gnome-shell-sass/widgets/_login-dialog.scss b/data/gnome-shell-sass/widgets/_login-dialog.scss
index c672e041..0b148bea 100644
--- a/data/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/gnome-shell-sass/widgets/_login-dialog.scss
@@ -160,7 +160,6 @@
 }
 
 .login-dialog-prompt-entry {
-  width: 17.89em;
   height: 1.5em;
 }
 
diff --git a/data/gnome-shell-sass/widgets/_looking-glass.scss b/data/gnome-shell-sass/widgets/_looking-glass.scss
index ad1ed908..9c38e636 100644
--- a/data/gnome-shell-sass/widgets/_looking-glass.scss
+++ b/data/gnome-shell-sass/widgets/_looking-glass.scss
@@ -5,14 +5,14 @@
   background-color: $osd_bg_color;
   spacing: $base_spacing;
   padding: 4px;
-  border: 2px solid transparentize($osd_fg_color, 0.8);
-  border-top-width:0;
-  border-radius: 0 0 $base_border_radius $base_border_radius;
+  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: darken($osd_bg_color, 10%);
+    background-color: $osd_bg_color;
   }
 
   .labels { spacing: $base_spacing; }
@@ -20,19 +20,18 @@
     -natural-hpadding: $base_padding * 2;
     -minimum-hpadding: 6px;
     font-weight: bold;
-    color: $fg_color;
+    color: darken($osd_fg_color, 15%);
     transition-duration: 100ms;
     padding-left: .3em;
     padding-right: .3em;
+    border-bottom-width: 2px;
     &:hover {
-      color: white;
-      text-shadow: black 0px 2px 2px;
+      color: $osd_fg_color;
     }
     &:selected {
       border-bottom-width: 2px;
-      border-color: lighten($selected_bg_color,5%);
-      color: white;
-      text-shadow: black 0px 2px 2px;
+      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color, 5%);
+      color: $osd_fg_color;
     }
   }
   StBoxLayout#EvalBox { padding: 4px; spacing: $base_spacing; }
@@ -41,12 +40,17 @@
 
 .lg-dialog {
   StEntry {
-    selection-background-color: #bbbbbb;
-    selected-color: $osd_bg_color;
+    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: #999999;
-    &:hover { color: #dddddd; }
+    color: $link_color;
+    &:hover { color: lighten($link_color, 10%); }
+    &:active { color: darken($link_color, 10%); }
    }
 }
 
@@ -60,7 +64,7 @@
 }
 
 .lg-obj-inspector-button {
-    border: 1px solid gray;
+    border: 1px solid $osd_borders_color;
     padding: 4px;
     border-radius: $base_border_radius;
     &:hover { border: 1px solid #ffffff; }
@@ -75,7 +79,8 @@
 }
 
 .lg-extension {
-    border: 1px solid $osd_borders_color;
+    border: 1px solid lighten($osd_borders_color, 5%);
+    background-color: lighten($osd_bg_color, 5%);
     border-radius: $base_border_radius;
     padding: 4px;
 }
diff --git a/data/gnome-shell-sass/widgets/_message-list.scss b/data/gnome-shell-sass/widgets/_message-list.scss
index d861ec50..e6a4d92b 100644
--- a/data/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/gnome-shell-sass/widgets/_message-list.scss
@@ -24,7 +24,7 @@
   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;
+  spacing: $base_spacing * 2;
 }
 
 // message bubbles
diff --git a/data/gnome-shell-sass/widgets/_misc.scss b/data/gnome-shell-sass/widgets/_misc.scss
index 9b5c6c08..aa543a0e 100644
--- a/data/gnome-shell-sass/widgets/_misc.scss
+++ b/data/gnome-shell-sass/widgets/_misc.scss
@@ -15,18 +15,28 @@
 
   & StIcon {
     background-color: transparentize($osd_fg_color,0.95);
-    padding: 18px 20px 22px 20px;
-    width: 88px; height: 88px;
     border-radius: 99px;
   }
 }
 
 .user-widget.vertical .user-icon {
-  icon-size: 128px;
+  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: 64px;
+  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; }
diff --git a/data/gnome-shell-sass/widgets/_panel.scss b/data/gnome-shell-sass/widgets/_panel.scss
index 222d6862..56c445a7 100644
--- a/data/gnome-shell-sass/widgets/_panel.scss
+++ b/data/gnome-shell-sass/widgets/_panel.scss
@@ -54,9 +54,6 @@ $panel_height: 1.86em;
     }
 
     &: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%);
       color: lighten($panel_fg_color, 20%);
     }
 
@@ -82,6 +79,26 @@ $panel_height: 1.86em;
     }
   }
 
+  .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;
diff --git a/data/gnome-shell-sass/widgets/_workspace-switcher.scss b/data/gnome-shell-sass/widgets/_workspace-switcher.scss
index 2fe43806..5b15a30f 100644
--- a/data/gnome-shell-sass/widgets/_workspace-switcher.scss
+++ b/data/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -16,7 +16,6 @@
 }
 
 .ws-switcher-box {
-  // background: transparent;
   background: transparent;
   height: 50px;
   background-size: 32px;
@@ -29,6 +28,7 @@
 .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;
diff --git a/extensions/meson.build b/extensions/meson.build
index d1bf92c9..ed7a2edc 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -33,11 +33,11 @@ install_data (extension_schemas,
 )
 
 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/meson.build b/meson.build
index 24a7ab50..e288b878 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.35.91',
+  version: '3.36.0',
   meson_version: '>= 0.44.0',
   license: 'GPL2+'
 )
@@ -20,7 +20,7 @@ schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 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()