releasing package gnome-shell-extensions version 44~beta-1

New upstream release
Update upstream source from tag 'upstream/44_beta'
2023-02-15 11:01:42 -05:00 · 2023-02-15 10:59:27 -05:00 · 2023-02-15 10:59:27 -05:00 · 2023-02-15 10:59:26 -05:00 · 2023-02-14 18:01:27 +01:00 · 2023-02-14 17:59:37 +01:00
124 changed files with 5426 additions and 3833 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,6 @@ include:
  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
  - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml"

-image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/34:2021-08-12.0
-
 stages:
  - pre_review
  - prepare
@@ -12,6 +10,7 @@ stages:
  - deploy

 default:
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/35:2022-02-18.0
  # Cancel jobs if newer commits are pushed to the branch
  interruptible: true
  # Auto-retry jobs in case of infra failures
@@ -26,7 +25,6 @@ default:
 variables:
  FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions
  LINT_LOG: "eslint-report.xml"
-  JS_LOG: "js-report.txt"

 workflow:
  rules:
@@ -103,12 +101,7 @@ js_check:
  stage: review
  <<: *prereview_req
  script:
-    - find extensions -name '*.js' -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG
-    - (! grep -q . $JS_LOG)
-  artifacts:
-    paths:
-      - ${JS_LOG}
-    when: on_failure
+    - gjs-check-syntax

 eslint:
  stage: review
@@ -139,8 +132,8 @@ fedora-build:
  stage: build
  needs:
    - build-fedora-container
-  before_script:
-    - git submodule update --init
+  variables:
+    GIT_SUBMODULE_STRATEGY: normal
  script:
    - meson setup build --werror -Dextension_set=all -Dclassic_mode=true
    - meson compile -C build
@@ -157,8 +150,8 @@ fedora-dist:
  stage: deploy
  needs:
    - fedora-build
-  before_script:
-    - git submodule update --init
+  variables:
+    GIT_SUBMODULE_STRATEGY: normal
  script:
    - meson dist -C build
  rules:
--- a/105
+++ b/105
@@ -1,3 +1,108 @@
+44.beta
+=======
+* Tweak menu alignment [robxnano; !246]
+
+Contributors:
+  Florian Müllner, robxnano
+
+Translators:
+  Vasil Pupkin [be]
+
+43.1
+====
+* Fixed crash [Florian; !243]
+* Misc. bug fixes and cleanups [mowemcfc; !244]
+
+Contributors:
+  Florian Müllner, mowemcfc
+
+Translators:
+  Sabri Ünal [tr]
+
+43.0
+====
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Pawan Chitrakar [ne], Zurab Kargareteli [ka], Aleksandr Melman [ru]
+
+43.rc
+=====
+* Misc. bug fixes and cleanups [Florian; !240]
+
+Contributors:
+  Florian Müllner
+
+43.beta
+=======
+* Misc. bug fixes and cleanups [Florian; !237, !238]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Nart Tlisha [ab]
+
+43.alpha
+========
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Marco Ciampa [it]
+
+42.3
+====
+* screenshot-window-sizer: Fix reported sizes on wayland [Florian; !232]
+* window-list: Improve touch support [Florian; !233]
+
+Contributors:
+  Florian Müllner
+
+42.2
+====
+* native-window-placement: Adjust to gnome-shell 42 changes [Florian; !229]
+* window-list: Fix visibility on non-primary monitors [Jason; !230]
+
+Contributors:
+  Jason Lynch, Florian Müllner
+
+Translators:
+  Cheng-Chia Tseng [zh_TW]
+
+42.1
+====
+* Misc. bug fixes and cleanups [Florian; !223, !222, !225]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Milo Casagrande [it], Rūdolfs Mazurs [lv], Nathan Follens [nl],
+  Ngọc Quân Trần [vi], Zurab Kargareteli [ka]
+
+42.0
+====
+
+Translators:
+  Philipp Kiemle [de], Balázs Úr [hu], Марко Костић [sr], sicklylife [ja],
+  Baurzhan Muftakhidinov [kk]
+
+42.rc
+=====
+* Misc. bug fixes and cleanups [Florian; !215, !218]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Marek Černocký [cs], Dušan Kazik [sk], Piotr Drąg [pl], Jiri Grönroos [fi],
+  Luna Jernberg [sv], Alan Mortensen [da], Charles Monzat [fr],
+  Changwoo Ryu [ko]
+
 42.beta
 =======
 * workspace-indicator: Fix cancelling editing with Esc [Florian; !208]
--- a/data/calendar-today.svg
+++ b/data/calendar-today.svg
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="calendar-today.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3770"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3001"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3007"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient2997"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#d3d3d3"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-55.349829"
-     inkscape:cy="-31.442864"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2133"
-     inkscape:window-height="1241"
-     inkscape:window-x="238"
-     inkscape:window-y="89"
-     inkscape:window-maximized="0"
-     borderlayer="true"
-     inkscape:showpageshadow="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3109"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata10626">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-469.08263,-537.99307)">
-    <circle
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#555753;fill-opacity:0.23756906;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="path7305"
-       cx="481.57138"
-       cy="559.4649"
-       r="1.5" />
-  </g>
-</svg>
--- a/data/classic-toggle-off-intl.svg
+++ b/data/classic-toggle-off-intl.svg
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg10865"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="classic-toggle-off-intl.svg">
-  <defs
-     id="defs10867">
-    <linearGradient
-       id="linearGradient62852-6-5">
-      <stop
-         id="stop62854-6-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.97726452"
-         id="stop62858-8-0" />
-      <stop
-         id="stop62860-5-3"
-         offset="1"
-         style="stop-color:#f5f5f4;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect62989-8-0"
-       effect="spiro" />
-    <linearGradient
-       id="linearGradient62821-5-8">
-      <stop
-         id="stop62823-2-4"
-         offset="0"
-         style="stop-color:#d1d3d1;stop-opacity:1;" />
-      <stop
-         id="stop62825-3-8"
-         offset="1"
-         style="stop-color:#ebebeb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient62852-6-5-3">
-      <stop
-         id="stop62854-6-7-6"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.97726452"
-         id="stop62858-8-0-3" />
-      <stop
-         id="stop62860-5-3-9"
-         offset="1"
-         style="stop-color:#f5f5f4;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect62829-6-8-0"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient62821-5-8-1">
-      <stop
-         id="stop62823-2-4-2"
-         offset="0"
-         style="stop-color:#d1d3d1;stop-opacity:1;" />
-      <stop
-         id="stop62825-3-8-9"
-         offset="1"
-         style="stop-color:#ebebeb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="507.42715"
-       x2="702.58966"
-       y1="484.49405"
-       x1="702.58966"
-       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11647"
-       xlink:href="#linearGradient62821-5-8-1"
-       inkscape:collect="always" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath65663">
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
-         id="rect65665"
-         width="96.999924"
-         height="24.292892"
-         x="708.71954"
-         y="406.96973"
-         rx="3.1139846"
-         ry="1.9595497"
-         inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/content selection/content-selection.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
-       id="linearGradient65582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5250827,0,0,0.72144839,620.16092,156.4917)"
-       x1="207.17195"
-       y1="497.39584"
-       x2="207.17195"
-       y2="531.48669" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9">
-      <stop
-         style="stop-color:#f4f6f4;stop-opacity:1"
-         offset="0"
-         id="stop5380-6-1-1-9-3-6-3-6-45-6-4-4-9-9-8-9" />
-      <stop
-         style="stop-color:#d7dad7;stop-opacity:1"
-         offset="1"
-         id="stop5382-06-3-6-4-2-4-6-8-0-9-6-8-7-7-6-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient65584">
-      <stop
-         style="stop-color:#f1f1f1;stop-opacity:1"
-         offset="0"
-         id="stop65586" />
-      <stop
-         style="stop-color:#a7aba7;stop-opacity:0;"
-         offset="1"
-         id="stop65588" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
-       id="linearGradient65582-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5250827,0,0,0.72144839,-75.348673,-359.16458)"
-       x1="207.17195"
-       y1="497.39584"
-       x2="207.17195"
-       y2="531.48669" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient65584"
-       id="linearGradient65590-6"
-       x1="716.62506"
-       y1="537.23358"
-       x2="716.62506"
-       y2="535.23358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0139469,0,0,1.0139469,-705.52354,-521.99915)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="23.565368"
-     inkscape:cy="19.596892"
-     inkscape:document-units="px"
-     inkscape:current-layer="g62929"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-others="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1342"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid11512" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata10870">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <g
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/system-settings/network/network-panel-summary.png"
-       style="display:inline"
-       id="g62929"
-       transform="translate(-643.91421,517.29894)">
-      <g
-         transform="translate(0,30)"
-         id="g62931">
-        <rect
-           style="fill:#cecece;fill-opacity:1;stroke:#a7a7a7;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;solid-opacity:1;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-           id="rect62935"
-           width="63.856125"
-           height="21.093594"
-           x="644.5"
-           y="483.5"
-           rx="2"
-           ry="2" />
-        <rect
-           style="fill:url(#linearGradient65582);fill-opacity:1;stroke:#a7a7a7;stroke-width:0.97313344;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;color:#000000;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect62937"
-           width="29.97398"
-           height="17.022524"
-           x="646.55896"
-           y="485.61429"
-           rx="1"
-           ry="1" />
-        <g
-           transform="translate(-38.048674,-1.9445437)"
-           id="g62939" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 647.78241,486.57192 27.73523,0"
-           inkscape:path-effect="#path-effect62989-8-0"
-           id="path62947"
-           d="m 647.78241,486.57192 27.73523,0"
-           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-      <g
-         id="g11665"
-         transform="matrix(0.78906097,0,0,0.78906097,178.78814,111.57844)" />
-      <path
-         sodipodi:type="arc"
-         id="path3016"
-         sodipodi:cx="50.375"
-         sodipodi:cy="11.875"
-         sodipodi:rx="4.625"
-         sodipodi:ry="4.625"
-         d="M 55,11.875 A 4.625,4.625 0 0 1 50.375,16.5 4.625,4.625 0 0 1 45.75,11.875 4.625,4.625 0 0 1 50.375,7.25 4.625,4.625 0 0 1 55,11.875 Z"
-         transform="translate(642.41421,512.02037)"
-         style="fill:none;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-  </g>
-</svg>
--- a/data/classic-toggle-off-us.svg
+++ b/data/classic-toggle-off-us.svg
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg10865"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="classic-toggle-off-us.svg">
-  <defs
-     id="defs10867">
-    <linearGradient
-       id="linearGradient62852-6-5">
-      <stop
-         id="stop62854-6-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.97726452"
-         id="stop62858-8-0" />
-      <stop
-         id="stop62860-5-3"
-         offset="1"
-         style="stop-color:#f5f5f4;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect62989-8-0"
-       effect="spiro" />
-    <linearGradient
-       id="linearGradient62821-5-8">
-      <stop
-         id="stop62823-2-4"
-         offset="0"
-         style="stop-color:#d1d3d1;stop-opacity:1;" />
-      <stop
-         id="stop62825-3-8"
-         offset="1"
-         style="stop-color:#ebebeb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient62852-6-5-3">
-      <stop
-         id="stop62854-6-7-6"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.97726452"
-         id="stop62858-8-0-3" />
-      <stop
-         id="stop62860-5-3-9"
-         offset="1"
-         style="stop-color:#f5f5f4;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect62829-6-8-0"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient62821-5-8-1">
-      <stop
-         id="stop62823-2-4-2"
-         offset="0"
-         style="stop-color:#d1d3d1;stop-opacity:1;" />
-      <stop
-         id="stop62825-3-8-9"
-         offset="1"
-         style="stop-color:#ebebeb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="507.42715"
-       x2="702.58966"
-       y1="484.49405"
-       x1="702.58966"
-       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11647"
-       xlink:href="#linearGradient62821-5-8-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
-       id="linearGradient65582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5250827,0,0,0.72144839,620.16092,156.4917)"
-       x1="207.17195"
-       y1="497.39584"
-       x2="207.17195"
-       y2="531.48669" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9">
-      <stop
-         style="stop-color:#f4f6f4;stop-opacity:1"
-         offset="0"
-         id="stop5380-6-1-1-9-3-6-3-6-45-6-4-4-9-9-8-9" />
-      <stop
-         style="stop-color:#d7dad7;stop-opacity:1"
-         offset="1"
-         id="stop5382-06-3-6-4-2-4-6-8-0-9-6-8-7-7-6-7" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect62989-8-0-6"
-       effect="spiro" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="78.222729"
-     inkscape:cy="-3.6620078"
-     inkscape:document-units="px"
-     inkscape:current-layer="g62929"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-others="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1342"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid11512" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata10870">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <g
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/system-settings/network/network-panel-summary.png"
-       style="display:inline"
-       id="g62929"
-       transform="translate(-643.91421,517.29894)">
-      <g
-         style="display:inline"
-         transform="translate(0,30)"
-         id="g62931">
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecece;fill-opacity:1;fill-rule:nonzero;stroke:#a7a7a7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
-           id="rect62935"
-           width="63.856125"
-           height="21.093594"
-           x="644.5"
-           y="483.5"
-           rx="2"
-           ry="2" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient65582);fill-opacity:1;fill-rule:nonzero;stroke:#a7a7a7;stroke-width:0.97313344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect62937"
-           width="29.97398"
-           height="17.022524"
-           x="646.55896"
-           y="485.61429"
-           rx="1"
-           ry="1" />
-        <g
-           transform="translate(-38.048674,-1.9445437)"
-           id="g62939" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 647.78241,486.57192 27.73523,0"
-           inkscape:path-effect="#path-effect62989-8-0-6"
-           id="path62947"
-           d="m 647.78241,486.57192 27.73523,0"
-           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-      <g
-         id="g11665"
-         transform="matrix(0.78906097,0,0,0.78906097,167.78814,111.57844)">
-        <text
-           xml:space="preserve"
-           style="font-size:12.69556618px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-           x="644.46393"
-           y="533.87158"
-           id="text62949"
-           sodipodi:linespacing="125%"
-           transform="scale(1.0113976,0.98873084)"><tspan
-             sodipodi:role="line"
-             id="tspan62951"
-             x="644.46393"
-             y="533.87158">OFF</tspan></text>
-      </g>
-    </g>
-  </g>
-</svg>
--- a/data/classic-toggle-on-intl.svg
+++ b/data/classic-toggle-on-intl.svg
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg10865"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="classic-toggle-on-intl.svg">
-  <defs
-     id="defs10867">
-    <linearGradient
-       id="linearGradient62852-6-5">
-      <stop
-         id="stop62854-6-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.97726452"
-         id="stop62858-8-0" />
-      <stop
-         id="stop62860-5-3"
-         offset="1"
-         style="stop-color:#f5f5f4;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect62989-8-0"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient38513"
-       id="linearGradient38519"
-       x1="690"
-       y1="506.25049"
-       x2="690"
-       y2="480.93414"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient38513">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop38515" />
-      <stop
-         style="stop-color:#6f9ccd;stop-opacity:1"
-         offset="1"
-         id="stop38517" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient62852-6-5"
-       id="linearGradient62981-1-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85639946,0,0,0.81059641,57.747905,92.132229)"
-       x1="740"
-       y1="486.10501"
-       x2="740"
-       y2="505.3204" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect62989-8-0-8"
-       effect="spiro" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="9.3225163"
-     inkscape:cy="-0.1588306"
-     inkscape:document-units="px"
-     inkscape:current-layer="g62929"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-others="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1342"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid11512" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata10870">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <g
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/system-settings/network/network-panel-summary.png"
-       style="display:inline"
-       id="g62929"
-       transform="translate(-643.91421,517.29894)">
-      <g
-         style="display:inline"
-         transform="translate(0,30)"
-         id="g62931">
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient38519);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect62935"
-           width="63.856125"
-           height="21.093594"
-           x="644.5"
-           y="483.5"
-           rx="2"
-           ry="2" />
-        <rect
-           style="display:inline;fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect62937"
-           width="29.97398"
-           height="17.022524"
-           x="676.49646"
-           y="485.67679"
-           rx="1"
-           ry="1" />
-        <g
-           transform="translate(-7.9861743,-1.9445437)"
-           id="g62939" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 677.59874,486.57192 27.94632,0"
-           inkscape:path-effect="#path-effect62989-8-0-8"
-           id="path62947"
-           d="m 677.59874,486.57192 27.94632,0"
-           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="path4444"
-         d="m 661.91421,522.09451 0,7"
-         style="fill:#3465a4;stroke:#3465a4;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;fill-opacity:1;fill-rule:nonzero;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 18,7.96875 0,7"
-         id="path3922"
-         inkscape:connector-curvature="0"
-         transform="translate(643.91421,513.06326)" />
-    </g>
-  </g>
-</svg>
--- a/data/classic-toggle-on-us.svg
+++ b/data/classic-toggle-on-us.svg
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg10865"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="classic-toggle-on-us.svg">
-  <defs
-     id="defs10867">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient62852-6-5"
-       id="linearGradient62981-1-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85639946,0,0,0.81059641,57.747905,92.132229)"
-       x1="740"
-       y1="486.10501"
-       x2="740"
-       y2="505.3204" />
-    <linearGradient
-       id="linearGradient62852-6-5">
-      <stop
-         id="stop62854-6-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.97726452"
-         id="stop62858-8-0" />
-      <stop
-         id="stop62860-5-3"
-         offset="1"
-         style="stop-color:#f5f5f4;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect62989-8-0"
-       effect="spiro" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath65663">
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
-         id="rect65665"
-         width="96.999924"
-         height="24.292892"
-         x="708.71954"
-         y="406.96973"
-         rx="3.1139846"
-         ry="1.9595497"
-         inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/content selection/content-selection.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient38513"
-       id="linearGradient38519"
-       x1="690"
-       y1="506.25049"
-       x2="690"
-       y2="480.93414"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient38513">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop38515" />
-      <stop
-         style="stop-color:#6f9ccd;stop-opacity:1"
-         offset="1"
-         id="stop38517" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-644,-483)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient38513"
-       id="linearGradient38519-3"
-       x1="690"
-       y1="506.25049"
-       x2="690"
-       y2="480.93414"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="20.775745"
-     inkscape:cy="7.0434022"
-     inkscape:document-units="px"
-     inkscape:current-layer="g62929"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-others="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1342"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid11512" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata10870">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <g
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/system-settings/network/network-panel-summary.png"
-       style="display:inline"
-       id="g62929"
-       transform="translate(-643.91421,517.29894)">
-      <g
-         transform="translate(0,30)"
-         id="g62931">
-        <rect
-           style="fill:url(#linearGradient38519);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect62935"
-           width="63.856125"
-           height="21.093594"
-           x="644.5"
-           y="483.5"
-           rx="2"
-           ry="2" />
-        <rect
-           style="fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-           id="rect62937"
-           width="29.97398"
-           height="17.022524"
-           x="676.49646"
-           y="485.67679"
-           rx="1"
-           ry="1" />
-        <g
-           transform="translate(-7.9861743,-1.9445437)"
-           id="g62939" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 677.59874,486.57192 27.94632,0"
-           inkscape:path-effect="#path-effect62989-8-0"
-           id="path62947"
-           d="m 677.59874,486.57192 27.94632,0"
-           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-      <text
-         transform="scale(1.0113976,0.98873084)"
-         sodipodi:linespacing="125%"
-         id="text62949-7"
-         y="534.96918"
-         x="646.71399"
-         style="font-size:10.01104736px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3465a4;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold;"
-         xml:space="preserve"><tspan
-           y="534.96918"
-           x="646.71399"
-           id="tspan62951-7"
-           sodipodi:role="line">ON</tspan></text>
-      <text
-         transform="scale(1.0113976,0.98873084)"
-         sodipodi:linespacing="125%"
-         id="text62949"
-         y="533.94482"
-         x="646.71399"
-         style="font-size:10.01104736px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         xml:space="preserve"><tspan
-           y="533.94482"
-           x="646.71399"
-           id="tspan62951"
-           sodipodi:role="line">ON</tspan></text>
-    </g>
-  </g>
-</svg>
--- a/data/classic.json.in
+++ b/data/classic.json.in
@@ -6,6 +6,6 @@
    "enabledExtensions": [@CLASSIC_EXTENSIONS@],
    "panel": { "left": ["appMenu"],
               "center": [],
-               "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"]
+               "right": ["a11y", "keyboard", "dateMenu", "quickSettings"]
             }
 }
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -93,15 +93,3 @@ $variant: 'light';
    /* keep in sync with -panel-corner-radius */
    border-radius: 0;
 }
-
-@each $v in us, intl {
-  .toggle-switch-#{$v} {
-    background-image: url("classic-toggle-off-#{$v}.svg");
-    &:checked { background-image: url("classic-toggle-on-#{$v}.svg"); }
-  }
-}
-
-.calendar-day-with-events {
-  background-image: url("calendar-today.svg");
-}
-
--- a/data/gnome-shell-sass/_colors.scss
+++ b/data/gnome-shell-sass/_colors.scss
@@ -1,34 +1,48 @@
 // When color definition differs for dark and light variant,
-// it gets @if ed depending on $variant
+// it gets @if-ed depending on $variant

-$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);
+@import '_palette.scss';

-$selected_fg_color: #fff;
-$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
+$is_highcontrast:false;
+
+$_dark_base_color: desaturate($dark_4, 100%);
+
+$base_color: if($variant == 'light', $light_1, $_dark_base_color);
+$bg_color: if($variant == 'light', $light_2, lighten($base_color, 5%));
+$fg_color: if($variant == 'light', transparentize(black, .2), white);
+
+$selected_fg_color: $light_1;
+$selected_bg_color: $blue_3;
 $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, 8%));
-$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), transparentize($fg_color, 0.93));
+
+$borders_color: if($variant == 'light', transparentize($fg_color, .5), transparentize($fg_color, .9));
+$outer_borders_color: if($variant == 'light', rgba(255,255,255,0.8), lighten($bg_color, 5%));
+
 $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;

-$warning_color: #f57900;
-$error_color: #ff8080;
-$success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
-$destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
+$warning_color: if($variant == 'light', $yellow_5, #cd9309);
+$error_color: if($variant == 'light', $red_3, $red_4);
+$success_color: if($variant == 'light', $green_4, $green_5);
+$destructive_color: $error_color;

-$osd_fg_color: #eeeeec;
-$osd_text_color: white;
-$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
+$osd_fg_color: $light_1;
+$osd_bg_color: $_dark_base_color; //hardcoded for both light & dark
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
-$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
+$osd_insensitive_fg_color: if($variant == 'light', mix($osd_fg_color, $osd_bg_color, 80%),  mix($osd_fg_color, $osd_bg_color, 70%));
 $osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.84);
+$osd_outer_borders_color: transparentize($osd_fg_color, 0.9);

 $shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
-$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color
+
+// button
+$button_mix_factor: 9%;
+
+// notifications
+$bubble_buttons_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%));
+
+// overview background color
+$system_bg_color: $base_color;

 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
@@ -42,3 +56,15 @@ $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
 $backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+
+// derived checked colors
+$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 7%));
+$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 7%));
+
+// derived hover colors
+$hover_bg_color: if($variant=='light', darken($bg_color, 3%), lighten($bg_color, 10%));
+$hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 10%));
+
+// derived active colors
+$active_bg_color: if($variant=='light', darken($bg_color, 5%), lighten($bg_color, 12%));
+$active_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 12%));
--- a/data/gnome-shell-sass/_common.scss
+++ b/data/gnome-shell-sass/_common.scss
@@ -28,26 +28,17 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
 // padding, margin and spacing
 $base_padding: 6px;
 $base_margin: 4px;
-$base_spacing: 6px;

 // border radii
 $base_border_radius: 8px;

-$modal_radius:$base_border_radius * 2;
+// radii of things that display over other things, e.g. popovers
+$modal_radius: $base_border_radius*2; // 24px

-// 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%));
+// Chroma key to flag when a background-color is always occluded, not visible.
+// This allows any box-shadow behind it to be rendered more efficiently by
+// omitting the middle rectangle.
+$invisible_occluded_bg_color: rgba(3,2,1,0);

 // fonts
 $base_font_size: 11;
@@ -55,6 +46,7 @@ $text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.

 // icons
 $base_icon_size: 1.09em;
+$large_icon_size: $base_icon_size*2; // 32px
 // $base_icon_size: 16px;

 // Stage
@@ -65,112 +57,189 @@ stage {

 /* Common Stylings */

-// Text
-%status_text {
-  font-size: 2em;
-  font-weight: bold;
-  color: $osd_fg_color;
-}
-
 // 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;
-}
-
-// Overview panels
-// for the dash and workspace switcher
-%overview_panel {
-  color: $osd_fg_color;
-  background-color: transparentize($osd_fg_color, 0.9);
+  border: 1px solid $osd_outer_borders_color;
+  border-radius: 999px;
+  padding: $base_padding*2;
+  @if $is_highcontrast {
+    border: 2px solid $hc_inset_color;
+  }
 }

 // icon tiles
-%icon_tile {
-  border-radius: $base_border_radius + 4px;
+%tile {
+  border-radius: $base_border_radius * 2; // 16px
  padding: $base_padding;
+  spacing: $base_padding;
  border: 2px solid transparent;
-  transition-duration: 100ms;
+  transition-duration: 200ms;
  text-align: center;
+  @if $is_highcontrast {
+    border-color: $hc_inset_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);
-}
-
-// button styling
+// normal 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;
+  font-weight: bold;
+  padding: $base_padding*.5 $base_padding*4;

  @include button(normal);
  &:focus { @include button(focus);}
  &:hover { @include button(hover);}
  &:insensitive { @include button(insensitive);}
+  &:selected,
  &:active { @include button(active);}
+  &:checked { @include button(checked);}
+
+  &.flat {
+    @include button(normal, $flat:true);
+    &:focus { @include button(focus, $flat:true);}
+    &:hover { @include button(hover, $flat:true);}
+    &:insensitive { @include button(insensitive, $flat:true);}
+    &:selected,
+    &:active { @include button(active, $flat:true);}
+    &:checked { @include button(checked, $flat:true);}
+  }
 }

-// buttons in dialogs
+
+// normal entry style
+%entry {
+  border-radius: $base_border_radius;
+  padding: $base_padding*1.5 $base_padding*1.5;
+  color: $fg_color;
+  selection-background-color: $selected_bg_color;
+  selected-color: $selected_fg_color;
+
+  @include entry(normal);
+  &:hover { @include entry(hover);}
+  &:focus { @include entry(focus);}
+  &:insensitive { @include entry(insensitive);}
+}
+
+
+// buttons in dialogs/notifications
+// lighter in color and have a greater radius
 %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;
+  font-weight: bold !important;

-  &:insensitive { @include button(insensitive, $shadow: none); }
-  &:focus { @include button(focus, $shadow: none); }
-  &:hover { @include button(hover, $shadow: none); }
-  &:active { @include button(active, $shadow: none); }
+  &:ltr {margin-right: 1px;}
+  &:rtl {margin-left: 1px;}

-  // radius is 2 pixel less to fit in bubble
-  &:first-child {
-    border-radius: 0 0 0 $modal_radius - 2px;
+  @include button(normal, $c:$bubble_buttons_color);
+  &:insensitive { @include button(insensitive, $c:$bubble_buttons_color);}
+  &:focus { @include button(focus, $c:$bubble_buttons_color);}
+  &:hover { @include button(hover, $c:$bubble_buttons_color);}
+  &:active { @include button(active, $c:$bubble_buttons_color);}
+  &:checked { @include button(checked, $c:$bubble_buttons_color);}
+
+  &:first-child:ltr {
+    border-radius: 0 0 0 $modal_radius;
  }

-  &:last-child {
-    border-right-width: 0;
-    border-radius: 0 0 $modal_radius - 2px 0;
+  &:last-child:ltr {
+    border-radius: 0 0 $modal_radius;
+    margin-right: 0 !important;
+  }
+
+  &:first-child:rtl {
+    border-radius: 0 0 $modal_radius;
+  }
+
+  &:last-child:rtl {
+    border-radius: 0 0 0 $modal_radius;
+    margin-left: 0 !important;
  }

  &:first-child:last-child {
-    border-radius: 0 0 $modal_radius - 2px $modal_radius - 2px;
+    border-radius: 0 0 $modal_radius $modal_radius;
+    margin-left: 0 !important;
+    margin-right: 0 !important;
  }
 }

+// buttons on OSD elements
+// that are undecorated by default and use OSD colors
+%osd_button {
+  @include button(undecorated);
+  &:insensitive { @include button(undecorated, $tc:$osd_fg_color, $c:$osd_bg_color);}
+  &:focus { @include button(focus, $tc:$osd_fg_color, $c:$osd_bg_color);}
+  &:hover { @include button(hover, $tc:$osd_fg_color, $c:$osd_bg_color);}
+  &:active { @include button(active, $tc:$osd_fg_color, $c:$osd_bg_color);}
+  &:outlined,&:checked { @include button(checked, $tc:$osd_fg_color, $c:$osd_bg_color);}
+}

-// notification styling
-@mixin notification_bubble($flat: false) {
-  border-width: 1px;
-  border-style: solid;
-  border-radius: $base_border_radius + 2px;
-  margin: $base_margin;

-  @if $flat {
-    @include button(undecorated);
-  } @else {
-    @include button(normal);
-  }
+// tooltip
+%tooltip {
+  background-color: $osd_bg_color;
+  color: $osd_fg_color;
+  border:1px solid $osd_outer_borders_color;
+  border-radius: 99px;
+  padding: $base_padding $base_padding * 2;
+  text-align: center;

-  &:focus {
-    @include button(focus);
-  }
-
-  &:hover {
-    @include button(hover);
-  }
-
-  &:active {
-    @include button(active);
+  @if $is_highcontrast {
+    background-color: $osd_bg_color;
+    color: $osd_fg_color;
+    border: 1px solid $hc_inset_color;
  }
 }
+
+/* General Typography */
+
+%large_title {
+  font-weight: 300;
+  @include fontsize(24);
+}
+
+%title_1 {
+  font-weight: 800;
+  @include fontsize(20);
+}
+
+%title_2 {
+  font-weight: 800;
+  @include fontsize(15);
+}
+
+%title_3 {
+  font-weight: 700;
+  @include fontsize(15);
+}
+
+%title_4 {
+  font-weight: 700;
+  @include fontsize(13);
+}
+
+%heading {
+  font-weight: 700;
+  @include fontsize(11);
+}
+
+%caption_heading {
+  font-weight: 700;
+  @include fontsize(9);
+}
+
+%caption {
+  font-weight: 400;
+  @include fontsize(9);
+}
+
+%smaller {
+  font-weight: 400;
+  @include fontsize(8);
+}
+
+%monospace {font-family: monospace;}
+%numeric { font-feature-settings: "tnum";}
--- 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 draw_widget_edge($c:$borders_edge) {
+@function draw_widget_edge($c:$outer_borders_color) {
 // outer highlight "used" on most widgets
  @return 0 1px $c;
 }
@@ -25,103 +25,53 @@

 // entries

-@mixin entry($t, $fc:$selected_bg_color, $edge: $borders_edge) {
+@mixin entry($t, $fc:$selected_bg_color) {
 //
 // Entries drawing function
 //
 // $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
 //
 // possible $t values:
 // normal, focus, insensitive
 //
+  transition-duration: 100ms;

  @if $t==normal {
-    background-color: $base_color;
-    border-color: $borders_color;
+    background-color: transparentize($fg_color, 0.9);
+    color: transparentize($fg_color,0.3);

+    @if $is_highcontrast {
+      box-shadow: inset 0 0 0 1px $hc_inset_color;
+    }
  }
+
  @if $t==focus {
-    border-color: if($fc==$selected_bg_color,
-              $selected_borders_color,
-              darken($fc,35%));
+    background-color: mix(transparentize($fg_color, 0.8), $selected_bg_color, 95%);
    box-shadow: inset 0 0 0 2px $fc;
+    color: $fg_color;
+    &:hover {}
  }
-  @if $t==hover { }
+
+  @if $t==hover {
+    background-color:transparentize($fg_color, 0.8);
+    color: inherit;
+  }
+
  @if $t==insensitive {
+    background-color:transparentize($insensitive_fg_color, 0.8);
    color: $insensitive_fg_color;
-    border-color: $insensitive_bg_color;
-    box-shadow: none;
  }
 }

-// buttons
-
-@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) {
+// On-screen Keyboard
+@mixin keyboard_key($t, $c:$osd_bg_color, $tc:$osd_fg_color) {
 //
-// calculate the color of text shadows
+// Keyboard key drawing function
 //
-// $tc is the text color
-// $bg is the background color
-//
-  $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 highlight color for buttons
-//
-// $c: base color;
-//
-  @if lightness($c)>90% { @return white; }
-  @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
-//
-// $tc is the optional text color, not the shadow color
-//
-// TODO: this functions needs a way to deal with special cases
-//
-
-  $shadow: draw_text_shadow_color($tc, $bg);
-
-  @if lightness($tc)<50% {
-    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, $shadow: $shadow_color) {
-//
-// Button drawing function
-//
-// $t:    button type,
-// $c:    base button color for colored* types
+// $t:    key type,
+// $c:    base key color for colored* types
 // $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,
@@ -129,104 +79,272 @@
 // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
 //

-  $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 key
+  @if $t==normal {
+    color: $tc;
+    background-color: lighten($c, 3%);
+  }
+
+  // focused key
+  @if $t==focus {
+    color: $tc;
+    background-color: mix(lighten($c, 3%), $selected_bg_color, 90%);
+    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4);
+    &:hover {
+      background-color: mix(lighten($c, 8%), $selected_bg_color, 90%);
+      box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3);
+    }
+    &:active {
+      background-color: mix(lighten($c, 10%), $selected_bg_color, 90%);
+      box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3);
+    }
+  }
+
+  // hover key
+  @else if $t==hover {
+    color: $tc;
+    background-color: lighten($c, 7%);
+  }
+
+  // active key
+  @else if $t==active {
+    color: $tc;
+    background-color: lighten($c, 10%);
+  }
+
+  // checked key
+  @else if $t==checked {
+    color: $tc;
+    background-color: lighten($c, 15%);
+  }
+
+  // insensitive key
+  @else if $t==insensitive {
+    color: $insensitive_fg_color;
+    background-color: $insensitive_bg_color;
+  }
+
+  // reset
+  @else if $t==undecorated {
+    background-color: transparent;
+    background-image: none;
+  }
+}
+
+//
+// Button drawing function
+//
+// $t:    button type,
+// $c:    base button colors, derived from fg_color
+// $tc:    base button colors, derived from fg_color
+//
+// possible $t values:
+// normal, hover, active, insensitive, insensitive-active,
+// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
+// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
+//
+// since buttons are all flat an borderless now the mixin is simpler
+
+@mixin button($t, $tc:$fg_color, $c:$bg_color, $flat: false) {
+
+  $button_bg_color: mix($tc, $c, $button_mix_factor);
+  transition-duration: 100ms;

  // normal button
  @if $t==normal {
    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 {
-    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;
+    background-color: $button_bg_color;
+    @if $flat {
+      background-color: transparent;
+    }
+    @if $is_highcontrast {
+      box-shadow: inset 0 0 0 1px $hc_inset_color;
+    }
  }

  // hover button
  @else if $t==hover {
    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;
+    background-color: lighten($button_bg_color, 3%);
+    @if $is_highcontrast {
+      box-shadow: inset 0 0 0 1px $hc_inset_color !important;
+    }
  }

  // active button
  @else if $t==active {
    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;
+    background-color:  lighten($button_bg_color, 9%);
+  }
+
+  // checked button
+  @else if $t==checked {
+    color: $tc;
+    background-color: lighten($button_bg_color, 9%);
+    &:hover { background-color: lighten($button_bg_color, 12%);}
+    &:active { background-color: lighten($button_bg_color, 15%);}
+  }
+
+  // focused button
+  @if $t==focus {
+    color: $tc;
+    background-color: mix($button_bg_color, $selected_bg_color, 90%);
+    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4) !important;
+    &:hover {
+      background-color: mix(lighten($button_bg_color, 3%), $selected_bg_color, 90%);
+      box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3) !important;
+    }
+    &:active {
+      background-color: mix(lighten($button_bg_color, 6%), $selected_bg_color, 90%);
+      box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3) !important;
+    }
  }

  // insensitive button
  @else if $t==insensitive {
-    color: $insensitive_fg_color;
-    border-color: $insensitive_borders_color;
-    background-color: $insensitive_bg_color;
-    box-shadow: none;
-    text-shadow: none;
-    icon-shadow: none;
+    color: transparentize($tc, 0.5);
+    background-color: transparentize($tc, .95);
+  }
+
+  // default/suggested button
+  @else if $t==default {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+
+    &:focus {
+      box-shadow: inset 0 0 0 2px transparentize($selected_fg_color, .4) !important;
+    }
+    &:hover, &:focus {
+      background-color: lighten($selected_bg_color, 5%);
+      color: lighten($selected_fg_color, 5%);
+    }
+    &:active {
+      background-color: darken($selected_bg_color, 7%);
+      color: darken($selected_fg_color, 7%);
+    }
+    &:insensitive {
+      @include button(insensitive);
+      background-color: transparentize($selected_bg_color, .5);
+      color: transparentize($selected_fg_color, .5);
+    }
  }

  // reset
  @else if $t==undecorated {
-    border-color: transparent;
    background-color: transparent;
-    background-image: none;
-    @include draw_shadows(inset 0 1px rgba(255,255,255,0),$blank_edge);
-    text-shadow: none;
-    icon-shadow: none;
+    background-color: none;
+    box-shadow: none;
+    &:insensitive {
+      @include button(insensitive);
+      background-color: transparent;
+      color: transparentize($selected_fg_color, .5);
+    }
  }
 }

-// overview icons
-@mixin overview-icon($color) {
-  .overview-icon {
-    @extend %icon_tile;
-    color: $color;
-  }
-
-  &:hover,
-  &:selected {
-    .overview-icon {
-      background-color: transparentize($color, .9);
+// tile
+@mixin tile_button($color, $flat: true) {
+  @extend %tile;
+  @if $flat {
+    background-color: transparent;
+  } @else {
+    background-color: transparentize($color, .84);
+    @if $is_highcontrast {
+      box-shadow: inset 999px 0 0 0 transparentize($color, .2); // bit of a hack
    }
  }
-
-  &:focus {
-    .overview-icon {
-      background-color: transparentize($color, .7);
-      // border-color: $selected_bg_color;
-    }
+  &:hover { background-color: transparentize($color, .9);}
+  &:selected, &:focus {
+    background-color: transparentize($color, .87);
+    &:hover { background-color: transparentize($color, .84);}
+    &:active { background-color: transparentize($color, .87);}
+  }
+  &:active { background-color: transparentize($color, .84);}
+  &:outlined, &:checked {
+    background-color: transparentize($color, .81);
+    &:active { background-color: transparentize($color, .78);}
+    &:hover { background-color: transparentize($color, .75);}
  }
-
  &:drop {
-    .overview-icon {
-      border: 2px solid $selected_bg_color; //already 2px transparent so no jumping
-      background-color: transparentize($selected_bg_color, .8);
-    }
-  }
-
-  &:active,
-  &:checked {
-    .overview-icon {
-      background-color: transparentize(darken($osd_bg_color, 10%), .5);
-    }
+    border: 2px solid transparentize($selected_bg_color, .2); //already 2px transparent so no jumping
+    background-color: transparentize($selected_bg_color, .8);
  }
 }
+
+// overview icon, dash, app grid
+@mixin overview_icon($color, $flat: true) {
+  transition-duration: 400ms;
+  .overview-icon { 
+    @extend %tile;
+  }
+  @if $flat {
+    .overview-icon { background-color: transparent;}
+  } @else {
+    .overview-icon { 
+      background-color: transparentize($color, .93);
+    }
+  }
+  &:hover .overview-icon { background-color: transparentize($color, .9);}
+
+  &:selected .overview-icon,
+  &:focus .overview-icon {
+    background-color: transparentize($color, .87);
+    &:hover .overview-icon { background-color: transparentize($color, .84);}
+    &:active .overview-icon { background-color: transparentize($color, .87);}
+  }
+  &:active .overview-icon { background-color: transparentize($color, .84);}
+  &:outlined .overview-icon,
+  &:checked .overview-icon {
+    background-color: transparentize($color, .81);
+    &:active .overview-icon { background-color: transparentize($color, .78);}
+    &:hover .overview-icon { background-color: transparentize($color, .75);}
+  }
+  &:drop .overview-icon {
+    border: 2px solid transparentize($selected_bg_color, .2); //already 2px transparent so no jumping
+    background-color: transparentize($selected_bg_color, .8);
+  }
+}
+
+// styling for elements within popovers that look like notifications
+@mixin card($flat: false) {
+  border-radius: $base_border_radius*1.5;
+  margin: $base_margin;
+
+  @if $flat {
+    @include button(undecorated);
+    box-shadow: none !important;
+  } @else {
+    @include button(normal);
+  }
+  &:hover {@include button(hover);}
+  &:active {@include button(active);}
+  &:focus {@include button(focus);}
+}
+
+// styling for all menuitems in popovers
+@mixin menuitem($bg, $flat: true) {
+
+  // lighten the background color always
+  $bg: lighten($bg,5%);
+
+  font-weight: normal;
+  spacing: $base_padding;
+  transition-duration: 100ms;
+  padding: $base_padding*1.5 $base_padding*2;
+
+  &:ltr {padding-left: $base_padding;}
+  &:rtl {padding-right: $base_padding;}
+
+  @if $flat {
+    @include button(undecorated);
+    box-shadow: none !important;
+  } @else {
+    @include button(normal, $c:$bg);
+  }
+  &:focus,
+  &:hover {
+    @include button(hover, $c:$bg);
+  }
+  &:active {@include button(active, $c:$bg);}
+  &:checked {@include button(checked, $c:$bg);}
+}
--- a/data/gnome-shell-sass/_high-contrast-colors.scss
+++ b/data/gnome-shell-sass/_high-contrast-colors.scss
@@ -1,32 +1,48 @@
 // When color definition differs for dark and light variant,
 // it gets @if ed depending on $variant

+@import '_palette.scss';

-$base_color: #222;
-$bg_color: #000;
-$fg_color: #fff;
+$is_highcontrast:true;
+
+$base_color: if($variant == 'light', white, black);
+$bg_color: if($variant == 'light', darken($base_color, 10%), lighten($base_color, 10%));
+$fg_color: if($variant == 'light', transparentize(black, .2), white);
+
+$selected_fg_color: white;
+$selected_bg_color: $blue_3;

-$selected_fg_color: #ffffff;
-$selected_bg_color: darken(#4a90d9,20%);
 $selected_borders_color: darken($selected_bg_color, 20%);
-$borders_color: darken($bg_color,12%);
-$borders_edge: transparentize($fg_color, 0.9);
+$borders_color: if($variant == 'light', transparentize($fg_color, .5), transparentize($fg_color, .7));
+$outer_borders_color: $borders_color;
 $link_color: lighten($selected_bg_color,20%);
 $link_visited_color: lighten($selected_bg_color,10%);
-$top_hilight: $borders_edge;

-$warning_color: #f57900;
-$error_color: #cc0000;
-$success_color: darken(#73d216,10%);
-$destructive_color: darken(#ef2929,10%);
+$warning_color: if($variant == 'light', $yellow_5, #cd9309);
+$error_color: if($variant == 'light', $red_3, $red_4);
+$success_color: if($variant == 'light', $green_4, $green_5);
+$destructive_color: $error_color;

-$osd_fg_color: #eeeeec;
-$osd_bg_color: #2e3436;
-$osd_borders_color: rgba(0,0,0, 0.7);
-$osd_outer_borders_color: rgba(255,255,255, 0.1);
+$osd_fg_color: white;
+$osd_bg_color: $base_color;
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: if($variant == 'light', mix($osd_fg_color, $osd_bg_color, 80%),  mix($osd_fg_color, $osd_bg_color, 70%));
+$osd_borders_color: transparentize($osd_fg_color, 0.8);
+$osd_outer_borders_color: $osd_borders_color;

-$shadow_color: rgba(0,0,0, 0.1);
-$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color
+$shadow_color: rgba(0,0,0,0);
+
+// hc
+$hc_inset_color: transparentize($fg_color, 0.7);
+
+// button
+$button_mix_factor: 20%;
+
+// notifications
+$bubble_buttons_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%));
+
+// overview background color
+$system_bg_color: black;

 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
@@ -40,3 +56,15 @@ $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
 $backdrop_insensitive_color: lighten($backdrop_bg_color,15%);
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+
+// derived checked colors
+$checked_bg_color: if($variant=='light', darken($bg_color, 12%), lighten($bg_color, 18%));
+$checked_fg_color: if($variant=='light', darken($fg_color, 12%), lighten($fg_color, 18%));
+
+// derived hover colors
+$hover_bg_color: if($variant=='light', darken($bg_color, 8%), lighten($bg_color, 20%));
+$hover_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color, 20%));
+
+// derived active colors
+$active_bg_color: if($variant=='light', darken($bg_color, 10%), lighten($bg_color, 22%));
+$active_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color, 22%));
--- a/data/gnome-shell-sass/_palette.scss
+++ b/data/gnome-shell-sass/_palette.scss
@@ -0,0 +1,46 @@
+//GNOME Color Palette
+$blue_1: #99c1f1;
+$blue_2: #62a0ea;
+$blue_3: #3584e4;
+$blue_4: #1c71d8;
+$blue_5: #1a5fb4;
+$green_1: #8ff0a4;
+$green_2: #57e389;
+$green_3: #33d17a;
+$green_4: #2ec27e;
+$green_5: #26a269;
+$yellow_1: #f9f06b;
+$yellow_2: #f8e45c;
+$yellow_3: #f6d32d;
+$yellow_4: #f5c211;
+$yellow_5: #e5a50a;
+$orange_1: #ffbe6f;
+$orange_2: #ffa348;
+$orange_3: #ff7800;
+$orange_4: #e66100;
+$orange_5: #c64600;
+$red_1: #f66151;
+$red_2: #ed333b;
+$red_3: #e01b24;
+$red_4: #c01c28;
+$red_5: #a51d2d;
+$purple_1: #dc8add;
+$purple_2: #c061cb;
+$purple_3: #9141ac;
+$purple_4: #813d9c;
+$purple_5: #613583;
+$brown_1: #cdab8f;
+$brown_2: #b5835a;
+$brown_3: #986a44;
+$brown_4: #865e3c;
+$brown_5: #63452c;
+$light_1: #ffffff;
+$light_2: #f6f5f4;
+$light_3: #deddda;
+$light_4: #c0bfbc;
+$light_5: #9a9996;
+$dark_1: #77767b;
+$dark_2: #5e5c64;
+$dark_3: #3d3846;
+$dark_4: #241f31;
+$dark_5: #000000;
--- a/data/gnome-shell-sass/_widgets.scss
+++ b/data/gnome-shell-sass/_widgets.scss
@@ -24,14 +24,15 @@
@import 'widgets/hotplug';
 // Dialogs
@import 'widgets/dialogs';
-@import 'widgets/network-dialog';
 // OSDs
@import 'widgets/osd';
@import 'widgets/switcher-popup';
@import 'widgets/workspace-switcher';
+@import 'widgets/screenshot';
 // Panel
@import 'widgets/panel';
@import 'widgets/corner-ripple';
+@import 'widgets/quick-settings';
 // Overview
@import 'widgets/overview';
@import 'widgets/window-picker';
@@ -43,9 +44,7 @@
 // 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';
+// Lock / login screen
+@import 'widgets/login-lock';
--- a/data/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/gnome-shell-sass/widgets/_app-grid.scss
@@ -4,45 +4,48 @@ $app_icon_size: 96px;

 // app icons
 .icon-grid {
-  row-spacing: $base_spacing * 2;
-  column-spacing: $base_spacing * 2;
-  max-row-spacing: $base_spacing * 12;
-  max-column-spacing: $base_spacing * 12;
+  row-spacing: $base_padding * 2;
+  column-spacing: $base_padding * 2;
+  max-row-spacing: $base_padding * 7;
+  max-column-spacing: $base_padding * 7;
  page-padding-top: $base_padding * 4;
  page-padding-bottom: $base_padding * 4;
-  page-padding-left: $base_padding * 2;
-  page-padding-right: $base_padding * 2;
+  page-padding-left: $base_padding * 3;
+  page-padding-right: $base_padding * 3;
 }

 /* 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);
+.app-well-app {
+  @include overview_icon($osd_fg_color);

+  .overview-icon {
+    padding: $base_padding*2;
+    border-radius: $base_border_radius*3;
+  }
  .overview-icon.overview-icon-with-label {
-    padding: 10px 8px 5px 8px;
-
    > StBoxLayout {
-      spacing: $base_spacing;
+      spacing: $base_padding;
    }
  }
 }

-/* App Folders */
+// app folders
 .app-well-app.app-folder {
-  background-color: $dash_background_color;
-  border-radius: $base_border_radius + 4px; // same as %icon_tile
+  @include overview_icon($fg_color, $flat: false);
 }

 // expanded folder
-.app-folder-dialog { //style like the dash
-  border-radius: $modal_radius * 1.5;
-  background-color: $dash_background_color;
-  padding: 12px 0px 12px 0px;
+.app-folder-dialog {
+  border-radius: $modal_radius*4;
+  background-color: $bg_color;
+  padding: $base_padding*2;
+  box-shadow:inset 0 0 0 1px $outer_borders_color;
+
+  @if $is_highcontrast {
+    box-shadow:inset 0 0 0 2px $hc_inset_color;
+  }

  & .folder-name-container {
    padding: 24px 36px 0;
@@ -50,30 +53,30 @@ $app_grid_fg_color: #fff;

    & .folder-name-label,
    & .folder-name-entry {
-      font-size: 18pt;
-      font-weight: 800;
+      @extend %title_1;
    }

-    & .folder-name-entry { width: 300px }
+    & .folder-name-entry {
+      width: 12em;
+      border-radius: $base_border_radius*2;
+    }

    /* 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 }
+      border-radius: 99px;
+      & > StIcon { icon-size: $base_icon_size }
    }
  }

  & .icon-grid {
-    row-spacing: $base_spacing * 2;
-    column-spacing: $base_spacing * 5;
+    row-spacing: $base_padding * 2;
+    column-spacing: $base_padding * 5;
    page-padding-top: 0;
    page-padding-bottom: 0;
    page-padding-left: 0;
@@ -84,10 +87,11 @@ $app_grid_fg_color: #fff;
    margin-bottom: 18px;
  }
 }
+
 .app-folder-dialog-container {
-  padding: 12px;
-  width: 620px;
-  height: 620px;
+  padding: $base_padding*2;
+  width: 720px;
+  height: 720px;
 }

 // Running app indicator (also shown in dash)
@@ -95,26 +99,22 @@ $app_grid_fg_color: #fff;
  height: 5px;
  width: 5px;
  border-radius:5px;
+  margin-bottom: 8px;
  background-color: $osd_fg_color;
-  margin-bottom: 1px;
 }

 // Rename popup for app folders
 .rename-folder-popup {
  .rename-folder-popup-item {
-    spacing: $base_spacing;
+    spacing: $base_padding;
    &:ltr, &:rtl { padding: 0 $base_padding * 2; }
  }
 }

-// right-click app menu
-.app-menu {
-  max-width: 27.25em;
-}
-
 // App Grid pagination indicators
 .page-indicator {
  padding: $base_padding $base_padding * 2 0;
+  transition-duration:400ms;

  .page-indicator-icon {
    width: 10px;
@@ -131,14 +131,15 @@ $app_grid_fg_color: #fff;
 // shutdown and other actions in the grid
 .system-action-icon {
  background-color: rgba(0,0,0,0.8);
-  color: #fff;
+  color: white;
  border-radius: 99px;
  icon-size: $app_icon_size * 0.5;
+  @if $is_highcontrast {
+    box-shadow: inset 0 0 0 2px $hc_inset_color;
+  }
 }

 .page-navigation-hint {
-  width: 300px;
-
  &.dnd {
    background: rgba(255, 255, 255, 0.1);
  }
@@ -148,7 +149,7 @@ $app_grid_fg_color: #fff;
    background-gradient-start: rgba(255, 255, 255, 0.05);
    background-gradient-end: transparent;
    background-gradient-direction: horizontal;
-    border-radius: 15px 0px 0px 15px;
+    border-radius: $modal_radius*1.5 0px 0px $modal_radius*1.5;
  }

  &.previous:ltr,
@@ -156,12 +157,21 @@ $app_grid_fg_color: #fff;
    background-gradient-start: transparent;
    background-gradient-end: rgba(255, 255, 255, 0.05);
    background-gradient-direction: horizontal;
-    border-radius: 0px 15px 15px 0px;
+    border-radius: 0px $modal_radius*1.5 $modal_radius*1.5 0px;
  }
 }

 .page-navigation-arrow {
  margin: 6px;
+  padding: 18px;
  width: 24px;
  height: 24px;
+  border-radius: 99px;
+  @if $is_highcontrast {
+    @include button(normal, $osd_fg_color, transparentize($osd_bg_color, 0.5));
+  }
+
+  &:insensitive { @include button(undecorated, $osd_fg_color, transparentize($osd_bg_color, 0.5));}
+  &:hover { @include button(hover, $osd_fg_color, transparentize($osd_bg_color, 0.5));}
+  &:active { @include button(active, $osd_fg_color, transparentize($osd_bg_color, 0.5));}
 }
--- a/data/gnome-shell-sass/widgets/_buttons.scss
+++ b/data/gnome-shell-sass/widgets/_buttons.scss
@@ -2,4 +2,18 @@

 .button {
  @extend %button; // that's it
+  min-height: 22px;
+}
+
+.icon-button {
+  @extend .button; // same style as buttons
+
+  border-radius: 99px;
+  padding: $base_padding*2;
+  min-height: 16px;
+
+  StIcon {
+    icon-size: $base_icon_size;
+    -st-icon-style: symbolic;
+  }
 }
--- a/data/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/gnome-shell-sass/widgets/_calendar.scss
@@ -1,291 +1,265 @@
 /* Date/Time Menu */

-.clock-display-box {
-  spacing: 2px;
-
-  .clock {
-    padding-left: $base_padding * 2;
-    padding-right: $base_padding * 2;
-  }
-}
-
 // overall menu
 #calendarArea {
-  padding:0;
+  padding: $base_padding - 2px;
 }

 // 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;
+  spacing: $base_padding;
+  &:ltr {padding-left: $base_padding;}
+  &:rtl {padding-right: $base_padding;}
+  .datemenu-displays-box {spacing: $base_padding;}
 }

 /* today button (the date) */
 .datemenu-today-button {
-  @include notification_bubble($flat: true);
+  @include card(flat);
  padding: $base_padding * 1.5;

  // weekday label
  .day-label {
-    @include fontsize($base_font_size+1);
-    font-weight: bold;
+    @extend %heading;
  }

  // date label
  .date-label {
-    @include fontsize($base_font_size+7);
-    font-weight: 1000;
+    @extend %title_2;
  }
 }

 /* Calendar */
 .calendar {
-  @include notification_bubble;
-  padding: $base_padding;
+  @include card(flat);
+  margin-top: 0;

-  // month
-  .calendar-month-label {
-    color: lighten($fg_color,5%);
-    font-weight: bold;
-    padding: 8px 0;
-    &:focus {}
+  // month header
+  .calendar-month-header {
+
+    // prev/next month icons
+    .calendar-change-month-back StIcon,
+    .calendar-change-month-forward StIcon {
+      icon-size: $base_icon_size;
+    }
+
+    // month label
+    .calendar-month-label {
+      @extend %heading;
+      padding: 8px 0;
+    }
+    .pager-button {
+      background-color: transparent;
+      height: 32px;
+      width: 32px;
+      margin: 2px;
+      border-radius: $base_border_radius;
+      &:hover, &:focus {background-color: $hover_bg_color;}
+      &:active {background-color: $active_bg_color;}
+      @if $is_highcontrast {
+        border:1px solid $hc_inset_color;
+      }
+    }
  }

-  // 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_size: 3em;

  .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; }
+    padding: 0 !important;
+    height: $calendar_day_size !important;
+    width: $calendar_day_size !important;
+    border-radius: 99px;
+    transition-duration: 100ms;
+    @extend %numeric;
+    @extend %smaller;
+
+    &:hover {background-color: $hover_bg_color;}
+    &:focus {
+      background-color: mix($bg_color, $selected_bg_color, 80%);
+      color: $selected_fg_color;
+      box-shadow:inset 0 0 0 2px transparentize($selected_bg_color, 0.4);
+    }
+
    &:active,&:selected {
-      color: lighten($fg_color,10%);
-      background-color: darken($bg_color,5%);
+      color: $active_fg_color;
+      background-color: $active_bg_color;
+      &:focus {
+        background-color: mix($active_bg_color, $selected_bg_color, 80%);
+      }
    }

    // day of week heading
    &.calendar-day-heading {
-      color: lighten($fg_color,10%);
-      margin-top: 1em;
-      @include fontsize($base_font_size - 4);
+      color: $insensitive_fg_color;
+      padding-top: $base_padding;
+      height: 16px !important; // force heading to be smaller height
+      font-weight: 600;
+      @extend %smaller;
    }
  }

-  .calendar-day { //border collapse hack - see calendar.js
-    border-width: 0;
+  .calendar-day {
+    font-weight: 600;
+    @if $is_highcontrast {
+      border:1px solid $hc_inset_color;
+      border-radius: 9px;
+    }
  }
-
-  .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-nonwork-day {color: $insensitive_fg_color;}
+  .calendar-other-month-day {
+    color: transparentize($fg_color, 0.5);
+    &.calendar-nonwork-day {
+      color: transparentize($insensitive_fg_color, 0.5);
+    }
  }

  // Today
  .calendar-today {
-    font-weight: bold;
-    border: 1px solid transparent;
    background-color: $selected_bg_color;
-    color: $selected_fg_color;
+    font-weight: 800;
+    color: $selected_fg_color !important;

    &:hover,&:focus {
      background-color:lighten($selected_bg_color, 3%);
-      color: $selected_fg_color;
+      color: inherit;
    }

    &:active,&:selected {
      background-color: $selected_bg_color;
-      color: $selected_fg_color;
+      color: inherit;

      &:hover,&:focus {
        background-color:lighten($selected_bg_color, 3%);
-        color: $selected_fg_color;
+        color: inherit;
      }
    }
  }

  .calendar-day-with-events {
-    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
-    &.calendar-work-day {
-       color: lighten($fg_color,10%);
-       font-weight: bold;
-    }
-  }
-
-  .calendar-other-month-day {
-    color: transparentize($fg_color ,0.5);
+    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/calendar-today-light.svg"),url("resource:///org/gnome/shell/theme/calendar-today.svg"));
+    background-size: contain;
  }

  .calendar-week-number {
    @include fontsize($base_font_size - 4);
    font-weight: bold;
-    height: 1.8em;
-    width: 2.3em; 
-    border-radius: 2px;
+    font-feature-settings: "tnum";
    margin: 6px;
-    background-color: darken($bg_color, 2%);
-    color: lighten($fg_color, 5%);
+    padding: 0 $base_padding;
+    border-radius: 3px;
+    background-color: transparentize($fg_color, 0.9);
+    color: $insensitive_fg_color
  }
 }

 /* Events */
 .events-button {
-  @include notification_bubble;
+  @include card;
  padding: $base_padding * 2;

  .events-box {
-    spacing: $base_spacing;
+    spacing: $base_padding;
  }

  .events-list {
-    spacing: 2 * $base_spacing;
+    spacing: 2 * $base_padding;
  }

  .events-title {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
+    @extend %heading;
+    color: $insensitive_fg_color;
    margin-bottom: $base_margin;
  }

  .event-time {
-    color: darken($fg_color,20%);
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size - 1);
+    @extend %numeric;
+    @extend %caption;
+    color: $insensitive_fg_color;
  }
 }

 /* World clocks */
 .world-clocks-button {
-  @include notification_bubble;
+  @include card;
  padding: $base_padding * 2;

  .world-clocks-grid {
-    spacing-rows: $base_spacing;
-    spacing-columns: $base_spacing * 2;
+    spacing-rows: $base_padding;
+    spacing-columns: $base_padding * 2;
  }

  // title
  .world-clocks-header {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
+    @extend %heading;
+    color: $insensitive_fg_color;
  }

  // city label
  .world-clocks-city {
    color: $fg_color;
-    @include fontsize($base_font_size);
-    font-weight: normal;
  }

  // timezone time
  .world-clocks-time {
-    font-weight: bold;
+    @extend %heading;
+    @extend %numeric;
    color: $fg_color;
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size);

-    &:ltr { text-align: right; }
-    &:rtl { text-align: left; }
+    &:ltr {text-align: right;}
+    &:rtl {text-align: left;}
  }

  // timezone offset label
  .world-clocks-timezone {
-    color: darken($fg_color,20%);
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size - 1);
+    @extend %numeric;
+    @extend %caption;
+    color: $insensitive_fg_color;
  }
 }

 /* Weather */
 .weather-button {
-  @include notification_bubble;
+  @include card;
  padding: $base_padding * 2;

  .weather-box {
-    spacing: $base_spacing + $base_margin;
+    spacing: $base_padding + $base_margin;
  }

  .weather-header-box {
-    spacing: $base_spacing;
+    spacing: $base_padding;
  }

  .weather-header {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
+    color: $insensitive_fg_color;
+    @extend %heading;

    &.location {
      font-weight: normal;
-      @include fontsize($base_font_size - 1);
    }
  }

  .weather-grid {
-    spacing-rows: $base_spacing;
-    spacing-columns: $base_spacing * 2;
+    spacing-rows: $base_padding;
+    spacing-columns: $base_padding * 2;
  }

  .weather-forecast-time {
+    @extend %numeric;
+    @extend %caption;
    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;
+    icon-size: $large_icon_size;
  }

  .weather-forecast-temp {
-    font-weight: bold;
+    @extend %heading;
  }
 }
--- a/data/gnome-shell-sass/widgets/_check-box.scss
+++ b/data/gnome-shell-sass/widgets/_check-box.scss
@@ -1,7 +1,7 @@
 /* Check Boxes */

 // these are equal to the size of the SVG assets
-$check_height: 22px;
+$check_height: 24px;
 $check_width: 24px;


@@ -10,9 +10,9 @@ $check_width: 24px;
  StBin {
    width: $check_width;
    height: $check_height;
-    background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg");
+    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/checkbox-off-light.svg"), url("resource:///org/gnome/shell/theme/checkbox-off.svg"));
  }
-  &:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
+  &:focus StBin { background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/checkbox-off-focused-light.svg"), 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"); }
-}
+}
--- a/data/gnome-shell-sass/widgets/_corner-ripple.scss
+++ b/data/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -3,8 +3,8 @@
 $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%);
+  background-color: rgba(255,255,255,0.2);
+  box-shadow: 0 0 2px 2px rgba(255,255,255,0.2);
  // plus + 2px for the border (box-shadow)
  width: $ripple_size + 2px;
  height: $ripple_size + 2px;
--- a/data/gnome-shell-sass/widgets/_dash.scss
+++ b/data/gnome-shell-sass/widgets/_dash.scss
@@ -1,18 +1,14 @@
 /* Dash */

-$dash_background_color: #3b3b3b;
+$dash_background_color: lighten($system_bg_color, 5%);
 $dash_placeholder_size: 32px;
-$dash_padding: $base_padding + 4px; // 10px
-$dash_spacing: $base_padding / 4;
-
-$dash_bottom_margin: $base_margin * 4;
-
-$dash_border_radius: $modal_radius * 1.5;
+$dash_padding: $base_padding*2; // 12px
+$dash_border_radius: $modal_radius + $dash_padding;

+// container for the dash
 #dash {
-  @include fontsize($base_font_size - 2);
-  margin-top: $base_spacing * 3;
-  padding: 0 $dash_padding;
+  @extend %caption;
+  margin-top: $dash_padding;

  .placeholder {
    // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
@@ -26,48 +22,59 @@ $dash_border_radius: $modal_radius * 1.5;
    height: $dash_placeholder_size;
  }

-  .overview-icon {
-    padding: $dash_padding / 2;
+  // Running app indicator (also shown in app grid)
+  .app-well-app-running-dot {
+    margin-bottom: 14px; // hardcoded
  }
 }

+// background of the dash behind app icons
 .dash-background {
  background-color: $dash_background_color;
-  margin-bottom: $dash_bottom_margin;
-  padding: $dash_padding;
  border-radius: $dash_border_radius;
+  padding: $dash_padding;
+  spacing: $base_padding;
+  margin-bottom: $dash_padding;
+
+  @if $is_highcontrast {
+    border: 2px solid $hc_inset_color;
+    box-shadow:none;
+  }
 }

-// Dash Items
-.dash-item-container .app-well-app, .show-apps {
-  padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin;
+// items on the dash
+.dash-item-container {
+  > * {margin: 0 2px;}
+  &:ltr{&:first-child {margin-left: 0;}}
+  &:rtl{&:first-child {margin-right: 0;}}
+
+  // each app item on the dash
+  .app-well-app .overview-icon {
+    padding: $base_padding;
+    border-radius: $base_border_radius*2;
+  }
+
+  // show apps button
+  .show-apps { @include overview_icon($osd_fg_color);}
+
+  .show-apps, .app-well-app {
+    padding-bottom: $dash_padding;
+  }
 }

+// separator between favourites and running apps
 .dash-separator {
  width: 1px;
-  margin: 0 ($dash_spacing + ($dash_padding / 2)) $dash_bottom_margin;
-  background-color: transparentize($osd_fg_color,0.7);
+  margin: 0 $base_margin;
+  background-color: $borders_color;
+  margin-bottom: $dash_padding;
+  @if $is_highcontrast {
+    width: 2px;
+  }
 }

 // OSD Tooltip
 .dash-label {
-  color: $osd_fg_color;
-  background-color: $osd_bg_color;
-  border-radius: 99px;
-  padding: $base_padding $base_padding * 2;
-  text-align: center;
-  -y-offset: $base_margin * 3; // distance from the dash edge
-}
-
-// Show apps button
-.show-apps {
-  @include overview-icon($osd_fg_color);
-
-  &:focus,
-  &:checked {
-    .overview-icon {
-      background-color: transparentize($osd_bg_color,0.5);
-      color: $fg_color;
-    }
-  }
+  @extend %tooltip;
+  -y-offset: $base_margin * 2; // distance from the dash edge
 }
--- a/data/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/gnome-shell-sass/widgets/_dialogs.scss
@@ -1,12 +1,13 @@
 /* Modal Dialogs */

 .headline {
-  @include fontsize($base_font_size + 1);
+  @extend %title_4;
 }

 .modal-dialog {
+  background-color: $bg_color;
  border-radius: $modal_radius;
-  @extend %bubble_panel;
+  box-shadow: inset 0 0 0 1px $outer_borders_color;

  .modal-dialog-content-box {
    margin: 32px 40px;
@@ -35,13 +36,9 @@

  .message-dialog-title {
    text-align: center;
-    font-size: 18pt;
-    font-weight: 800;
+    @extend %title_2;

-    &.lightweight {
-      font-size: 13pt;
-      font-weight: 800;
-    }
+    &.lightweight { @extend %title_4;}
  }
  .message-dialog-description { text-align: center; }
 }
@@ -52,7 +49,7 @@

  .dialog-list-title {
    text-align: center;
-    font-weight: bold;
+    @extend %heading;
  }

  .dialog-list-scrollview { max-height: 200px; }
@@ -65,7 +62,7 @@
      .dialog-list-item-title { font-weight: bold; }
      .dialog-list-item-description {
        color: darken($fg_color,5%);
-        @include fontsize($base_font_size - 1);
+        @extend %caption;
      }
    }
  }
@@ -79,7 +76,7 @@
  }
  .run-dialog-entry { width: 20em; }
  .run-dialog-description {
-    @include fontsize($base_font_size - 1);
+    @extend %caption;
    text-align: center;
    color: darken($fg_color, 20%);
  }
@@ -120,7 +117,7 @@
 .prompt-dialog-info-label,
 .prompt-dialog-null-label {
  text-align: center;
-  @include fontsize($base_font_size - 1);
+  @extend %caption;
 }

 .prompt-dialog-error-label {
@@ -145,8 +142,7 @@
 }

 .audio-selection-device {
-  border: 1px solid $bubble_borders_color;
-  border-radius: 12px;
+  border-radius: $base_border_radius*2;
  &:hover,&:focus { background-color: $hover_bg_color; }
  &:active { 
    background-color: $selected_bg_color;
@@ -171,3 +167,8 @@
  height: 300px;
  width: 300px;
 }
+
+/* Access portal dialog */
+.access-dialog {
+  text-align: center;
+}
--- a/data/gnome-shell-sass/widgets/_entries.scss
+++ b/data/gnome-shell-sass/widgets/_entries.scss
@@ -1,25 +1,19 @@
 /* Entries */

 StEntry {
-  border-radius: $base_border_radius;
-  padding: 8px;
-  border-width: 0;
-  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;
+  @extend %entry;
+
  StIcon.capslock-warning {
-    icon-size: 16px;
+    icon-size: $base_icon_size;
    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);
--- a/data/gnome-shell-sass/widgets/_ibus-popup.scss
+++ b/data/gnome-shell-sass/widgets/_ibus-popup.scss
@@ -5,31 +5,35 @@
 }

 .candidate-popup-content {
-  padding: 0.5em;
-  spacing: 0.3em;
+  padding: $base_padding;
+  spacing: $base_padding;
+  @extend .popup-menu-content;
 }

 .candidate-index {
-  padding: 0 0.5em 0 0;
-  color: darken($fg_color,10%);
+  padding: 0;
+  padding-right: $base_padding;
+  color: $insensitive_fg_color;
 }

 .candidate-box {
-  padding: 0.3em 0.5em 0.3em 0.5em;
+  padding: $base_padding $base_padding*2 $base_padding $base_padding*2;
  border-radius: $base_border_radius;
-  &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
+  &:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
+  &:hover { background-color: $hover_bg_color; color: $hover_fg_color; }
 }

 .candidate-page-button-box {
  height: 2em;
-  .vertical & { padding-top: 0.5em; }
-  .horizontal & { padding-left: 0.5em; }
+  .vertical & { padding-top: $base_padding*2; }
+  .horizontal & { padding-left: $base_padding*2; }
 }

 .candidate-page-button {
-  padding: 4px;
+  padding: $base_padding;
+
+  & StIcon { icon-size: $base_icon_size; }
 }

-.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; }
+.candidate-page-button-previous { border-radius: $base_border_radius 0px 0px $base_border_radius; border-right-width: 0;box-shadow: none;}
+.candidate-page-button-next { border-radius: 0px $base_border_radius $base_border_radius 0px;box-shadow: none;}
--- a/data/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/gnome-shell-sass/widgets/_keyboard.scss
@@ -1,15 +1,16 @@
 /* On-screen Keyboard */

 $key_size: 1.2em;
-$key_border_radius: $base_border_radius + 3px;
-$key_bg_color:  $bg_color;
+$key_border_radius: $base_border_radius + 4px; // 12px
+$key_bg_color:  darken($osd_fg_color, 70%);
 // $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%));
+$default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken($key_bg_color, 10%));


 // draw keys using button function
 #keyboard {
-  background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1);
+  // background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1);
+  background-color: $osd_bg_color;
  box-shadow: inset 0 1px 0 0 $osd_outer_borders_color;

  .page-indicator {
@@ -31,18 +32,21 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
 // 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);
+  font-weight: bold;
  min-height: $key_size;
  min-width: $key_size;
  border-width: 1px;
  border-style: solid;
  border-radius: $key_border_radius;
+  box-shadow: 0 1px 0 0 $shadow_color;
+
+  @include keyboard_key(normal, $key_bg_color, $osd_fg_color);
+
+  &:focus { @include keyboard_key(focus);}
+  &:hover { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);}
+  &:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); }
+  &:checked { @include keyboard_key(checked, $key_bg_color, $osd_fg_color); }

  &:grayed { //FIXMEy
    background-color: darken($bg_color, 3%);
@@ -52,42 +56,65 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten

  // 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);}
+    @include keyboard_key(normal, $default_key_bg_color, $osd_fg_color);
+    &:hover {@include keyboard_key(hover, $default_key_bg_color, $osd_fg_color);}
+    &:active { @include keyboard_key(active, $default_key_bg_color, $osd_fg_color);}
+    &:checked { @include keyboard_key(checked, $default_key_bg_color, $osd_fg_color);}
+    border-radius: $key_border_radius;
+
+    // keys that may be latched: ctrl/alt/shift
+    &:latched {
+      border-color: lighten($selected_bg_color, 5%);
+      background-color: $selected_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%));}
+    @include keyboard_key(normal, $selected_bg_color, $selected_fg_color);
+    &:hover { @include keyboard_key(hover, $selected_bg_color, $selected_fg_color);}
+    &:active {@include keyboard_key(active, $selected_bg_color, $selected_fg_color);}
+    &:checked {@include keyboard_key(checked, $selected_bg_color, $selected_fg_color);}
+    border-radius: $key_border_radius;
+    color: $osd_fg_color;
  }

-  &.shift-key-uppercase { color: $selected_bg_color }
+  &.shift-key-lowercase {}
+  
+  // pressed shift has different style
+  &.shift-key-uppercase { 
+    background-color: lighten($key_bg_color, 20%);
+    color: $osd_bg_color;
+    &:hover {
+      background-color: lighten($key_bg_color, 25%);
+      color: lighten($osd_bg_color, 5%);
+    }
+  }

-  StIcon { icon-size: 1.125em; }
+  // size of icons on keys
+  StIcon { icon-size: 24px; }
 }

 // long press on a key popup
 .keyboard-subkeys {
-  color: $osd_fg_color;
-  -arrow-border-radius: $modal_radius;
+  -arrow-border-radius: $base_border_radius*2;
  -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;
+  -boxpointer-gap: $base_padding;
+  padding: $base_padding;

  .keyboard-key {
-    @include button(normal, $c:$key_bg_color);
+    @include keyboard_key(normal, $key_bg_color, $osd_fg_color);

-    &:focus { @include button(focus);}
-    &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
-    &:active { @include button(active, $c: $key_bg_color); }
+    &:focus { @include keyboard_key(focus);}
+    &:hover { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);}
+    &:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); }
+    &:checked { @include keyboard_key(checked, $key_bg_color, $osd_fg_color); }

-    border-radius:$base_border_radius;
+    border-radius:$key_border_radius;
  }
 }

@@ -109,7 +136,24 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten

 // suggestions
 .word-suggestions {
-  @include fontsize($base_font_size + 3);
+  @include fontsize($base_font_size + 1);
  spacing: 12px;
-  min-height: 20pt;
+  min-height: 17pt;
+  padding: $base_padding*2;
+  color: $osd_fg_color;
+
+  // each suggestion
+  StButton {
+    margin: 0 3px;
+    min-width: 32px;
+    border-radius: $base_border_radius - 2px;
+    padding: 0px $base_padding*3;
+
+    @include keyboard_key(undecorated, $key_bg_color, $osd_fg_color);
+
+    &:focus { @include keyboard_key(focus);}
+    &:hover { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);}
+    &:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); }
+    &:checked { @include keyboard_key(checked, $key_bg_color, $osd_fg_color); }
+  }
 }
--- a/data/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/gnome-shell-sass/widgets/_login-dialog.scss
@@ -1,174 +0,0 @@
-/* Login Dialog */
-
-.login-dialog-banner-view {
-  padding-top: 24px;
-  max-width: 23em;
-}
-
-.login-dialog,
-.unlock-dialog {
-  //reset
-  border: none;
-  background-color: transparent;
-
-  $_gdm_bg: $system_bg_color;
-
-  StEntry {
-    @if $variant=='dark' {
-      $_gdm_entry_bg: darken($system_bg_color, 3%);
-      background-color: $_gdm_entry_bg;
-      color: $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: darken($system_bg_color, 3%);
-    border-color: darken($system_bg_color, 3%);
-    color: $osd_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($osd_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: darken($system_bg_color, 3%);
-    background-color: darken($system_bg_color, 3%);
-
-    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-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;
-  padding-left: 15px;
-
-  &:ltr { padding-left: 14px; text-align: left; }
-  &:rtl { padding-right: 14px; text-align: right; }
-}
-
-.user-widget.vertical .user-widget-label {
-  @include fontsize($base_font_size + 5);
-  text-align: center;
-  font-weight: normal;
-  padding-top: 16px;
-}
-
-.login-dialog-timed-login-indicator {
-    height: 2px;
-    background-color: darken($fg_color,40%);
-}
-
-.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;
-}
--- a/data/gnome-shell-sass/widgets/_login-lock.scss
+++ b/data/gnome-shell-sass/widgets/_login-lock.scss
@@ -0,0 +1,283 @@
+$_gdm_bg: $system_bg_color;
+$_gdm_fg: white;
+$_gdm_dialog_width: 23em;
+
+// common style for gdm and lockscreen
+.login-dialog,
+.unlock-dialog {
+
+  .caps-lock-warning-label,
+  .login-dialog-message-warning {
+    color: $_gdm_fg;
+  }
+}
+
+/* Login Dialog */
+.login-dialog {
+  background-color: $_gdm_bg;
+}
+
+// buttons
+.login-dialog-button {
+  @extend .button;
+
+  &.cancel-button,
+  &.switch-user-button,
+  &.login-dialog-session-list-button {
+    @extend .icon-button;
+  }
+
+  &.cancel-button {
+    padding: $base_padding*1.5;
+  }
+}
+
+.login-dialog-button-box {
+  width: $_gdm_dialog_width;
+  spacing: $base_padding*2;
+}
+
+.login-dialog-logo-bin {
+  margin:3em 0;
+}
+.login-dialog-banner { color: darken($_gdm_fg,10%); }
+.login-dialog-banner-view { max-width: $_gdm_dialog_width; }
+.login-dialog-message { text-align: center; }
+.login-dialog-user-selection-box { padding: 100px 0px; }
+
+.login-dialog-not-listed-label {
+  @include fontsize($base_font_size);
+  font-weight: bold;
+  color: darken($_gdm_fg,30%);
+  padding: $base_padding*2;
+
+  .login-dialog-not-listed-button:focus &,
+  .login-dialog-not-listed-button:hover & {
+    color: $_gdm_fg;
+  }
+  .login-dialog-not-listed-button:focus & {
+    text-decoration: underline;
+  }
+}
+
+.login-dialog-auth-list-view { -st-vfade-offset: 1em; }
+.login-dialog-auth-list {
+  spacing: 6px;
+  margin-left: 2em;
+}
+.login-dialog-auth-list-title {
+  margin-left: 2em;
+}
+
+.login-dialog-auth-list-item {
+  border-radius: $base_border_radius*2;
+  padding: 4px;
+  color: darken($_gdm_fg,30%);
+
+  &:focus, &:selected {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+}
+
+.login-dialog-auth-list-label {
+  @include fontsize($base_font_size + 2);
+  font-weight: bold;
+  padding-left: 15px;
+
+  &:ltr { padding-left: 14px; text-align: left; }
+  &:rtl { padding-right: 14px; text-align: right; }
+}
+
+.login-dialog-user-list-view { -st-vfade-offset: 1em; }
+
+.login-dialog-user-list {
+  spacing: 12px;
+  width: $_gdm_dialog_width;
+
+  .login-dialog-user-list-item {
+    border-radius: $base_border_radius + 4px;
+    padding: $base_padding;
+    background-color: transparentize($_gdm_fg, .95);
+    color: $_gdm_fg;
+
+    @if $is_highcontrast {
+      box-shadow:inset 0 0 0 1px $hc_inset_color;;
+    }
+    .user-widget .user-icon {
+      border: 4px solid transparent;
+    }
+
+    .login-dialog-timed-login-indicator {
+      height: 2px;
+      margin-top: 6px;
+      background-color: darken($_gdm_fg, 30%);
+    }
+
+    &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
+  }
+
+  &:expanded .login-dialog-user-list-item {
+    transition-duration: 300ms;
+    transition-timing-function: ease;
+
+    &:hover {
+      background-color: transparentize($_gdm_fg, .9);
+      color: $_gdm_fg;
+    }
+
+    &:selected {
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+      &:hover { background-color: lighten($selected_bg_color,5%); }
+    }
+
+    &:logged-in {
+      .user-widget .user-icon {
+        border-color: $selected_bg_color;
+      }
+    }
+  }
+}
+
+.login-dialog-prompt-layout {
+  spacing: $base_padding*2;
+  width: 26em;
+}
+
+.login-dialog-prompt-entry {}
+
+
+/* Screen Shield */
+// a.k.a. the lockscreen
+
+.unlock-dialog {
+  background-color: transparent;
+}
+
+.screen-shield-background { // just the shadow, really
+  background: black;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.6);
+}
+
+#lockDialogGroup {
+  background-color: $_gdm_bg;
+}
+
+// Clock
+.unlock-dialog-clock {
+  color: $_gdm_fg;
+  spacing: 2em;
+
+  .unlock-dialog-clock-time {
+    @extend %numeric;
+    @include fontsize(72);
+    font-weight: 200;
+  }
+
+  .unlock-dialog-clock-date {
+    @extend %title_1;
+    font-weight: 400;
+  }
+
+  .unlock-dialog-clock-hint {
+    margin-top: 2em;
+    padding: $base_padding $base_padding*3;
+    border-radius: $base_border_radius*2;
+    font-weight: bold;
+  }
+}
+
+// Notifications
+#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); }
+  }
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px;
+  spacing: 6px;
+  width: $_gdm_dialog_width;
+  background-color: transparent;
+
+  .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .notification,
+  .unlock-dialog-notification-source {
+    padding: 12px 16px;
+    border: none;
+    background-color: transparentize($_gdm_fg,0.9);
+    color: $_gdm_fg;
+    border-radius: $modal_radius;
+
+    &.critical { background-color: transparentize($_gdm_fg,0.8) }
+  }
+}
+
+.unlock-dialog-notification-label {
+  padding-left: 12px;
+  padding-right: 0;
+  &:rtl { padding-right: 12px; padding-left: 0; }
+}
+
+.unlock-dialog-notification-count-text {
+  font-weight: bold;
+  padding: 0 12px;
+  color: $_gdm_fg;
+  background-color: transparentize($_gdm_fg, 0.9);
+  border-radius: 99px;
+}
+
+
+// User Widget
+.user-widget {
+
+  .user-widget-label {
+    color: $_gdm_fg;
+  }
+
+  // layout of the user list
+  &.horizontal {
+    spacing: $base_padding*3;
+    .user-widget-label {
+      @extend %title_3;
+    }
+
+    .user-icon {
+      & StIcon {
+        padding: 12px;
+        icon-size: $base_icon_size*2;
+        width: $base_icon_size*3;
+        height:  $base_icon_size*3;
+        background-color: transparentize($_gdm_fg, 0.9);
+      }
+    }
+  }
+
+  // layout of the login prompt
+  &.vertical {
+    spacing: $base_padding*4;
+
+    .user-widget-label {
+      @extend %title_1;
+      text-align: center;
+      margin-bottom: .75em;
+    }
+
+    .user-icon {
+      icon-size: $base_icon_size*10;
+
+      & StIcon {
+        padding: 32px;
+        icon-size: $base_icon_size*4;
+        background-color: transparentize($_gdm_fg, 0.9);
+      }
+    }
+  }
+}
--- a/data/gnome-shell-sass/widgets/_looking-glass.scss
+++ b/data/gnome-shell-sass/widgets/_looking-glass.scss
@@ -1,109 +1,130 @@
 /* Looking Glass */

-$text_fg_color: #ccc;
-
 // 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;
+  background-color: transparentize($bg_color,0.05);
+  border-radius: 0 0 $modal_radius $modal_radius;
+  border: 1px solid $outer_borders_color;
+  border-top-width: 0;
+  color: $fg_color;
+  padding: $base_padding;
+  spacing: $base_padding;
+  box-shadow: 0 2px 4px 0 $shadow_color;
+
+  @if $is_highcontrast {
+    border: 2px solid $hc_inset_color;
+    background-color: $bg_color;
+    border-top-width: 0;
+    box-shadow:none;
+  }

  & > #Toolbar {
    border: none;
-    border-radius: $base_border_radius;
-    background-color: $osd_bg_color;
+    padding: $base_padding;
+    border-radius: 0;
+    background-color: transparent;
+    spacing: $base_padding;
+
+    .lg-toolbar-button {
+      padding: $base_padding $base_padding*2;
+      @extend %button;
+
+      & > StIcon { icon-size: $base_icon_size; }
+    }
  }

-  .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;
-    }
+  .labels { 
+    spacing: $base_padding;
  }
-  StBoxLayout#EvalBox { padding: 4px; spacing: $base_spacing; }
-  StBoxLayout#ResultsArea { spacing: $base_spacing; }
+
+  .notebook-tab {
+    -natural-hpadding: $base_padding*2;
+    -minimum-hpadding: $base_padding*2;
+    @extend %button;
+    padding: $base_padding $base_padding*2;
+  }
+
+  StBoxLayout#EvalBox { padding: 4px; spacing: $base_padding; padding: $base_padding; }
+  StBoxLayout#ResultsArea { spacing: $base_padding; padding: $base_padding; }
 }

 .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;
+    @extend %entry;
  }
+
  .shell-link {
    color: $link_color;
    &:hover { color: lighten($link_color, 10%); }
    &:active { color: darken($link_color, 10%); }
   }
+
  .actor-link {
-    color: $text_fg_color;
-    &:hover { color: lighten($text_fg_color, 20%); }
-    &:active { color: darken($text_fg_color, 20%); }
+    color: $insensitive_fg_color;
+    &:hover { color: lighten($insensitive_fg_color, 20%); }
+    &:active { color: darken($insensitive_fg_color, 20%); }
+
+    & StIcon { icon-size: 12px; }
   }
 }

 .lg-completions-text {
-    font-size: .9em;
-    font-style: italic;
+  @extend %caption;
+  font-style: italic;
 }

 .lg-obj-inspector-title {
-    spacing: $base_spacing;
+  spacing: $base_padding;
 }

 .lg-obj-inspector-button {
-    border: 1px solid $osd_borders_color;
-    padding: 4px;
-    border-radius: $base_border_radius;
-    &:hover { border: 1px solid #ffffff; }
+  border: 1px solid $borders_color;
+  padding: 4px;
+  border-radius: $base_border_radius;
+  &:hover { border: 1px solid $fg_color; }
 }

 // Extensions
-#lookingGlassExtensions { padding: 4px; }
+#lookingGlassExtensions { padding: $base_padding; }

 .lg-extensions-list {
-    padding: 4px;
-    spacing: 6px;
+  padding: $base_padding;
+  spacing: $base_padding;
 }

 .lg-extension {
-    border: 1px solid lighten($osd_borders_color, 5%);
-    background-color: lighten($osd_bg_color, 5%);
-    border-radius: $base_border_radius;
-    padding: 4px;
+  padding: $base_padding*2;
+  @include card;
 }

 .lg-extension-name {
-    font-weight: bold;
+  @extend %heading;
 }

 .lg-extension-meta {
-    spacing: 6px;
+  spacing: $base_padding;
 }

 // Inspector
 #LookingGlassPropertyInspector {
-  background: $osd_bg_color;
-  border: 1px solid $osd_borders_color;
+  background: $bg_color;
+  border: 1px solid $borders_color;
  border-radius: $base_border_radius;
-  padding: 6px;
-}
+  padding: $base_padding;
+}
+
+.lg-debug-flag-button {
+  StLabel { padding: $base_padding, 2 * $base_padding; }
+
+  color: $fg_color;
+  &:hover { color: lighten($fg_color, 20%); }
+  &:active { color: darken($fg_color, 20%); }
+}
+
+.lg-debug-flags-header {
+  padding-top: 2 * $base_padding;
+  padding: $base_padding;
+  @extend %title_2;
+}
--- a/data/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/gnome-shell-sass/widgets/_message-list.scss
@@ -3,28 +3,47 @@

 // main list
 .message-list {
-  width: 31.5em;
-  padding: 0 $base_padding * 2;
+  width: 29em;
+  border: solid $borders_color;

-  .message-list-placeholder { spacing: 12px; }
+  // padding and margins to account for scrollbar
+  &:ltr {margin-left: 0; margin-right: $base_margin; padding-right: $base_padding; border-right-width: 1px; }
+  &:rtl {margin-right: 0; margin-left: $base_margin; padding-left: $base_padding; border-left-width: 1px; }
+
+  .message-list-placeholder { 
+    @extend %title_2;
+    color: transparentize($insensitive_fg_color, .5);
+
+    // icon size and color
+    > StIcon {
+      icon-size: $base_icon_size*3; // 48px
+      margin-bottom: $base_margin*3;
+      -st-icon-style: symbolic;
+    }
+  }
 }

 .message-list-sections {
-  spacing: $base_spacing;
-  margin: 0 $base_margin * 4; // to account for scrollbar
+  spacing: $base_padding;
+  margin: 0; 
+  padding-bottom: $base_padding;
+
+  // to account for scrollbar
+  &:ltr {margin-right: $base_margin * 3; }
+  &:rtl {margin-left: $base_margin * 3;}
 }

 .message-list-section,
 .message-list-section-list {
-  spacing: $base_spacing;
+  spacing: $base_padding;
 }

 // 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;
+  padding: $base_padding;
+  spacing: $base_padding;
+  @extend %heading;

  .dnd-button {
    // We need this because the focus outline isn't inset like for the buttons
@@ -32,7 +51,7 @@
    // its color when focusing.
    border-width: 2px;
    border-color: transparent;
-    border-radius: 99px;
+    border-radius: 32px;
    border-style: solid;

    &:focus {
@@ -43,19 +62,18 @@

 // message bubbles
 .message {
-  @include notification_bubble;
+  @include card;

  // icon container
  .message-icon-bin {
-    padding: ($base_padding * 3) 0 ($base_padding * 3) ($base_padding * 2);
+    padding: ($base_padding * 3);

-    &:rtl {
-      padding: ($base_padding * 3) ($base_padding * 2) ($base_padding * 3) 0;
-    }
+    &:ltr {padding-right:$base_padding;}
+    &:rtl {padding-left:$base_padding;}

    // icon size and color
    > StIcon {
-      icon-size: $base_icon_size*2; // 32px
+      icon-size: $large_icon_size; // 32px
      -st-icon-style: symbolic;
    }

@@ -68,13 +86,16 @@

  // content
  .message-content {
-    padding: $base_padding + $base_margin * 2;
    spacing: 4px;
+    padding: ($base_padding*1.5);
+    margin-bottom: $base_margin*2;
  }

  // title
  .message-title {
    font-weight: bold;
+    /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
+    padding-top: 0.57em;
  }

  // secondary container in title box
@@ -95,15 +116,19 @@

  // 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%)); }
+    color: $fg_color;
+    background-color: transparentize($fg_color, 0.9);
+    border-radius: 99px;
+    padding: $base_padding - 1px;
+    margin: 1px;
+    &:hover {background-color: transparentize($fg_color, 0.8);}
+    &:active {background-color: transparentize($fg_color, 0.9);}
+
+    & StIcon { icon-size: $base_icon_size; }
  }

  // body
-  .message-body {
-    color: darken($fg_color, 10%);
-  }
+  .message-body {color: darken($fg_color, 10%);}
 }

 // URLs in messages
@@ -113,30 +138,44 @@

 /* Media Controls */
 .message-media-control {
-  padding: $base_padding * 2 1.64em; // $base_padding * 4 = 24px
-  color: darken($fg_color, 15%);
+  padding: 0 $base_padding*3;
+  margin: $base_padding*2 0;
+  border-radius: $base_border_radius;
+  color: $fg_color;

-  // uses $hover_bg_color since the media controls are in a notification_bubble
+  @if $is_highcontrast {
+    border: 1px solid $hc_inset_color;
+    margin: $base_padding*2 2px;
+  }
+
+  // colors are lightened since the media controls are in a card
  &:hover {
    background-color: lighten($hover_bg_color, 5%);
    color: $fg_color;
  }

  &:active { 
-    background-color: darken($hover_bg_color, 2%);
+    background-color: lighten($active_bg_color, 5%);
    color: $fg_color;
  }

-  &:insensitive { color: darken($fg_color,40%); }
+  &:insensitive {
+    color: lighten($insensitive_fg_color, 5%);
+     @if $is_highcontrast {
+      border-color: transparent;
+    }
+  }
  
-  // 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; }
+  // fix margin for last button
+  &:last-child:ltr { margin-right: $base_margin*3; }
+  &:last-child:rtl { margin-left: $base_margin*3; }
+
+  & StIcon { icon-size: $base_icon_size; }
 }

 // album-art
 .media-message-cover-icon {
-  icon-size: $base_icon_size*2 !important; // 48px
+  icon-size: $base_icon_size*3 !important; // 48px
  border-radius: $base_border_radius;

  // when there is no artwork
@@ -145,6 +184,7 @@
    background-color: $bg_color;
    border: 1px solid transparent;
    border-radius: $base_border_radius;
-    icon-size: $base_icon_size * 2 !important;
+    icon-size: $large_icon_size !important; // 32px
+    padding: ($base_padding*2 + 2); // 16px
  }
 }
--- a/data/gnome-shell-sass/widgets/_misc.scss
+++ b/data/gnome-shell-sass/widgets/_misc.scss
@@ -10,9 +10,6 @@
  color: $osd_fg_color;
  border-radius: 99px;
  icon-size: $base_icon_size * 4; // 64px
-  &:hover {
-    color: lighten($osd_fg_color,30%);
-  }

  & StIcon {
    background-color: transparentize($osd_fg_color,0.95);
@@ -22,25 +19,16 @@
  }

  &.user-avatar {
-    border: 2px $osd_fg_color;
-  }
-}
-
-.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;
+    box-shadow:inset 0 0 0 1px transparentize($osd_fg_color, 0.9);
+    @if $is_highcontrast {
+      box-shadow:inset 0 0 0 1px $hc_inset_color;
+    }
  }
 }

 .lightbox { background-color: black; }
 .flashspot { background-color: white; }

-
 // Hidden
 .hidden { color: rgba(0,0,0,0);}

@@ -48,7 +36,7 @@
 .caps-lock-warning-label {
  text-align: center;
  padding-bottom: 8px;
-  @include fontsize($base_font_size - 1);
+  @extend %caption;
  color: $warning_color;
 }

@@ -57,3 +45,9 @@
 .workspace-animation {
  background-color: $system_bg_color;
 }
+
+/* Tiled window previews */
+.tile-preview {
+  background-color: transparentize($selected_bg_color,0.5);
+  border: 1px solid $selected_bg_color;
+}
--- a/data/gnome-shell-sass/widgets/_network-dialog.scss
+++ b/data/gnome-shell-sass/widgets/_network-dialog.scss
@@ -1,56 +0,0 @@
-/* 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; }
--- a/data/gnome-shell-sass/widgets/_notifications.scss
+++ b/data/gnome-shell-sass/widgets/_notifications.scss
@@ -2,11 +2,15 @@

 $notification_banner_height: 64px;
 $notification_banner_width: 34em;
+$notification_banner_radius: $base_border_radius*1.5;

 // Banner notifications
 .notification-banner {
  min-height: $notification_banner_height;
  width: $notification_banner_width;
+  box-shadow: 0 2px 4px 2px $shadow_color;
+  border-radius: $notification_banner_radius;
+  margin: $base_margin;

  .notification-actions {
    spacing: 0;
--- a/data/gnome-shell-sass/widgets/_osd.scss
+++ b/data/gnome-shell-sass/widgets/_osd.scss
@@ -1,32 +1,51 @@
 /* OSD */

-$osd_levelbar_height:8px;
+$osd_levelbar_height:6px;

 .osd-window {
  @extend %osd_panel;
+  @extend %heading;
  text-align: center;
  font-weight: bold;
-  spacing: $base_spacing * 2; // 12px
-  margin: $base_margin * 8; // 32px
-  min-width: 64px;
-  min-height: 64px;
+  spacing: $base_padding * 2; // 12px
+  padding: $base_padding * 2 $base_padding * 3;
+  & > * { spacing: 8px; }
+  margin-bottom: 4em;

-  StIcon {
-    icon-size:$base_icon_size * 6;
+  StIcon { icon-size:$large_icon_size;}
+
+  StLabel {
+    &:ltr { margin-right: 6px; }
+    &:rtl { margin-left: 6px; }
  }

-  .osd-monitor-label { font-size: 3em; }
-  
  .level {
+    margin-bottom: 4px;
+    &:first-child { margin-bottom: 0px; }
+
    height: $osd_levelbar_height;
+    min-width:$base_icon_size * 10;
    -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;
+    &:ltr { margin-right: 6px; }
+    &:rtl { margin-left: 6px; }
  }
 }

+// Monitor number label
+.osd-monitor-label { 
+  @extend %osd_panel;
+  border-radius: $modal_radius;
+  font-size: 3em;
+  font-weight: bold;
+  margin: $base_margin * 3;
+  text-align: center;
+  min-width: 1.3em;
+}
+
 /* Pad OSD */
 .pad-osd-window {
  padding: 32px;
@@ -42,4 +61,4 @@ $osd_levelbar_height:8px;

 .resize-popup {
  @extend %osd_panel;
-}
+}
--- a/data/gnome-shell-sass/widgets/_overview.scss
+++ b/data/gnome-shell-sass/widgets/_overview.scss
@@ -1,7 +1,7 @@
 /* OVERVIEW */

 .controls-manager, .secondary-monitor-workspaces {
-  spacing: $base_spacing * 2;
+  spacing: $base_padding * 2;
 }

 #overviewGroup {
--- a/data/gnome-shell-sass/widgets/_panel.scss
+++ b/data/gnome-shell-sass/widgets/_panel.scss
@@ -1,9 +1,8 @@
 /* Top Bar */
 // a.k.a. the panel

-$panel_corner_radius: $base_border_radius+1;
 $panel_bg_color: #000;
-$panel_fg_color: #ddd;
+$panel_fg_color: if($variant == 'light', lighten($bg_color, 10%), darken($fg_color, 5%));
 $panel_height: 2.2em;
 $panel_transition_duration: 250ms; // same as the overview transition duration

@@ -11,7 +10,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
  background-color: $panel_bg_color;
  font-weight: bold;
  height: $panel_height;
-  font-feature-settings: "tnum";
+  @extend %numeric;
  transition-duration: $panel_transition_duration;

  // transparent panel on lock & login screens
@@ -19,20 +18,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
  &.login-screen,
  &:overview {
    background-color: transparent;
-
-    .panel-corner {
-      -panel-corner-opacity: 0;
-    }
-  }
-
-  // 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;
-    -panel-corner-opacity: 1;
-    transition-duration: $panel_transition_duration;
  }

  // panel menus
@@ -53,8 +38,28 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
      }
    }

-    &:hover, &:active, &:overview, &:focus, &:checked {
-      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.20);
+    &.screen-recording-indicator {
+      box-shadow: inset 0 0 0 100px $screenshot_ui_button_red;
+    }
+
+    &.screen-sharing-indicator {
+      box-shadow: inset 0 0 0 100px $warning_color;
+      StBoxLayout { margin: 0 $base_padding; }
+    }
+
+    &.screen-recording-indicator,
+    &.screen-sharing-indicator {
+      StBoxLayout {
+        spacing: $base_padding;
+      }
+
+      StIcon {
+        icon-size: $base_icon_size;
+      }
+    }
+
+    &:active, &:overview, &:focus, &:checked {
+      box-shadow: inset 0 0 0 100px transparentize($panel_fg_color, 0.8);

      // The clock display needs to have the background on .clock because
      // we want to exclude the do-not-disturb indicator from the background
@@ -62,9 +67,50 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
        box-shadow: none;

        .clock {
-          box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.20);
+          box-shadow: inset 0 0 0 100px transparentize($panel_fg_color, 0.8);
        }
      }
+
+      &.screen-recording-indicator {
+        box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.15);
+      }
+      &.screen-sharing-indicator {
+        box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.15);
+      }
+    }
+
+    &:hover {
+      box-shadow: inset 0 0 0 100px transparentize($panel_fg_color, 0.85);
+      &.clock-display {
+        box-shadow: none;
+        .clock {
+          box-shadow: inset 0 0 0 100px transparentize($panel_fg_color, 0.85);
+        }
+      }
+
+      &.screen-recording-indicator {
+        box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.1);
+      }
+      &.screen-sharing-indicator {
+        box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.1);
+      }
+    }
+
+    &:active:hover, &:overview:hover, &:focus:hover, &:checked:hover {
+      box-shadow: inset 0 0 0 100px transparentize($panel_fg_color, 0.75);
+      &.clock-display {
+        box-shadow: none;
+        .clock {
+          box-shadow: inset 0 0 0 100px transparentize($panel_fg_color, 0.75);
+        }
+      }
+
+      &.screen-recording-indicator {
+        box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.2);
+      }
+      &.screen-sharing-indicator {
+        box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.2);
+      }
    }

    // status area icons
@@ -94,16 +140,57 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
  &.login-screen,
  &:overview {
    .panel-button {
-      &:hover, &:active, &:overview, &:focus, &:checked {
-        box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15);
+      &:active, &:overview, &:focus, &:checked {
+        box-shadow: inset 0 0 0 100px rgba(255,255,255, 0.15);

        &.clock-display {
          box-shadow: none;

          .clock {
-            box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15);
+            box-shadow: inset 0 0 0 100px rgba(255,255,255, 0.15);
          }
        }
+
+        &.screen-recording-indicator {
+          box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.15);
+        }
+        &.screen-sharing-indicator {
+          box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.15);
+        }
+      }
+
+      &:hover {
+        box-shadow: inset 0 0 0 100px rgba(255,255,255, 0.10);
+        &.clock-display {
+          box-shadow: none;
+          .clock {
+            box-shadow: inset 0 0 0 100px rgba(255,255,255, 0.10);
+          }
+        }
+
+        &.screen-recording-indicator {
+          box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.1);
+        }
+        &.screen-sharing-indicator {
+          box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.1);
+        }
+      }
+
+      &:active:hover, &:overview:hover, &:focus:hover, &:checked:hover {
+        box-shadow: inset 0 0 0 100px rgba(255,255,255, 0.2);
+        &.clock-display {
+          box-shadow: none;
+          .clock {
+            box-shadow: inset 0 0 0 100px rgba(255,255,255, 0.2);
+          }
+        }
+
+        &.screen-recording-indicator {
+          box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.2);
+        }
+        &.screen-sharing-indicator {
+          box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.2);
+        }
      }
    }
  }
@@ -125,11 +212,23 @@ $panel_transition_duration: 250ms; // same as the overview transition duration

 // App Menu
 #appMenu {
-  spacing: $base_spacing;
+  spacing: $base_padding;
  .label-shadow { color: transparent; }
 }

 #appMenu .panel-status-menu-box {
  padding: 0 $base_padding;
-  spacing: $base_spacing;
+  spacing: $base_padding;
+}
+
+
+// Clock
+
+.clock-display-box {
+  spacing: 2px;
+
+  .clock {
+    padding-left: $base_padding * 2;
+    padding-right: $base_padding * 2;
+  }
 }
--- a/data/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/gnome-shell-sass/widgets/_popovers.scss
@@ -1,16 +1,14 @@
 /* Popovers/Menus */

-$popover_arrow_height: 12px;
+$menu_bg_color: $bg_color;
+$menuitem_bg_color: lighten($menu_bg_color, 4%);
+$menuitem_border_radius: $base_border_radius*1.5;

-//.the popover itself
+$submenu_bg_color: lighten($menu_bg_color, 7%);
+
+// 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
+  -arrow-rise: $base_margin+2px; // distance from the panel & screen edge
 }

 // container of the popover menu
@@ -18,114 +16,147 @@ $popover_arrow_height: 12px;
  min-width: 15em;
  color: $fg_color;

-  //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is
+  //.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;
+    margin-bottom: 1.75em; // so it doesn't touch the bottom of the screen
  }
 }

+// popover content
 .popup-menu-content {
-  padding: $base_padding * 2 + $base_margin 0;
+  padding: $base_padding;
+  background-color: $bg_color;
+  border-radius: $modal_radius*1.25;
+  border: 1px solid $outer_borders_color;
+  box-shadow: 0 2px 4px 0 $shadow_color;
 }

 // menu items
 .popup-menu-item {
-  spacing: $base_padding;
-  padding: $base_padding;
+  @include menuitem($bg:$menu_bg_color);

-  &:ltr { padding-right:1.75em; padding-left: 0; }
-  &:rtl { padding-right: 0; padding-left:1.75em; }
+  border-radius: $menuitem_border_radius;

  &:checked {
-    background-color: lighten($bg_color, 2%);
-    box-shadow: none;
+    border-radius: $menuitem_border_radius $menuitem_border_radius 0 0 !important;
+
+    @if $is_highcontrast {
+      border: 1px solid $hc_inset_color;
+      border-bottom-width:0;
+    }
  }

-  &.selected {
-    background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
-    color: $fg_color;
+  // add margin to switches in menu items
+  .toggle-switch {
+    &:ltr { margin-left: $base_margin;}
+    &:rtl { margin-right: $base_margin;}
  }
-
-  &:active { 
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-
-  &:insensitive { color: transparentize($fg_color,0.5);}
 }

-// all icons and other graphical elements
+
+// all other graphical elements (sliders)
 .popup-inactive-menu-item {
  color: $fg_color;
-
-  &:insensitive { color: transparentize($fg_color,0.5); }
+  &:insensitive { color: $insensitive_fg_color; }
 }

 // symbolic icons in popover
 .popup-menu-arrow,
-.popup-menu-icon { icon-size: $base_icon_size; }
+.popup-menu-icon {
+  icon-size: 16px !important; // for some reason the variable doesn't work here
+}

 // 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);
+  border-radius: 0 0 $menuitem_border_radius+1px $menuitem_border_radius+1px;
+  margin-bottom: $base_padding;
+
+  @if $is_highcontrast {
+    border: 1px solid $hc_inset_color;
+  }
+
+  .popup-menu-ornament {
+    min-width: $base_icon_size !important;
+  }
+
+  // submenu specific styles
+  .popup-menu-item {
+    border-radius: 0;
+    @include menuitem($bg:$submenu_bg_color, $flat:false);
+    border-top-width:0;
+
+    &:last-child {
+      border-radius: 0 0 $menuitem_border_radius $menuitem_border_radius;
+      border-bottom-width:0;
+    }
+  }
+
+  .popup-menu-section {
+    .popup-menu-item:last-child {
+      &:hover,&:focus { border-radius: 0;}
+    }
+    &:last-child .popup-menu-item:last-child {
+      border-radius: 0 0 $menuitem_border_radius $menuitem_border_radius;
+    }
+  }
 }

 // container for radio and check boxes
 .popup-menu-ornament {
+  @extend %heading;
  width: 1.2em;
+  text-align: center !important;

-  &:ltr { text-align: right };
-  &:rtl { text-align: left };
+  &:ltr { text-align: right;}
+  &:rtl { text-align: left;}
 }

 // separator
 .popup-separator-menu-item {
-  padding: 0;
+  border:none !important;

  .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%);
-      }
+    background-color: $borders_color;
+  }
+
+  .popup-menu-ornament {
+    width: 0 !important;
+  }
+
+  // separators in submenus
+  .popup-sub-menu & {
+    background-color: transparent;
+
+    // account for ornament
+    &:ltr { margin-right: 2.5em;}
+    &:rtl { margin-left: 2.5em;}
+
+    .popup-separator-menu-item-separator {
+      background-color: $borders_color;
    }
  }
 }

 // desktop background menu
 .background-menu {
-  -boxpointer-gap: $base_margin;
+  -boxpointer-gap: 0px;
  -arrow-rise: 0px; // hide the beak on the menu
 }

-// system status menu
-.aggregate-menu {
-  min-width: 21em;
+// right-click (and panel) app menu
+.app-menu {
+  max-width: 27.25em;

-  // lock screen, shutdown, etc. buttons
-  .popup-menu-icon { 
-    padding:0;
-    margin: 0 $base_margin;
-    -st-icon-style: symbolic;
-  }
+  // this is unneeded at the top-level in this menu, hide it
+  .popup-menu-ornament { width: 0 !important; }

-  .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;
+  .popup-inactive-menu-item:first-child {
+    // "Open Windows" label
+    > StLabel {
+      @extend %caption_heading;
+      &:ltr {margin-right: $base_margin*2;}
+      &:rtl {margin-left: $base_margin*2;}
    }
  }
 }
--- a/data/gnome-shell-sass/widgets/_quick-settings.scss
+++ b/data/gnome-shell-sass/widgets/_quick-settings.scss
@@ -0,0 +1,175 @@
+.quick-settings {
+  padding: $base_padding*3;
+  border-radius: $modal_radius*2.25;
+
+  .icon-button, .button {
+    padding: $base_padding*1.75;
+  }
+}
+
+.quick-settings-grid {
+  spacing-rows: $base_padding*2;
+  spacing-columns: $base_padding*2;
+}
+
+.quick-toggle, .quick-menu-toggle {
+  border-radius: 99px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 48px;
+  border:none;
+}
+
+.quick-toggle {
+  &:checked { @include button(default, $c:$selected_bg_color); }
+
+  & > StBoxLayout { spacing: $base_padding*1.5; }
+
+  /* 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: 99px 0 0 99px; }
+    &:rtl { border-radius: 0 99px 99px 0; }
+
+    &:ltr:last-child { border-radius: 99px; }
+    &:rtl:last-child { border-radius: 99px; }
+  }
+
+  & .quick-toggle-arrow {
+    padding: $base_padding $base_padding*1.75;
+    border-width: 0;
+
+    &:checked { @include button(default, $c:$selected_bg_color); }
+
+    &:ltr {
+      border-radius: 0 99px 99px 0;
+      border-left-width: 1px;
+    }
+    &:rtl {
+      border-radius: 99px 0 0 99px;
+      border-right-width: 1px;
+    }
+  }
+}
+
+.quick-slider {
+  & > StBoxLayout { spacing: $base_padding; }
+
+  .icon-button { padding: $base_padding; }
+
+  .slider-bin {
+    &:focus {@include button(focus);}
+    min-height: 16px; // slider size
+    padding: $base_padding;
+    border-radius: 99px;
+  }
+}
+
+.quick-toggle-menu {
+  @include card;
+  border-radius: $base_border_radius*3;
+  padding: $base_padding*2;
+  margin: $base_padding*2 $base_padding*3 0;
+
+  .popup-menu-item > 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: 999px;
+      padding: 1.5 * $base_padding;
+      background-color: transparentize($fg_color, 0.8);
+
+      &.active { background-color: $selected_bg_color;}
+    }
+
+    & .title {
+      @extend %title_3;
+    }
+
+    & .subtitle {
+      @extend %caption_heading;
+    }
+  }
+}
+
+.quick-toggle-menu-container {
+}
+
+.quick-settings-system-item {
+  & > StBoxLayout { spacing: 2 * $base_padding; }
+
+  & .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 {
+  @extend %title_4;
+  text-align: center;
+
+  padding: 2em 4em;
+}
+
+.device-subtitle { color: transparentize($fg_color, 0.5); }
+
+// 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: $large_icon_size !important;
+    -st-icon-style: regular !important;
+  }
+  & .close-button {
+    @extend .icon-button;
+    padding: $base_padding;
+  }
+
+  &.popup-inactive-menu-item { color: $fg_color; }
+}
--- a/data/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/data/gnome-shell-sass/widgets/_screen-shield.scss
@@ -1,78 +0,0 @@
-/* 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: $system_bg_color;
-}
-
-#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); }
-  }
-}
--- a/data/gnome-shell-sass/widgets/_screenshot.scss
+++ b/data/gnome-shell-sass/widgets/_screenshot.scss
@@ -0,0 +1,204 @@
+// Screenshot UI
+.icon-label-button-container {
+  spacing: $base_padding;
+  @extend %caption;
+
+  StIcon { icon-size: 32px;}
+}
+
+$screenshot_ui_panel_padding: $base_padding*3;
+$screenshot_ui_shot_cast_margin: 21px;
+$screenshot_ui_panel_border_radius: $modal_radius + $screenshot_ui_shot_cast_margin;
+$screenshot_ui_shot_cast_spacing: 3px;
+
+$screenshot_ui_button_red: $error_color;
+
+.screenshot-ui-panel {
+  @extend %osd_panel;
+  border-radius: $screenshot_ui_panel_border_radius;
+  padding: $screenshot_ui_panel_padding;
+  // Reduce the bottom padding a little to accommodate the large capture button.
+  padding-bottom: $screenshot_ui_panel_padding - 6px;
+  margin-bottom: 4em;
+  spacing: $base_padding * 2;
+}
+
+.screenshot-ui-close-button {
+  @extend .window-close; // copy window close button
+  padding: $base_padding !important; // but with more padding
+  margin-top: 12px;
+  box-shadow: 0 2px 4px 0 $shadow_color;
+  &.left { margin-left: 12px;}
+  &.right { margin-right: 12px;}
+}
+
+.screenshot-ui-type-button {
+  @extend %osd_button;
+  min-width: 48px;
+  padding: $base_padding * 2 $base_padding * 3 !important;
+  border-radius: $screenshot_ui_panel_border_radius - $screenshot_ui_panel_padding;
+}
+
+.screenshot-ui-capture-button {
+  width: 36px;
+  height: 36px;
+  border-radius: 99px;
+  border: 4px $osd_fg_color;
+  padding: 4px;
+
+  .screenshot-ui-capture-button-circle {
+    background-color: $osd_fg_color;
+    transition-duration: 200ms;
+    &:hover, &:focus { background-color: $hover_bg_color;}
+    border-radius: 99px;
+  }
+
+  &:hover, &:focus {
+    .screenshot-ui-capture-button-circle {
+      background-color: darken($osd_fg_color, 15%);
+    }
+  }
+
+  &:active {
+    .screenshot-ui-capture-button-circle {
+      background-color: darken($osd_fg_color, 50%);
+    }
+  }
+
+  &:cast {
+    .screenshot-ui-capture-button-circle {
+      background-color: $screenshot_ui_button_red;
+    }
+    &:hover, &:focus {
+      .screenshot-ui-capture-button-circle {
+        background-color: lighten($screenshot_ui_button_red, 5%);
+      }
+    }
+    &:active {
+      .screenshot-ui-capture-button-circle {
+        background-color: darken($screenshot_ui_button_red, 7%);
+      }
+    }
+  }
+}
+
+.screenshot-ui-shot-cast-container {
+  background-color: lighten($osd_bg_color,5%);
+  border-radius: $modal_radius;
+  padding: $screenshot_ui_shot_cast_spacing;
+  spacing: $screenshot_ui_shot_cast_spacing;
+
+  &:ltr { margin-left: $screenshot_ui_shot_cast_margin - $screenshot_ui_panel_padding;}
+  &:rtl { margin-right: $screenshot_ui_shot_cast_margin - $screenshot_ui_panel_padding;}
+}
+
+.screenshot-ui-shot-cast-button {
+  padding: $base_padding $base_padding*2;
+  background-color: transparent;
+  &:hover, &:focus { background-color: lighten($osd_bg_color, 10%);}
+  &:active { background-color: lighten($active_bg_color,5%);}
+  &:checked { background-color: white;color: black;}
+  &:insensitive { color: transparentize($osd_fg_color, 0.5);}
+
+  border-radius: $modal_radius - $screenshot_ui_shot_cast_spacing;
+
+  StIcon { icon-size: $base_icon_size;}
+}
+
+.screenshot-ui-show-pointer-button {
+  @extend %osd_button;
+  border-radius: 99px;
+  padding: $base_padding * 2 !important;
+  StIcon { icon-size: $base_icon_size;}
+}
+
+.screenshot-ui-area-indicator-shade {
+  background-color: rgba(0,0,0,.3);
+}
+
+.screenshot-ui-area-selector {
+  .screenshot-ui-area-indicator-shade {
+    background-color: rgba(0,0,0,.5);
+  }
+
+  .screenshot-ui-area-indicator-selection {
+    border: 2px white;
+  }
+}
+
+.screenshot-ui-area-selector-handle {
+  border-radius: 99px;
+  background-color: white;
+  box-shadow: 0 1px 3px 2px rgba(0,0,0,0.2);
+  width: 24px;
+  height: 24px;
+}
+
+.screenshot-ui-window-selector {
+  background-color: $system_bg_color;
+
+  .screenshot-ui-window-selector-window-container {
+    margin: 100px;
+  }
+
+  &:primary-monitor {
+    .screenshot-ui-window-selector-window-container {
+      // Make some room for the panel.
+      margin-bottom: 200px;
+    }
+  }
+}
+
+.screenshot-ui-window-selector-window-border {
+  transition-duration: 200ms;
+  border-radius: $modal_radius;
+  border: 6px transparent;
+}
+
+.screenshot-ui-window-selector-check {
+  transition-duration: 200ms;
+  color: transparent;
+  border-radius: 99px;
+  border-width: 12px;
+  icon-size: 24px;
+}
+
+.screenshot-ui-window-selector-window {
+  &:hover {
+    .screenshot-ui-window-selector-window-border {
+      border-color: darken($selected_bg_color, 15%);
+    }
+  }
+  &:checked {
+    .screenshot-ui-window-selector-window-border {
+      border-color: $selected_bg_color;
+      background-color: transparentize($selected_bg_color, 0.8);
+    }
+
+    .screenshot-ui-window-selector-check {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+    }
+  }
+}
+
+.screenshot-ui-screen-selector {
+  transition-duration: 200ms;
+  background-color: rgba(0,0,0,.5);
+
+  &:hover { background-color: rgba(0,0,0,.3);}
+  &:active { background-color: rgba(0,0,0,.7);}
+  &:checked {
+    background-color: transparent;
+    border: 2px white;
+  }
+}
+
+.screenshot-ui-tooltip {
+  color: $osd_fg_color;
+  background-color: $osd_bg_color;
+  border-radius: 99px;
+  padding: $base_padding $base_padding * 2;
+  text-align: center;
+  -y-offset: 24px;
+}
--- a/data/gnome-shell-sass/widgets/_scrollbars.scss
+++ b/data/gnome-shell-sass/widgets/_scrollbars.scss
@@ -9,8 +9,8 @@ StScrollBar {
  padding: 0;

  StScrollView & {
-    min-width: 14px;
-    min-height: 14px;
+    min-width: 8px;
+    min-height: 8px;
  }

  StBin#trough {
@@ -20,10 +20,10 @@ StScrollBar {

  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; }
+    background-color: mix($fg_color, $bg_color, 30%);
+    border: 3px solid transparent; //would be nice to margin or at least to transparent
+    transition: 500ms all ease;
+    &:hover {background-color: mix($fg_color, $bg_color, 50%);}
+    &:active {background-color: mix($fg_color, $bg_color, 40%);}
  }
-}
+}
--- a/data/gnome-shell-sass/widgets/_search-entry.scss
+++ b/data/gnome-shell-sass/widgets/_search-entry.scss
@@ -1,34 +1,13 @@
 // 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;
-  margin-top: $base_spacing * 2;
-  margin-bottom: $base_spacing;
-  border-width: 2px;
-  border-color: transparent;
-  &:hover {
-    background-color: $hover_bg_color;
-    color: $hover_fg_color;
-  }
+  border-radius: 99px;
+  margin-top: $base_padding*2;
+  margin-bottom: $base_padding;
+  width: 24em;

-  &:focus {
-    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 { 
+  .search-entry-icon {
    icon-size: $base_icon_size;
+    margin-top: 2px; // center vertically
    padding: 0 4px;
-    color: inherit;
  }
 }
--- a/data/gnome-shell-sass/widgets/_search-results.scss
+++ b/data/gnome-shell-sass/widgets/_search-results.scss
@@ -1,94 +1,82 @@
 /* Search */

 // search overview container
+#searchResults {
+  margin: 0 $base_margin;
+}
+
 #searchResultsContent {
-  max-width: 1024px;
-  spacing: $base_margin * 2;
+  max-width: 1072px;
 }

 // search results sections "the boxes"
 .search-section {
  // This should be equal to #searchResultsContent spacing
-  spacing: $base_margin * 2;
+  spacing: $base_padding*3;

-  // separator
-  .search-section-separator { 
-    // height: 1px;
-    // background-color: $osd_outer_borders_color;
-    height: 0;
+  // separator (unstyled)
+  .search-section-separator {
+    height: $base_margin*2; // use it as a spacer
    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));
+  background-color: lighten($system_bg_color, 5%);
+  border-radius: $modal_radius*1.5;
+  box-shadow:inset 0 0 0 1px solid $outer_borders_color;
  color: $osd_fg_color;
-  padding: $base_padding * 3;
-  // This is the space between the provider icon and the results container
-  spacing: $base_margin * 2;
+  padding: $base_padding*2;
+  margin:0 $base_margin*3;
 }

-%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);
-  }
+%search_section_content_item {
+  @include tile_button($osd_fg_color);
+  border-radius: $base_border_radius+3px;
 }

 // "no results" text
 .search-statustext {
-  @extend %status_text;
+  @extend %title_1;
 }

 .grid-search-results {
-  spacing: $base_spacing * 6;
+  spacing: $base_padding*5;
+  margin:0 $base_margin*3;
 }

 // Search results with icons
 .grid-search-result {
-  @extend %app-well-app;
+  @extend .app-well-app;
 }

 // search result provider
 .search-provider-icon {
-  @extend %search-section-content-item;
+  @extend %search_section_content_item;
+  &:ltr {margin-right: $base_margin;}
+  &:rtl {margin-left: $base_margin;}

  // content
  .list-search-provider-content {
-    spacing: $base_spacing * 2;
+    spacing: $base_padding * 2;

    // provider labels
    .list-search-provider-details {
      width: 120px;
-      margin-top: 0;
-      color: darken($osd_fg_color, 8%);
-      // font-weight: bold;
+      color: $osd_fg_color;
    }
  }
 }

 // search results list
 .list-search-results {
-  spacing: $base_spacing;
+  spacing: $base_padding;
 }

 // search result listitem
 .list-search-result {
-  @extend %search-section-content-item;
+  @extend %search_section_content_item;

  // content
  .list-search-result-content {
@@ -97,12 +85,12 @@

  // list item title (with leading icon)
  .list-search-result-title {
-    spacing: $base_spacing * 2;
+    spacing: $base_padding * 2;
    // font-weight: bold;
  }

  // list item description
  .list-search-result-description {
-    color: darken($osd_fg_color, 30%);
+    color: $osd_insensitive_fg_color;
  }
 }
--- a/data/gnome-shell-sass/widgets/_slider.scss
+++ b/data/gnome-shell-sass/widgets/_slider.scss
@@ -1,27 +1,22 @@
 /* Slider */

-$slider_size: 15px;
+$slider_size: 16px;

 .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
+  -barlevel-height: 4px;
+  -barlevel-background-color: if($variant == 'light', transparentize($fg_color, 0.6), transparentize($fg_color, 0.8)); //background of the trough
+  -barlevel-border-width: 2px; 
+  -barlevel-border-color: transparent; // 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
+  -barlevel-active-background-color: $selected_bg_color;
+  -barlevel-active-border-color: transparent;
  // 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-border-color: transparent; //trough border when red;
  -barlevel-overdrive-separator-width:1px;
  // slider handler
  -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; }
-}
+  -slider-handle-border-width: 0;
+  -slider-handle-border-color: transparent; // because 0 width
+}
--- a/data/gnome-shell-sass/widgets/_switcher-popup.scss
+++ b/data/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -1,37 +1,35 @@
 /* App Switcher */

+// same as dash
+$switcher_padding: $base_padding*2;
+
+
+// the full screen container of the switcher
 .switcher-popup {
-  padding: 8px;
-  spacing: $base_spacing * 4;
+  padding: 0;
+  spacing: $base_padding * 4;
 }

 // switcher onscreen panel
 .switcher-list {
  @extend %osd_panel;
+  padding: $switcher_padding;
+  border-radius: $modal_radius+$switcher_padding;
+  box-shadow: 0 8px 8px 0 $shadow_color;

+  // container for items in list
+  .switcher-list-item-container {
+    spacing: $base_padding * 2;
+  }
+
+  // each item in the list
  .item-box {
-    padding: 8px;
-    border-radius: $base_border_radius + 1px;
-    border: 1px solid transparent;
-
-    &:outlined {
-      background-color: transparentize($osd_fg_color, 0.7);
+    @include tile_button($osd_fg_color);
+    // override over style so mouse doesn't steal focus
+    &:hover {background: none;}
+    @if $is_highcontrast {
+      box-shadow: inset 0 0 0 999px transparentize($hc_inset_color,0.2);
    }
-
-    &: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 {
@@ -39,16 +37,27 @@
    background: $borders_color;
  }

-  .switcher-list-item-container {
-    spacing: $base_spacing * 2;
+  // container of thumbnails
+  .thumbnail-box {
+    padding: 2px;
+    spacing: $base_padding;
+  }
+
+  // window thumbnail itself
+  .thumbnail {
+    width: 256px; // equal to THUMBNAIL_DEFAULT_SIZE in altTab.js
+    border-radius:$base_border_radius;
  }
 }

+// arrow if app has multiple windows
 .switcher-arrow {
-  border-color: rgba(0,0,0,0);
-  color: transparentize($fg_color,0.2);
+  border-color: transparentize($osd_fg_color, 0.2);
+  color: transparentize($osd_fg_color, 0.2);
+
  &:highlighted {
-    color: $fg_color;
+    border-color: $osd_fg_color;
+    color: $osd_fg_color;
  }
 }

--- a/data/gnome-shell-sass/widgets/_switches.scss
+++ b/data/gnome-shell-sass/widgets/_switches.scss
@@ -1,16 +1,16 @@
 /* Switches */

 // these are equal to the size of the SVG assets
-$switch_height: 22px;
-$switch_width: 46px;
+$switch_height: 26px;
+$switch_width: 48px;

 .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"));
+  background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-off-light.svg"),url("resource:///org/gnome/shell/theme/toggle-off.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"));
+    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-on-light.svg"),url("resource:///org/gnome/shell/theme/toggle-on.svg"));
  }
-}
+}
--- a/data/gnome-shell-sass/widgets/_tiled-previews.scss
+++ b/data/gnome-shell-sass/widgets/_tiled-previews.scss
@@ -1,19 +0,0 @@
-
-/* 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;
-}
--- a/data/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/gnome-shell-sass/widgets/_window-picker.scss
@@ -1,10 +1,11 @@
 /* Window Picker */

-$window_picker_spacing: $base_spacing; // 6px
+$window_picker_spacing: $base_padding; // 6px
 $window_picker_padding: $base_padding * 2; // 12px

 $window_thumbnail_label_color: transparentize($osd_bg_color, 0.4);

+$window_close_button_color: transparentize(lighten($osd_bg_color, 7%), .02);
 $window_close_button_size: 30px;
 $window_close_button_padding: 3px;

@@ -16,37 +17,38 @@ $window_close_button_padding: 3px;

 // Window titles
 .window-caption {
-  color: $osd_fg_color;
-  background-color: $osd_bg_color;
-  border-radius: 99px;
-  padding: $base_padding $base_padding * 2;
+  @extend %tooltip;
 }

 // Close button
 .window-close {
-  background-color: $osd_bg_color;
+  background-color: $window_close_button_color;
  color: $osd_fg_color;
-  border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
+  border-radius: 99px;
+  box-shadow: 0 2px 4px 0 $shadow_color;
  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);
-  transition-duration: 300ms;
+  transition-duration: 100ms;

-  & StIcon { icon-size: 24px; }
+  & StIcon { icon-size: 24px; } // uses non standard icon size

  &:hover {
-    background-color: lighten($osd_bg_color, 15%);
+    background-color: lighten($window_close_button_color, 7%);
  }

  &:active {
-    color: transparentize($osd_fg_color, 0.2);
-    background-color: darken($osd_bg_color, 5%);
+    background-color: lighten($window_close_button_color, 13%);
+  }
+
+  @if $is_highcontrast {
+    border:2px solid $outer_borders_color;
  }
 }

 .workspace-background {
  // keep in sync with BACKGROUND_CORNER_RADIUS_PIXELS in workspace.js
  border-radius: 30px;
+  background-color: $invisible_occluded_bg_color;
  box-shadow: 0 4px 16px 4px transparentize(darken($osd_bg_color, 30%), 0.7);
 }
--- a/data/gnome-shell-sass/widgets/_workspace-switcher.scss
+++ b/data/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -1,36 +1,25 @@
 /* Workspace Switcher */
-.workspace-switcher-group {
-  padding: $base_padding * 2;
-}

-.workspace-switcher-container {
-  @extend %osd_panel;
-}
+$ws_indicator_height: $large_icon_size;
+$ws_dot_active: $ws_indicator_height / 3;
+$ws_dot_inactive: $ws_indicator_height / 6;

 .workspace-switcher {
-  background: transparent;
-  border: none;
-  border-radius: 0;
-  padding: 0;
-  spacing: $base_spacing * 2;
+  @extend %osd_panel;
+  margin-bottom: 4em;
+  spacing: $base_padding * 2;
+  padding: $base_padding * 2 $base_padding * 3;
 }

-.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;
-}
+.ws-switcher-indicator {
+  background-color: transparentize($osd_fg_color,0.5);
+  padding: $ws_dot_inactive / 2;
+  margin: ($ws_indicator_height - $ws_dot_inactive) / 2;
+  border-radius: $ws_indicator_height;

-// 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;
+  &:active {
+    background-color: $osd_fg_color;
+    padding: $ws_dot_active / 2;
+    margin: ($ws_indicator_height - $ws_dot_active) / 2;
+  }
 }
--- a/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss
+++ b/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss
@@ -3,12 +3,18 @@
 // thumbnails in overview
 .workspace-thumbnails {
  visible-width: 32px; //amount visible before hover
-  spacing: $base_spacing;
+  spacing: $base_padding;
  padding: $base_padding;

  .workspace-thumbnail {
-    @extend %overview_panel;
-    border-radius: 3px;
+    color: $osd_fg_color;
+    background-color: lighten($system_bg_color, 10%);
+    border-radius: $base_border_radius*0.5;
+    border: 1px solid transparent;
+
+    @if $is_highcontrast {
+      border-color: $hc_inset_color;
+    }
  }

  // drag and drop indicator
@@ -22,7 +28,5 @@
 // selected indicator
 .workspace-thumbnail-indicator {
  border: 3px solid $selected_bg_color;
-  border-radius: 3px;
-  padding: 0px;
-  // background-color: transparentize($selected_bg_color, 0.9);
+  border-radius: $base_border_radius;
 }
--- a/data/meson.build
+++ b/data/meson.build
@@ -65,36 +65,30 @@ theme_sources = files(
  'gnome-shell-sass/widgets/_hotplug.scss',
  'gnome-shell-sass/widgets/_ibus-popup.scss',
  'gnome-shell-sass/widgets/_keyboard.scss',
-  'gnome-shell-sass/widgets/_login-dialog.scss',
+  'gnome-shell-sass/widgets/_login-lock.scss',
  'gnome-shell-sass/widgets/_looking-glass.scss',
  'gnome-shell-sass/widgets/_message-list.scss',
  'gnome-shell-sass/widgets/_misc.scss',
-  'gnome-shell-sass/widgets/_network-dialog.scss',
  'gnome-shell-sass/widgets/_notifications.scss',
  'gnome-shell-sass/widgets/_osd.scss',
  'gnome-shell-sass/widgets/_overview.scss',
  'gnome-shell-sass/widgets/_panel.scss',
  'gnome-shell-sass/widgets/_popovers.scss',
-  'gnome-shell-sass/widgets/_screen-shield.scss',
+  'gnome-shell-sass/widgets/_quick-settings.scss',
+  'gnome-shell-sass/widgets/_screenshot.scss',
  'gnome-shell-sass/widgets/_scrollbars.scss',
  'gnome-shell-sass/widgets/_search-entry.scss',
  'gnome-shell-sass/widgets/_search-results.scss',
  'gnome-shell-sass/widgets/_slider.scss',
  'gnome-shell-sass/widgets/_switcher-popup.scss',
  'gnome-shell-sass/widgets/_switches.scss',
-  'gnome-shell-sass/widgets/_tiled-previews.scss',
  'gnome-shell-sass/widgets/_window-picker.scss',
  'gnome-shell-sass/widgets/_workspace-switcher.scss',
  'gnome-shell-sass/widgets/_workspace-thumbnails.scss'
 )

 theme_data = [
-  'calendar-today.svg',
  'classic-process-working.svg',
-  'classic-toggle-off-intl.svg',
-  'classic-toggle-off-us.svg',
-  'classic-toggle-on-intl.svg',
-  'classic-toggle-on-us.svg',
  'gnome-classic-high-contrast.css'
 ]

--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,889 @@
+gnome-shell-extensions (44~beta-1) experimental; urgency=medium
+
+  [ Jeremy Bicha ]
+  * New upstream release
+
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster (oldstable)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 15 Feb 2023 11:01:26 -0500
+
+gnome-shell-extensions (43.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 22 Nov 2022 14:14:48 -0500
+
+gnome-shell-extensions (43.0-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 27 Sep 2022 19:13:41 -0400
+
+gnome-shell-extensions (43.0-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 19 Sep 2022 10:57:41 -0400
+
+gnome-shell-extensions (43~rc-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 06 Sep 2022 14:39:00 -0400
+
+gnome-shell-extensions (43~beta-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 21 Aug 2022 10:59:20 -0400
+
+gnome-shell-extensions (42.3-1) unstable; urgency=medium
+
+  * New upstream release (LP: #1981606)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 13 Jul 2022 17:49:05 +0200
+
+gnome-shell-extensions (42.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 03 Jun 2022 09:23:28 -0400
+
+gnome-shell-extensions (42.1-1) unstable; urgency=medium
+
+  * New upstream release (LP: #1972365)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 09 May 2022 08:09:32 -0400
+
+gnome-shell-extensions (42.0-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 28 Mar 2022 11:18:12 -0400
+
+gnome-shell-extensions (42.0-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jeremy.bicha@canonical.com>  Mon, 14 Mar 2022 11:30:18 -0400
+
+gnome-shell-extensions (42~rc-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jeremy.bicha@canonical.com>  Tue, 08 Mar 2022 17:54:41 -0500
+
+gnome-shell-extensions (42~beta-1) experimental; urgency=medium
+
+  * New upstream release:
+    - Use libadwaita for preferences
+    - window-list: Fix on-screen keyboard
+    - native-window-placement: Fix distorted layout in app grid
+  * debian/control: Depend on libadwaita and gtk-4 (instead of gtk-3)
+  * debian/patches: Drop applied upstream
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Wed, 23 Feb 2022 07:35:20 +0100
+
+gnome-shell-extensions (41.1-2) unstable; urgency=medium
+
+  * Team upload
+  * d/p/meson-Drop-unused-argument-for-i18n.merge_file.patch:
+    Backport patch from upstream to fix FBTFS with Meson 0.61
+    (Closes: #1005534)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 15 Feb 2022 11:18:30 +0000
+
+gnome-shell-extensions (41.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 12 Dec 2021 20:30:17 -0500
+
+gnome-shell-extensions (41.0-2) unstable; urgency=medium
+
+  * Team upload
+  * Upload to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Sat, 16 Oct 2021 20:06:04 +0100
+
+gnome-shell-extensions (41.0-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/control.in: Bump minimum meson to 0.53.0
+  * Bump Standards-Version to 4.6.0
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 10 Oct 2021 17:04:15 -0400
+
+gnome-shell-extensions (40.4-3) unstable; urgency=medium
+
+  * Team upload
+  * Release to unstable (transition: #992870)
+
+ -- Simon McVittie <smcv@debian.org>  Sat, 11 Sep 2021 21:52:59 +0100
+
+gnome-shell-extensions (40.4-2) experimental; urgency=medium
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * debian/copyright: Add gnome-classic.css to Files-Excluded
+  * Revert "debian/control: Don't build depend on sassc"
+  * This ensures we compile the CSS file from source.
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/control: Support pre-release versions of gnome-shell
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 29 Aug 2021 09:16:04 -0400
+
+gnome-shell-extensions (40.1-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/control:
+    - Update runtime dependencies to match code.
+      Found grepping code via:
+        grep "imports\.gi" --include "*.js" -rh -B2 . \
+           | grep -o "\b[A-Z][A-Za-z]\+\b" | sed "s/,\?\s*$//g" | sort -u
+    - Don't build depend on sassc.
+      Since we compile from tarball, this is not needed anymore given that
+      compiled css are provided already.
+    - Build-depend on dh-sequence-gnome 0.22.
+      It's the first version that supports new GNOME versioning schema.
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Sun, 30 May 2021 20:05:13 +0200
+
+gnome-shell-extensions (3.38.2-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Standards-Version: 4.5.1 (no changes required)
+  * d/gbp.conf: Use upstream/3.38.x branch.
+    Version 40~alpha was already released upstream.
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 03 Dec 2020 10:17:58 +0000
+
+gnome-shell-extensions (3.38.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Recommend gnome-shell-extension-prefs instead of gnome-tweaks
+
+ -- Jeremy Bicha <jbicha@debian.org>  Tue, 06 Oct 2020 17:44:30 -0400
+
+gnome-shell-extensions (3.38.0-2) unstable; urgency=medium
+
+  * Team upload
+  * Revert "debian/watch: Watch for unstable releases"
+  * Release to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 25 Sep 2020 23:00:58 +0100
+
+gnome-shell-extensions (3.38.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release
+    - Translation updates
+  * d/upstream/metadata: Add
+  * Update standards version to 4.5.0, no changes needed
+  * Fix gnome-classic regression in 3.37.91-1.
+    gnome-session no longer takes the `--session gnome-classic` argument
+    when running in classic mode.
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 22 Sep 2020 11:49:24 +0100
+
+gnome-shell-extensions (3.37.91-1) experimental; urgency=medium
+
+  * New upstream release:
+    - drive-menu: Emphasize eject buttons
+    - user-theme: Add preference dialog
+    - window-list:
+      + Fix inconsistent state in preference dialog
+      + auto-move: Modernize preference dialogs
+    - workspace-indicator: Overhaul preference dialog
+    - user-theme: Support session mode styles
+    - Adjust to gnome-shell changes
+  * debian/patches: Refresh
+  * debian/control: B-D on debhelper 13
+  * debian/rules: Don't override dh_missing equal default behavior
+  * debian/control: Remove useless dependency on clutter gir
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Thu, 27 Aug 2020 17:39:42 +0200
+
+gnome-shell-extensions (3.36.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 03 May 2020 10:02:18 +0200
+
+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
+  * debian/control.in: Bump Standards-Version to 4.4.1 (no further changes)
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 30 Dec 2019 00:51:13 +0100
+
+gnome-shell-extensions (3.34.1-2) unstable; urgency=high
+
+  * New upstream release
+    - Fix GNOME Classic session's compatibility with gnome-setting-daemon 3.34
+
+ -- Jeremy Bicha <jbicha@debian.org>  Tue, 08 Oct 2019 22:49:14 -0400
+
+gnome-shell-extensions (3.34.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Mon, 30 Sep 2019 17:27:38 +0200
+
+gnome-shell-extensions (3.34.0-1) experimental; urgency=medium
+
+  * New upstream translation release
+
+ -- Iain Lane <laney@debian.org>  Tue, 10 Sep 2019 10:59:31 +0100
+
+gnome-shell-extensions (3.33.92-1) experimental; urgency=medium
+
+  * New upstream bugfix / translation releases
+
+ -- Iain Lane <laney@debian.org>  Thu, 05 Sep 2019 18:22:14 +0100
+
+gnome-shell-extensions (3.33.90-1) experimental; urgency=medium
+
+  [ Marco Trevisan (Treviño) ]
+  * New upstream release
+    + window-list: Support showing windows from all workspaces
+    + Make GNOME Classic more classic:
+      - Disable GNOME 3 overview
+      - Add window picker button to window list
+      - Style improvements and fixes
+      - Support horizontal workspace layout in window list
+      - Add draggable previews to window list workspace switcher
+      - Arrange workspaces horizontally
+    + workspace-indicator: Support horizontal workspace layout
+    + workspace-indicator: Add draggable previews
+    + Fix windowsNavigator extension after ES6 port
+    + screenshot-window-sizer: Add phone screenshot sizes
+
+  [ Iain Lane ]
+  * rules: Build all extensions via the upstream build system. We don't need
+    to hardcode the list to build, as the build system provides a way to build
+    'all' extensions.
+  * rules: Build with --fail-missing
+  * compat, control, rules: Move to compat 12 and specifying via build-deps
+
+ -- Iain Lane <laney@debian.org>  Tue, 13 Aug 2019 11:59:22 +0100
+
+gnome-shell-extensions (3.32.0-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Iain Lane <laney@debian.org>  Tue, 12 Mar 2019 16:34:14 +0000
+
+gnome-shell-extensions (3.31.92-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Iain Lane <laney@debian.org>  Wed, 06 Mar 2019 15:40:48 +0000
+
+gnome-shell-extensions (3.31.90-1) experimental; urgency=medium
+
+  * New upstream release
+    + Misc. bug fixes and cleanups
+    + Remove obsolete alternate-tab extension
+    + Adjust to gnome-shell changes
+  * debian/watch: Watch for unstable releases
+  * rules: alternate-tab is dropped; stop trying to enable it
+
+ -- Iain Lane <laney@debian.org>  Thu, 21 Feb 2019 10:33:12 +0000
+
+gnome-shell-extensions (3.30.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Bump Standards-Version to 4.2.1
+  * d/p/gnome-session-classic-wrapper-script.patch:
+    Re-word to avoid a Lintian warning
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 02 Nov 2018 09:26:47 +0000
+
+gnome-shell-extensions (3.30.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Wed, 05 Sep 2018 12:34:40 -0400
+
+gnome-shell-extensions (3.29.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream development release
+  * Bump Standards-Version to 4.2.0
+  * Sort dependency lists (wrap-and-sort -a)
+  * d/copyright: Remove unnecessary sentence fragment
+  * d/p/series: Remove commented-out line
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 20 Aug 2018 20:27:57 +0100
+
+gnome-shell-extensions (3.29.90-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream development release
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 02 Aug 2018 10:46:44 +0100
+
+gnome-shell-extensions (3.29.3+really3.29.3-1) experimental; urgency=medium
+
+  * Team upload
+  * d/watch: Watch for development versions
+  * Re-upload to experimental with a higher version than
+    3.29.3+really3.28.1-1, which reverted the incorrect upload of the
+    previous version to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:56:10 +0100
+
+gnome-shell-extensions (3.29.3-1) unstable; urgency=medium
+
+  * Team upload
+
+  [ Arnaud Rebillout ]
+  * New upstream release
+
+  [ Simon McVittie ]
+  * Bump Standards-Version to 4.1.5
+  * Set Rules-Requires-Root to no
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 09:37:34 +0100
+
+gnome-shell-extensions (3.28.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.1.4
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 14 May 2018 21:51:46 -0400
+
+gnome-shell-extensions (3.28.0-2) unstable; urgency=medium
+
+  * Fix typo in configure flag that resulted in missing
+    auto-move-windows, native-window-placement, & user-theme extensions
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 19 Mar 2018 18:20:53 -0400
+
+gnome-shell-extensions (3.28.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 18 Mar 2018 20:17:17 -0400
+
+gnome-shell-extensions (3.27.92-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sat, 10 Mar 2018 19:37:45 -0500
+
+gnome-shell-extensions (3.27.92-1) experimental; urgency=medium
+
+  [ Jeremy Bicha ]
+  * New upstream release candidate
+  * Drop explicit dependency on mutter's gir. gnome-shell-extensions depends
+    on gnome-shell which depends on the gir. Dropping it will make transitions
+    easier.
+
+  [ Simon McVittie ]
+  * Recommend gnome-tweaks instead of transitional gnome-tweak-tool
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 05 Mar 2018 21:02:01 -0500
+
+gnome-shell-extensions (3.27.91-1) experimental; urgency=medium
+
+  * New upstream development release
+  * Build with meson
+  * Build-Depend on sassc
+  * Bump debhelper compat to 11
+  * Drop places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch &
+    dont-require-nautilus-classic.patch: Applied in new release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 23 Feb 2018 19:49:59 -0500
+
+gnome-shell-extensions (3.26.2-3) unstable; urgency=medium
+
+  * Team upload
+
+  [ Jeremy Bicha ]
+  * Update Vcs fields for migration to https://salsa.debian.org/
+
+  [ Simon McVittie ]
+  * d/patches: Re-export with gbp pq export
+  * d/p/places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch:
+    Take patch from upstream to avoid frequent tracebacks from the Places
+    menu with gjs >= 1.50.2-3 (Closes: #888608)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 30 Jan 2018 09:15:54 +0000
+
+gnome-shell-extensions (3.26.2-2) unstable; urgency=medium
+
+  * Update Vcs fields for conversion to git
+  * Add debian/gbp.conf
+  * Bump Standards-Version to 4.1.2
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 15 Dec 2017 15:19:14 -0500
+
+gnome-shell-extensions (3.26.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 05 Nov 2017 20:17:03 +0100
+
+gnome-shell-extensions (3.26.1-2) unstable; urgency=medium
+
+  * Release to unstable
+  * Bump Standards-Version to 4.1.1
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 13 Oct 2017 16:49:30 -0400
+
+gnome-shell-extensions (3.26.1-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 Oct 2017 11:01:11 +0100
+
+gnome-shell-extensions (3.26.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 13 Sep 2017 11:33:19 +0100
+
+gnome-shell-extensions (3.25.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release, for GNOME Shell 3.25.91
+    - d/p/adapt-to-gsd324.patch: Drop, applied upstream
+    - Switch dependency to gir1.2-mutter-1
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 05 Sep 2017 16:43:01 +0100
+
+gnome-shell-extensions (3.22.2-2) unstable; urgency=medium
+
+  * Add adapt-to-gsd324.patch (Closes: #869948):
+    - Adjust gnome-session file for gnome-settings-daemon 3.24
+  * debian/control.in:
+    - Bump Standards-Version to 4.0.0
+    - Explicitly depend on gnome-settings-daemon >= 3.24
+    - Drop version from gnome-tweak-tool recommends
+    - Depend on gnome-session-bin instead of gnome-session (LP: #1702832)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 06 Aug 2017 17:38:06 -0400
+
+gnome-shell-extensions (3.22.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 10 Nov 2016 19:36:44 +0100
+
+gnome-shell-extensions (3.22.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 11 Oct 2016 17:58:31 +0200
+
+gnome-shell-extensions (3.22.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 20 Sep 2016 01:59:50 +0200
+
+gnome-shell-extensions (3.21.92-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Replace Build-Depends gnome-common with pkg-config and gettext.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 13 Sep 2016 22:13:19 +0200
+
+gnome-shell-extensions (3.21.91-1) unstable; urgency=medium
+
+  * New upstream beta release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 30 Aug 2016 19:57:32 +0200
+
+gnome-shell-extensions (3.21.90-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream beta release.
+  * Update build-dependencies according to configure.ac changes:
+    - drop intltool, now gettext is used instead.
+
+  [ Jeremy Bicha ]
+  * Convert from cdbs to dh
+  * Add debian/docs to install NEWS and README
+  * Bump dh compat to 10
+  * Update Vcs fields
+  * Refresh patches
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sun, 21 Aug 2016 05:36:17 +0200
+
+gnome-shell-extensions (3.21.4-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Stop hard-coding Victor Seva in the Uploaders field
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 12 Aug 2016 16:28:33 +0200
+
+gnome-shell-extensions (3.20.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 11 May 2016 15:21:35 +0200
+
+gnome-shell-extensions (3.20.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 17 Apr 2016 00:25:25 +0200
+
+gnome-shell-extensions (3.20.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 25 Mar 2016 10:48:00 +0100
+
+gnome-shell-extensions (3.19.92-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update dont-require-nautilus-classic.patch to apply.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Thu, 17 Mar 2016 12:51:13 +0100
+
+gnome-shell-extensions (3.18.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.7.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 06 Mar 2016 22:38:57 +0100
+
+gnome-shell-extensions (3.18.3-2) unstable; urgency=medium
+
+  * Add Breaks/Replaces gnome-shell-common (<< 3.18) (Closes: #808906)
+    - Helps upgrades from Jessie by allowing overwriting
+      /usr/share/gnome-shell/theme/calendar-today.svg et.al.
+      which was previously shipped in gnome-shell-common.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 10 Feb 2016 01:24:42 +0100
+
+gnome-shell-extensions (3.18.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 14 Jan 2016 22:49:16 +0100
+
+gnome-shell-extensions (3.18.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Nov 2015 00:04:09 +0100
+
+gnome-shell-extensions (3.18.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 16 Oct 2015 22:09:01 +0200
+
+gnome-shell-extensions (3.18.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 11 Oct 2015 16:29:18 +0200
+
+gnome-shell-extensions (3.17.92-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 18 Sep 2015 17:28:06 +0200
+
+gnome-shell-extensions (3.16.2-1) unstable; urgency=medium
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/gnome-shell-extensions.gsettings-override:
+    + Dropped, no longer needed as the enabled extension no longer exists.
+      Thanks Artur Rona for noticing. (Closes: #782747)
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Update Homepage.
+  * Bump debhelper compatibility level to 9.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 02 Jul 2015 19:13:32 +0200
+
+gnome-shell-extensions (3.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in,
+    debian/rules:
+    + The system monitor extension was removed. Drop the libgtop
+      build and runtime dependencies and stop enabling it.
+  * debian/patches/apps-center-labels.patch,
+    debian/patches/window-list-pointerInNotification.patch,
+    debian/patches/menu-arrows-icons.patch:
+    + Dropped, merged upstream.
+  * debian/patches/dont-require-nautilus-classic.patch:
+    + Updated for the new version.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 14 Jun 2015 15:23:59 +0200
+
+gnome-shell-extensions (3.14.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * menu-arrows-icons: new patch. Make arrows consistent with the rest
+    of the shell.
+  * apps-center-labels.patch: patch from upstream git. Center labels
+    vertically in the applications menu.
+  * window-list-pointerInNotification.patch: patch from upstream git.
+    Update window-list extension for an older shell API change.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 30 Nov 2014 16:06:59 +0100
+
+gnome-shell-extensions (3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
+  * Add missing dependencies against gir packages, including gir1.2-gmenu-3.0,
+    this should fix the apps-menu extension for some people (Closes: #765460).
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 19 Oct 2014 21:17:58 +0200
+
+gnome-shell-extensions (3.14.0-2) unstable; urgency=medium
+
+  * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed
+    upstream.
+  * Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 24 Sep 2014 01:15:32 +0200
+
+gnome-shell-extensions (3.14.0-1) unstable; urgency=medium
+
+  * debian/watch: only scan for stable releases.
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 23 Sep 2014 15:46:30 +0200
+
+gnome-shell-extensions (3.13.91-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sat, 06 Sep 2014 11:16:39 -0700
+
+gnome-shell-extensions (3.12.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 15 Jul 2014 00:06:09 +0200
+
+gnome-shell-extensions (3.12.0-1) experimental; urgency=low
+
+  [ Jean Schurger ]
+  * New upstream release (3.10.1)
+  * debian/rules: remove one of the 'windowsNavigator' extension listed twice
+    and the 'alternative-system-menu' extension (does not exists anymore)
+  * debian/copyright: Update 'Format:' line
+
+  [ Andreas Henriksson ]
+  * New upstream release (3.12.0)
+  * debian/local/gnome-session-classic,
+    debian/patches/gnome-session-classic-wrapper-script.patch:
+    - update script to include new GNOME_SHELL_SESSION_MODE env variable
+      and update patch to apply again.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 04 Apr 2014 21:43:18 +0200
+
+gnome-shell-extensions (3.8.4-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 13 Oct 2013 18:11:33 +0200
+
+gnome-shell-extensions (3.8.4-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * Dropped patches applied in new version:
+    - fix-hibernate.patch
+    - fix-applications-menu-resolution-change.patch
+    - look-in-data-home-for-themes.patch
+
+  [ Michael Biebl ]
+  * Add a wrapper script to start the GNOME Classic session as currently
+    Xsession doesn't allow to run gnome-session with custom arguments due to
+    #653327.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Oct 2013 18:55:23 +0200
+
+gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+    - default-min-max and static-workspaces extensions have been dropped.
+      Use Classic Mode or tweak org.gnome.shell.overrides in dconf-editor
+  * debian/control.in:
+    - Depend on gnome-session 3.8, required for the new Classic mode.
+    - Update homepage
+  * debian/patches/dont-require-nautilus-classic.patch:
+    - Don't require nautilus-classic since it forces desktop icons
+  * debian/patches/fix-applications-menu-resolution-change.patch:
+    - Backport commit to not break applications menu when screen resolution
+      changes
+  * debian/patches/fix-hibernate.patch:
+    - Backport patch to fix checking whether hibernate is allowed
+  * debian/patches/look-in-data-home-for-themes.patch:
+    - Backport commit to also look in XDG_DATA_HOME (usually ~/.local/share/)
+      for user themes
+  * debian/rules:
+    - Run autoreconf
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 16 Aug 2013 20:25:30 +0200
+
+gnome-shell-extensions (3.8.2-1) experimental; urgency=low
+
+  * Team upload
+
+  [ Victor Seva ]
+  * Recommends gnome-tweak-tool
+
+  [ Jean Schurger ]
+  * New upstream release 3.7.92 (LP: #1017979, #1059152).
+  * Enabled new extensions.
+  * Dropped 'dock' and 'gajim'.
+  * Use ./configure instead of autoreconf.
+  * Bumped Standards-Version to 3.9.4.
+  * Updated Vcs-Svn.
+  * debian/control.in
+    - Added runtime dependency to 'gvfs' (>= 1.16.0).
+      The 'Places' extension rely on a 'gvfs' linked to 'udisks2'.
+
+  [ Simon McVittie ]
+  * New upstream release 3.8.2.
+  * Install the "classic mode"
+  * Enable windowNavigator extension (this means we have everything except
+    example and xrandr, the same as in the Ubuntu gnome3-team's PPA)
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 23 May 2013 09:07:23 +0100
+
+gnome-shell-extensions (3.4.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 30 May 2012 13:22:54 +0200
+
+gnome-shell-extensions (3.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Remove 01_status-menu_disable_accounts.patch: The alternative-status-menu
+    extension no longer recreates the complete user menu but reuses the one
+    from gnome-shell, so we can't easily get rid of the "Online Accounts" menu
+    entry. We will patch gnome-shell directly instead.
+  * Remove 02-Revert-all-remove-all-GSettings-usage.patch and
+    03-Revert-Remove-all-references-to-localedir-from-metad.patch, no longer
+    required.
+  * Bump Standards-Version to 3.9.3
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 21 May 2012 00:24:56 +0200
+
+gnome-shell-extensions (3.2.3-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * gnome-shell-extensions.gsettings-override: enable the alternative
+    status menu by default. Closes: #648112.
+  * Use ${gnome:Version} to generate strict dependencies, it’s very
+    unlikely that extensions remain compatible after a major upgrade.
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+
+  [ Josselin Mouette ]
+  * 01_status-menu_disable_accounts.patch: new patch. Drop the unusable
+    advertisement for Google. It is already available in the control
+    center anyway.
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Drop patches which have been merged upstream:
+    - debian/patches/upstream/*
+    - debian/patches/fix-*
+  * Refresh 01_status-menu_disable_accounts.patch.
+  * Add 02-Revert-all-remove-all-GSettings-usage.patch: Use GSettings since we
+    install the extensions system-wide.
+  * Use dh-autoreconf to generate the build system.
+  * Add 03-Revert-Remove-all-references-to-localedir-from-metad.patch: Use
+    locales from system-wide location.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 11 Feb 2012 23:28:53 +0100
+
+gnome-shell-extensions (3.2.0-1) experimental; urgency=low
+
+  [ Victor Seva ]
+  * Initial release (Closes: #627515)
+    Package based on the work by Bilal Akhtar <bilalakhtar@ubuntu.com>
+  * debian/copyright
+    - Added myself
+    - Fixed syntax-error-in-dep5-copyright syntax error
+  * debian/control.in
+    - Added myself as maintainer.
+    - Fix gnome-shell dependency.
+    - Fix gir1.2-gtop-2.0 dependency for systemMonitor ext.
+  * debian/rules
+    - Added uploaders.mk gnome-version.mk includes.
+    - Removed unused variables.
+  * debian/watch added.
+  * No more gnome-shell-extension-* packages.
+  * debian/patches/upstream
+    - patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff
+      popup menu fix
+    - patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff
+      dock fix.
+    - patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff
+      patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff
+      systemMonitor: Properly enable/disable
+  * debian/patches
+    - fix_dock_gnome-shell_version.diff
+    - fix_alternate-tab_661281.diff
+    - fix_alternate-tab_gnome-shell_version.diff
+  * debian/rules
+    - EXTENSIONS_ENABLED, EXTENSIONS_DISABLED variables
+    - disabled xrandr-indicator
+
+  [ Michael Biebl ]
+  * debian/watch: Track .xz tarballs.
+  * debian/control.in:
+    - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer and add
+      Victor Seva <linuxmaniac@torreviejawireless.org> to Uploaders.
+    - Wrap (Build-)Depends.
+    - Add Vcs-Svn and Vcs-Browser field.
+  * debian/rules:
+    - Include gnome-get-source.mk.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 12 Nov 2011 18:32:22 +0100
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,47 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-gnome (>= 0.22),
+               meson (>= 0.53.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.6.0
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: gir1.2-adw-1,
+         gir1.2-atk-1.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-graphene-1.0 (>= 1.10.2),
+         gir1.2-gtk-4.0,
+         gir1.2-pango-1.0,
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24),
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gvfs (>= 1.16.0),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.
--- a/debian/control.in
+++ b/debian/control.in
@@ -0,0 +1,45 @@
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-gnome (>= 0.22),
+               meson (>= 0.53.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.6.0
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: gir1.2-adw-1,
+         gir1.2-atk-1.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-graphene-1.0 (>= 1.10.2),
+         gir1.2-gtk-4.0,
+         gir1.2-pango-1.0,
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24),
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gvfs (>= 1.16.0),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,30 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gnome-shell-extensions
+Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+Source: https://download.gnome.org/sources/gnome-shell-extensions/
+Files-Excluded: data/gnome-classic.css
+Comment: Build that generated file from source
+
+Files: *
+Copyright: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+    2011 Victor Seva <linuxmaniac@torreviejawireless.org>
+    2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README.md
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -0,0 +1,17 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/master
+upstream-branch = upstream/latest
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+upstream-vcs-tag = %(version%~%.)s
+
+[pq]
+patch-numbers = False
--- a/debian/install
+++ b/debian/install
@@ -0,0 +1 @@
+debian/local/gnome-session-classic usr/bin
--- a/debian/local/gnome-session-classic
+++ b/debian/local/gnome-session-classic
@@ -0,0 +1,2 @@
+#! /bin/sh
+env GNOME_SHELL_SESSION_MODE=classic gnome-session "$@"
--- a/debian/patches/gnome-session-classic-wrapper-script.patch
+++ b/debian/patches/gnome-session-classic-wrapper-script.patch
@@ -0,0 +1,30 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 30 Jan 2018 09:04:03 +0000
+Subject: Use a wrapper script to start GNOME classic session
+
+Xsession currently doesn't allow passing more then one argument, as it
+otherwise fails with
+Xsession: unable to launch "gnome-session --session classic" X session ---
+"gnome-session --session classic" not found; falling back to default session.
+
+This is due to [1]. Add a wrapper script to start the GNOME classic session
+as a workaround. Once [1] is fixed, this should be removed again.
+
+[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327.
+---
+ data/gnome-classic.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in
+index 13da2b5..d627655 100644
+--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=GNOME Classic
+ Comment=This session logs you into GNOME Classic
+-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
+Exec=gnome-session-classic
+ TryExec=gnome-session
+ Type=Application
+ DesktopNames=GNOME-Classic;GNOME;
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gnome-session-classic-wrapper-script.patch
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-Dextension_set=all \
+		-Dclassic_mode=true
--- a/debian/source/format
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
+Bug-Submit: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/new
+Repository: https://gitlab.gnome.org/GNOME/gnome-shell-extensions.git
+Repository-Browse: https://gitlab.gnome.org/GNOME/gnome-shell-extensions
--- a/debian/watch
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=4
+opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/, downloadurlmangle=s|cache.json||" \
+https://download.gnome.org/sources/@PACKAGE@/cache.json \
+	[\d.]+/@PACKAGE@-([\d.]+)@ARCHIVE_EXT@
--- a/export-zips.sh
+++ b/export-zips.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 srcdir=`dirname $0`
 srcdir=`(cd $srcdir && pwd)`
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -4,7 +4,7 @@
 const {
    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St,
 } = imports.gi;
-const Signals = imports.signals;
+const {EventEmitter} = imports.misc.signals;

 const DND = imports.ui.dnd;
 const ExtensionUtils = imports.misc.extensionUtils;
@@ -24,10 +24,13 @@ const NAVIGATION_REGION_OVERSHOOT = 50;
 Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
 Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');

-var ApplicationMenuItem = GObject.registerClass(
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, app) {
-        super._init();
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(button, app) {
+        super();
        this._app = app;
        this._button = button;

@@ -93,12 +96,15 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
        icon.style_class = 'icon-dropshadow';
        this._iconBin.set_child(icon);
    }
-});
+}

-var CategoryMenuItem = GObject.registerClass(
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, category) {
-        super._init();
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(button, category) {
+        super();
        this._category = category;
        this._button = button;

@@ -111,7 +117,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        else
            name = _('Favorites');

-        this.add_child(new St.Label({ text: name }));
+        this.add_child(new St.Label({text: name}));
        this.connect('motion-event', this._onMotionEvent.bind(this));
        this.connect('notify::active', this._onActiveChanged.bind(this));
    }
@@ -214,7 +220,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        this._button.selectCategory(this._category);
        this._button.scrollToCatButton(this);
    }
-});
+}

 class ApplicationsMenu extends PopupMenu.PopupMenu {
    constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -233,8 +239,10 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
    }
 }

-class DesktopTarget {
+class DesktopTarget extends EventEmitter {
    constructor() {
+        super();
+
        this._desktop = null;
        this._desktopDestroyedId = 0;

@@ -351,12 +359,14 @@ class DesktopTarget {
        return true;
    }
 }
-Signals.addSignalMethods(DesktopTarget.prototype);

-let ApplicationsButton = GObject.registerClass(
 class ApplicationsButton extends PanelMenu.Button {
-    _init() {
-        super._init(1.0, null, false);
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super(1.0, null, false);

        this.setMenu(new ApplicationsMenu(this, 1.0, St.Side.TOP, this));
        Main.panel.menuManager.addMenu(this.menu);
@@ -399,7 +409,7 @@ class ApplicationsButton extends PanelMenu.Button {
            });
        });

-        this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
+        this._tree = new GMenu.Tree({menu_basename: 'applications.menu'});
        this._treeChangedId = this._tree.connect('changed',
            this._onTreeChanged.bind(this));

@@ -500,7 +510,7 @@ class ApplicationsButton extends PanelMenu.Button {
                }
                let app = appSys.lookup_app(id);
                if (!app)
-                    app = new Shell.App({ app_info: entry.get_app_info() });
+                    app = new Shell.App({app_info: entry.get_app_info()});
                if (app.get_app_info().should_show())
                    this.applicationsByCategory[categoryId].push(app);
            } else if (nextType === GMenu.TreeItemType.SEPARATOR) {
@@ -546,8 +556,8 @@ class ApplicationsButton extends PanelMenu.Button {
    _createLayout() {
        let section = new PopupMenu.PopupMenuSection();
        this.menu.addMenuItem(section);
-        this.mainBox = new St.BoxLayout({ vertical: false });
-        this.leftBox = new St.BoxLayout({ vertical: true });
+        this.mainBox = new St.BoxLayout({vertical: false});
+        this.leftBox = new St.BoxLayout({vertical: true});
        this.applicationsScrollBox = new St.ScrollView({
            style_class: 'apps-menu vfade',
            x_expand: true,
@@ -569,9 +579,9 @@ class ApplicationsButton extends PanelMenu.Button {
        vscroll.connect('scroll-stop', () => (this.menu.passEvents = false));
        this.leftBox.add_child(this.categoriesScrollBox);

-        this.applicationsBox = new St.BoxLayout({ vertical: true });
+        this.applicationsBox = new St.BoxLayout({vertical: true});
        this.applicationsScrollBox.add_actor(this.applicationsBox);
-        this.categoriesBox = new St.BoxLayout({ vertical: true });
+        this.categoriesBox = new St.BoxLayout({vertical: true});
        this.categoriesScrollBox.add_actor(this.categoriesBox);

        this.mainBox.add(this.leftBox);
@@ -665,7 +675,7 @@ class ApplicationsButton extends PanelMenu.Button {

        return applist;
    }
-});
+}

 let appsMenuButton;

--- a/extensions/apps-menu/meson.build
+++ b/extensions/apps-menu/meson.build
@@ -3,4 +3,5 @@ extension_data += configure_file(
  output: metadata_name,
  configuration: metadata_conf
 )
+extension_data += files('stylesheet.css')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -2,7 +2,7 @@
 // Start apps on custom workspaces
 /* exported init enable disable */

-const { Shell } = imports.gi;
+const {Shell} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -2,7 +2,7 @@
 // Start apps on custom workspaces
 /* exported init buildPrefsWidget */

-const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
+const {Adw, Gio, GLib, GObject, Gtk} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;

@@ -12,129 +12,195 @@ const SETTINGS_KEY = 'application-list';

 const WORKSPACE_MAX = 36; // compiled in limit of mutter

-const AutoMoveSettingsWidget = GObject.registerClass(
+class NewItem extends GObject.Object {}
+GObject.registerClass(NewItem);
+
+class NewItemModel extends GObject.Object {
+    static [GObject.interfaces] = [Gio.ListModel];
+    static {
+        GObject.registerClass(this);
+    }
+
+    #item = new NewItem();
+
+    vfunc_get_item_type() {
+        return NewItem;
+    }
+
+    vfunc_get_n_items() {
+        return 1;
+    }
+
+    vfunc_get_item(_pos) {
+        return this.#item;
+    }
+}
+
+class Rule extends GObject.Object {
+    static [GObject.properties] = {
+        'app-info': GObject.ParamSpec.object(
+            'app-info', 'app-info', 'app-info',
+            GObject.ParamFlags.READWRITE,
+            Gio.DesktopAppInfo),
+        'workspace': GObject.ParamSpec.uint(
+            'workspace', 'workspace', 'workspace',
+            GObject.ParamFlags.READWRITE,
+            1, WORKSPACE_MAX, 1),
+    };
+
+    static {
+        GObject.registerClass(this);
+    }
+}
+
+class RulesList extends GObject.Object {
+    static [GObject.interfaces] = [Gio.ListModel];
+    static {
+        GObject.registerClass(this);
+    }
+
+    #settings = ExtensionUtils.getSettings();
+    #rules = [];
+    #changedId;
+
+    constructor() {
+        super();
+
+        this.#changedId =
+            this.#settings.connect(`changed::${SETTINGS_KEY}`,
+                () => this.#sync());
+        this.#sync();
+    }
+
+    append(appInfo) {
+        const pos = this.#rules.length;
+
+        this.#rules.push(new Rule({appInfo}));
+        this.#saveRules();
+
+        this.items_changed(pos, 0, 1);
+    }
+
+    remove(id) {
+        const pos = this.#rules.findIndex(r => r.appInfo.get_id() === id);
+        if (pos < 0)
+            return;
+
+        this.#rules.splice(pos, 1);
+        this.#saveRules();
+
+        this.items_changed(pos, 1, 0);
+    }
+
+    changeWorkspace(id, workspace) {
+        const pos = this.#rules.findIndex(r => r.appInfo.get_id() === id);
+        if (pos < 0)
+            return;
+
+        this.#rules[pos].set({workspace});
+        this.#saveRules();
+    }
+
+    #saveRules() {
+        this.#settings.block_signal_handler(this.#changedId);
+        this.#settings.set_strv(SETTINGS_KEY,
+            this.#rules.map(r => `${r.app_info.get_id()}:${r.workspace}`));
+        this.#settings.unblock_signal_handler(this.#changedId);
+    }
+
+    #sync() {
+        const removed = this.#rules.length;
+
+        this.#rules = [];
+        for (const stringRule of this.#settings.get_strv(SETTINGS_KEY)) {
+            const [id, workspace] = stringRule.split(':');
+            const appInfo = Gio.DesktopAppInfo.new(id);
+            if (appInfo)
+                this.#rules.push(new Rule({appInfo, workspace}));
+            else
+                log(`Invalid ID ${id}`);
+        }
+        this.items_changed(0, removed, this.#rules.length);
+    }
+
+    vfunc_get_item_type() {
+        return Rule;
+    }
+
+    vfunc_get_n_items() {
+        return this.#rules.length;
+    }
+
+    vfunc_get_item(pos) {
+        return this.#rules[pos] ?? null;
+    }
+}
+
 class AutoMoveSettingsWidget extends Adw.PreferencesGroup {
-    _init() {
-        super._init({
+    static {
+        GObject.registerClass(this);
+
+        this.install_action('rules.add', null, self => self._addNewRule());
+        this.install_action('rules.remove', 's',
+            (self, name, param) => self._rules.remove(param.unpack()));
+        this.install_action('rules.change-workspace', '(si)',
+            (self, name, param) => self._rules.changeWorkspace(...param.deepUnpack()));
+    }
+
+    constructor() {
+        super({
            title: _('Workspace Rules'),
        });

+        this._rules = new RulesList();
+
+        const store = new Gio.ListStore({item_type: Gio.ListModel});
+        const listModel = new Gtk.FlattenListModel({model: store});
+        store.append(this._rules);
+        store.append(new NewItemModel());
+
        this._list = new Gtk.ListBox({
            selection_mode: Gtk.SelectionMode.NONE,
            css_classes: ['boxed-list'],
        });
        this.add(this._list);

-        this._list.append(new NewRuleRow());
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this._list.insert_action_group('rules', this._actionGroup);
-
-        let action;
-        action = new Gio.SimpleAction({ name: 'add' });
-        action.connect('activate', this._onAddActivated.bind(this));
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'remove',
-            parameter_type: new GLib.VariantType('s'),
+        this._list.bind_model(listModel, item => {
+            return item instanceof NewItem
+                ? new NewRuleRow()
+                : new RuleRow(item);
        });
-        action.connect('activate', this._onRemoveActivated.bind(this));
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({ name: 'update' });
-        action.connect('activate', () => {
-            this._settings.set_strv(SETTINGS_KEY,
-                this._getRuleRows().map(row => `${row.id}:${row.value}`));
-        });
-        this._actionGroup.add_action(action);
-        this._updateAction = action;
-
-        this._settings = ExtensionUtils.getSettings();
-        this._changedId = this._settings.connect('changed',
-            this._sync.bind(this));
-        this._sync();
-
-        this.connect('destroy', () => this._settings.run_dispose());
    }

-    _onAddActivated() {
+    _addNewRule() {
        const dialog = new NewRuleDialog(this.get_root());
        dialog.connect('response', (dlg, id) => {
            const appInfo = id === Gtk.ResponseType.OK
                ? dialog.get_widget().get_app_info() : null;
-            if (appInfo) {
-                this._settings.set_strv(SETTINGS_KEY, [
-                    ...this._settings.get_strv(SETTINGS_KEY),
-                    `${appInfo.get_id()}:1`,
-                ]);
-            }
+            if (appInfo)
+                this._rules.append(appInfo);
            dialog.destroy();
        });
        dialog.show();
    }
+}

-    _onRemoveActivated(action, param) {
-        const removed = param.deepUnpack();
-        this._settings.set_strv(SETTINGS_KEY,
-            this._settings.get_strv(SETTINGS_KEY).filter(entry => {
-                const [id] = entry.split(':');
-                return id !== removed;
-            }));
-    }
-
-    _getRuleRows() {
-        return [...this._list].filter(row => !!row.id);
-    }
-
-    _sync() {
-        const oldRules = this._getRuleRows();
-        const newRules = this._settings.get_strv(SETTINGS_KEY).map(entry => {
-            const [id, value] = entry.split(':');
-            return { id, value };
-        });
-
-        this._settings.block_signal_handler(this._changedId);
-        this._updateAction.enabled = false;
-
-        newRules.forEach(({ id, value }, index) => {
-            const row = oldRules.find(r => r.id === id);
-            const appInfo = row
-                ? null : Gio.DesktopAppInfo.new(id);
-
-            if (row)
-                row.set({ value });
-            else if (appInfo)
-                this._list.insert(new RuleRow(appInfo, value), index);
-        });
-
-        const removed = oldRules.filter(
-            ({ id }) => !newRules.find(r => r.id === id));
-        removed.forEach(r => this._list.remove(r));
-
-        this._settings.unblock_signal_handler(this._changedId);
-        this._updateAction.enabled = true;
-    }
-});
-
-const WorkspaceSelector = GObject.registerClass({
-    Properties: {
+class WorkspaceSelector extends Gtk.Widget {
+    static [GObject.properties] = {
        'number': GObject.ParamSpec.uint(
            'number', 'number', 'number',
            GObject.ParamFlags.READWRITE,
            1, WORKSPACE_MAX, 1),
-    },
-}, class WorkspaceSelector extends Gtk.Widget {
-    static _classInit(klass) {
-        super._classInit(klass);
+    };

-        klass.set_layout_manager_type(Gtk.BoxLayout);
+    static {
+        GObject.registerClass(this);

-        return klass;
+        this.set_layout_manager_type(Gtk.BoxLayout);
    }

-    _init() {
-        super._init();
+    constructor() {
+        super();

        this.layout_manager.spacing = 6;

@@ -174,27 +240,21 @@ const WorkspaceSelector = GObject.registerClass({
        this._decButton.sensitive = this.number > 1;
        this._incButton.sensitive = this.number < WORKSPACE_MAX;
    }
-});
+}

-const RuleRow = GObject.registerClass({
-    Properties: {
-        'id': GObject.ParamSpec.string(
-            'id', 'id', 'id',
-            GObject.ParamFlags.READABLE,
-            ''),
-        'value': GObject.ParamSpec.uint(
-            'value', 'value', 'value',
-            GObject.ParamFlags.READWRITE,
-            1, WORKSPACE_MAX, 1),
-    },
-}, class RuleRow extends Adw.ActionRow {
-    _init(appInfo, value) {
-        super._init({
+class RuleRow extends Adw.ActionRow {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(rule) {
+        const {appInfo} = rule;
+        const id = appInfo.get_id();
+
+        super({
            activatable: false,
-            title: appInfo.get_display_name(),
-            value,
+            title: rule.appInfo.get_display_name(),
        });
-        this._appInfo = appInfo;

        const icon = new Gtk.Image({
            css_classes: ['icon-dropshadow'],
@@ -204,33 +264,34 @@ const RuleRow = GObject.registerClass({
        this.add_prefix(icon);

        const wsButton = new WorkspaceSelector();
-        this.bind_property('value',
+        rule.bind_property('workspace',
            wsButton, 'number',
-            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
+            GObject.BindingFlags.SYNC_CREATE);
        this.add_suffix(wsButton);

+        wsButton.connect('notify::number', () => {
+            this.activate_action('rules.change-workspace',
+                new GLib.Variant('(si)', [id, wsButton.number]));
+        });
+
        const button = new Gtk.Button({
            action_name: 'rules.remove',
-            action_target: new GLib.Variant('s', this.id),
+            action_target: new GLib.Variant('s', id),
            icon_name: 'edit-delete-symbolic',
            has_frame: false,
            valign: Gtk.Align.CENTER,
        });
        this.add_suffix(button);
-
-        this.connect('notify::value',
-            () => this.activate_action('rules.update', null));
    }
+}

-    get id() {
-        return this._appInfo.get_id();
-    }
-});
-
-const NewRuleRow = GObject.registerClass(
 class NewRuleRow extends Gtk.ListBoxRow {
-    _init() {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super({
            action_name: 'rules.add',
            child: new Gtk.Image({
                icon_name: 'list-add-symbolic',
@@ -244,12 +305,15 @@ class NewRuleRow extends Gtk.ListBoxRow {
        this.update_property(
            [Gtk.AccessibleProperty.LABEL], [_('Add Rule')]);
    }
-});
+}

-const NewRuleDialog = GObject.registerClass(
 class NewRuleDialog extends Gtk.AppChooserDialog {
-    _init(parent) {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(parent) {
+        super({
            transient_for: parent,
            modal: true,
        });
@@ -272,7 +336,7 @@ class NewRuleDialog extends Gtk.AppChooserDialog {
        this.set_response_sensitive(Gtk.ResponseType.OK,
            appInfo && !rules.some(i => i.startsWith(appInfo.get_id())));
    }
-});
+}

 /** */
 function init() {
--- a/extensions/auto-move-windows/stylesheet.css
+++ b/extensions/auto-move-windows/stylesheet.css
@@ -1 +0,0 @@
-/* This extensions requires no special styling */
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -1,6 +1,6 @@
 /* exported init enable disable */
 // Drive menu extension
-const { Clutter, Gio, GObject, Shell, St } = imports.gi;
+const {Clutter, Gio, GObject, Shell, St} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
@@ -12,10 +12,13 @@ const _ = ExtensionUtils.gettext;

 Gio._promisify(Gio.File.prototype, 'query_filesystem_info_async');

-var MountMenuItem = GObject.registerClass(
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(mount) {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(mount) {
+        super({
            style_class: 'drive-menu-item',
        });

@@ -131,12 +134,15 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {

        super.activate(event);
    }
-});
+}

-let DriveMenu = GObject.registerClass(
 class DriveMenu extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Removable devices'));
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super(0.5, _('Removable devices'));

        let icon = new St.Icon({
            icon_name: 'media-eject-symbolic',
@@ -204,7 +210,7 @@ class DriveMenu extends PanelMenu.Button {

        super._onDestroy();
    }
-});
+}

 /** */
 function init() {
--- a/extensions/drive-menu/meson.build
+++ b/extensions/drive-menu/meson.build
@@ -3,3 +3,4 @@ extension_data += configure_file(
  output: metadata_name,
  configuration: metadata_conf
 )
+extension_data += files('stylesheet.css')
--- a/extensions/launch-new-instance/stylesheet.css
+++ b/extensions/launch-new-instance/stylesheet.css
@@ -1 +0,0 @@
-/* This extensions requires no special styling */
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -15,7 +15,7 @@ foreach e : enabled_extensions
  metadata_conf.set('url', 'https://gitlab.gnome.org/GNOME/gnome-shell-extensions')

  extension_sources = files(e + '/extension.js')
-  extension_data = files(e + '/stylesheet.css')
+  extension_data = []

  subdir(e)

--- a/extensions/meson.build.template
+++ b/extensions/meson.build.template
@@ -4,5 +4,6 @@ extension_data += configure_file(
  configuration: metadata_conf
 )

+# extension_data += files('stylesheet.css')
 # extension_sources += files('prefs.js')
 # extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/native-window-placement/extension.js
+++ b/extensions/native-window-placement/extension.js
@@ -1,10 +1,10 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported enable disable */
-const { Clutter } = imports.gi;
+const {Clutter} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
-const { WindowPreview } = imports.ui.windowPreview;
+const {WindowPreview} = imports.ui.windowPreview;
 const Workspace = imports.ui.workspace;

 // testing settings for natural window placement strategy:
@@ -97,7 +97,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
        let rects = [];
        for (let i = 0; i < clones.length; i++) {
            // save rectangles into 4-dimensional arrays representing two corners of the rectangular: [left_x, top_y, right_x, bottom_y]
-            let rect = clones[i].metaWindow.get_frame_rect();
+            let rect = clones[i].boundingBox;
            rects[i] = new Rect(rect.x, rect.y, rect.width, rect.height);
            bounds = bounds.union(rects[i]);

@@ -285,8 +285,8 @@ function enable() {
 }

 /**
- * @param {Object} object - object that was modified
- * @param {Object} injection - the map of previous injections
+ * @param {object} object - object that was modified
+ * @param {object} injection - the map of previous injections
 * @param {string} name - the @injection key that should be removed
 */
 function removeInjection(object, injection, name) {
--- a/extensions/native-window-placement/stylesheet.css
+++ b/extensions/native-window-placement/stylesheet.css
@@ -1 +0,0 @@
-/* This extensions requires no special styling */
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -1,7 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported init enable disable */

-const { Clutter, GObject, St } = imports.gi;
+const {Clutter, GObject, St} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
@@ -16,10 +16,13 @@ const N_ = x => x;

 const PLACE_ICON_SIZE = 16;

-var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(info) {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(info) {
+        super({
            style_class: 'place-menu-item',
        });
        this._info = info;
@@ -73,7 +76,7 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
        this._icon.gicon = info.icon;
        this._label.text = info.name;
    }
-});
+}

 const SECTIONS = [
    'special',
@@ -82,10 +85,13 @@ const SECTIONS = [
    'network',
 ];

-let PlacesMenu = GObject.registerClass(
 class PlacesMenu extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Places'));
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super(0.5, _('Places'));

        let label = new St.Label({
            text: _('Places'),
@@ -130,7 +136,7 @@ class PlacesMenu extends PanelMenu.Button {

        this._sections[id].actor.visible = places.length > 0;
    }
-});
+}

 /** */
 function init() {
--- a/extensions/places-menu/meson.build
+++ b/extensions/places-menu/meson.build
@@ -3,5 +3,6 @@ extension_data += configure_file(
  output: metadata_name,
  configuration: metadata_conf
 )
+extension_data += files('stylesheet.css')

 extension_sources += files('placeDisplay.js')
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported PlacesManager */

-const { Gio, GLib, Shell } = imports.gi;
-const Signals = imports.signals;
+const {Gio, GLib, Shell} = imports.gi;
+const {EventEmitter} = imports.misc.signals;

 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
@@ -22,8 +23,10 @@ const Hostname1Iface = '<node> \
 </node>';
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);

-class PlaceInfo {
+class PlaceInfo extends EventEmitter {
    constructor(...params) {
+        super();
+
        this._init(...params);
    }

@@ -31,7 +34,7 @@ class PlaceInfo {
        this.kind = kind;
        this.file = file;
        this.name = name || this._getFileName();
-        this.icon = icon ? new Gio.ThemedIcon({ name: icon }) : this.getIcon();
+        this.icon = icon ? new Gio.ThemedIcon({name: icon}) : this.getIcon();
    }

    destroy() {
@@ -94,16 +97,16 @@ class PlaceInfo {
        // icon from the query info above
        switch (this.kind) {
        case 'network':
-            return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
+            return new Gio.ThemedIcon({name: 'folder-remote-symbolic'});
        case 'devices':
-            return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
+            return new Gio.ThemedIcon({name: 'drive-harddisk-symbolic'});
        case 'special':
        case 'bookmarks':
        default:
            if (!this.file.is_native())
-                return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
+                return new Gio.ThemedIcon({name: 'folder-remote-symbolic'});
            else
-                return new Gio.ThemedIcon({ name: 'folder-symbolic' });
+                return new Gio.ThemedIcon({name: 'folder-symbolic'});
        }
    }

@@ -118,7 +121,6 @@ class PlaceInfo {
        }
    }
 }
-Signals.addSignalMethods(PlaceInfo.prototype);

 class RootInfo extends PlaceInfo {
    _init() {
@@ -138,7 +140,7 @@ class RootInfo extends PlaceInfo {
    }

    getIcon() {
-        return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
+        return new Gio.ThemedIcon({name: 'drive-harddisk-symbolic'});
    }

    _propertiesChanged(proxy) {
@@ -246,8 +248,10 @@ const DEFAULT_DIRECTORIES = [
    GLib.UserDirectory.DIRECTORY_VIDEOS,
 ];

-var PlacesManager = class {
+var PlacesManager = class extends EventEmitter {
    constructor() {
+        super();
+
        this._places = {
            special: [],
            devices: [],
@@ -255,7 +259,7 @@ var PlacesManager = class {
            network: [],
        };

-        this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
+        this._settings = new Gio.Settings({schema_id: BACKGROUND_SCHEMA});
        this._showDesktopIconsChangedId = this._settings.connect(
            'changed::show-desktop-icons', this._updateSpecials.bind(this));
        this._updateSpecials();
@@ -543,4 +547,3 @@ var PlacesManager = class {
        return this._places[kind];
    }
 };
-Signals.addSignalMethods(PlacesManager.prototype);
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -19,7 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

-const { Clutter, Meta, Shell, St } = imports.gi;
+const {Clutter, Meta, Shell, St} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
@@ -39,7 +39,7 @@ function hideMessage() {
 */
 function flashMessage(message) {
    if (!text) {
-        text = new St.Label({ style_class: 'screenshot-sizer-message' });
+        text = new St.Label({style_class: 'screenshot-sizer-message'});
        Main.uiGroup.add_actor(text);
    }

@@ -101,10 +101,6 @@ function cycleScreenshotSizes(display, window, binding) {
    for (let i = 0; i < scaledSizes.length; i++) {
        let [width, height] = scaledSizes[i];

-        // ignore sizes bigger than the workArea
-        if (width > workArea.width || height > workArea.height)
-            continue;
-
        // get the best initial window size
        let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
        if (nearestIndex === undefined || error < nearestError) {
@@ -125,8 +121,18 @@ function cycleScreenshotSizes(display, window, binding) {
    if (newY + newHeight > workArea.y + workArea.height)
        newY = Math.max(workArea.y + workArea.height - newHeight);

+    const id = window.connect('size-changed', () => {
+        window.disconnect(id);
+        _notifySizeChange(window);
+    });
    window.move_resize_frame(true, newX, newY, newWidth, newHeight);
+}

+/**
+ * @param {Meta.Window} window - the window whose size changed
+ */
+function _notifySizeChange(window) {
+    const {scaleFactor} = St.ThemeContext.get_for_stage(global.stage);
    let newOuterRect = window.get_frame_rect();
    let message = '%d×%d'.format(
        newOuterRect.width / scaleFactor,
--- a/extensions/screenshot-window-sizer/meson.build
+++ b/extensions/screenshot-window-sizer/meson.build
@@ -3,5 +3,6 @@ extension_data += configure_file(
  output: metadata_name,
  configuration: metadata_conf
 )
+extension_data += files('stylesheet.css')

 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -2,7 +2,7 @@
 // Load shell theme from ~/.local/share/themes/name/gnome-shell
 /* exported init */

-const { Gio } = imports.gi;
+const {Gio} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
--- a/extensions/user-theme/prefs.js
+++ b/extensions/user-theme/prefs.js
@@ -4,7 +4,7 @@
 // we use async/await here to not block the mainloop, not to parallelize
 /* eslint-disable no-await-in-loop */

-const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
+const {Adw, Gio, GLib, GObject, Gtk} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;

@@ -15,10 +15,13 @@ Gio._promisify(Gio.File.prototype, 'enumerate_children_async');
 Gio._promisify(Gio.File.prototype, 'query_info_async');
 Gio._promisify(Gio.FileEnumerator.prototype, 'next_files_async');

-const UserThemePrefsWidget = GObject.registerClass(
 class UserThemePrefsWidget extends Adw.PreferencesGroup {
-    _init() {
-        super._init({ title: 'Themes' });
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super({title: 'Themes'});

        this._actionGroup = new Gio.SimpleActionGroup();
        this.insert_action_group('theme', this._actionGroup);
@@ -101,23 +104,26 @@ class UserThemePrefsWidget extends Adw.PreferencesGroup {

        return fileInfos.map(info => info.get_name());
    }
-});
+}

-const ThemeRow = GObject.registerClass(
 class ThemeRow extends Adw.ActionRow {
-    _init(name) {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(name) {
        const check = new Gtk.CheckButton({
            action_name: 'theme.name',
            action_target: new GLib.Variant('s', name),
        });

-        super._init({
+        super({
            title: name || 'Default',
            activatable_widget: check,
        });
        this.add_prefix(check);
    }
-});
+}

 /** */
 function init() {
--- a/extensions/user-theme/stylesheet.css
+++ b/extensions/user-theme/stylesheet.css
@@ -1 +0,0 @@
-/* none used */
--- a/extensions/user-theme/util.js
+++ b/extensions/user-theme/util.js
@@ -1,5 +1,5 @@
 /* exported getThemeDirs getModeThemeDirs */
-const { GLib } = imports.gi;
+const {GLib} = imports.gi;

 const fn = (...args) => GLib.build_filenamev(args);

--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -1,5 +1,5 @@
 /* exported init */
-const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
+const {Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St} = imports.gi;

 const DND = imports.ui.dnd;
 const ExtensionUtils = imports.misc.extensionUtils;
@@ -8,8 +8,8 @@ const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;

 const Me = ExtensionUtils.getCurrentExtension();
-const { WindowPicker, WindowPickerToggle } = Me.imports.windowPicker;
-const { WorkspaceIndicator } = Me.imports.workspaceIndicator;
+const {WindowPicker, WindowPickerToggle} = Me.imports.windowPicker;
+const {WorkspaceIndicator} = Me.imports.workspaceIndicator;

 const _ = ExtensionUtils.gettext;

@@ -106,20 +106,23 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
    }
 }

-const WindowTitle = GObject.registerClass(
 class WindowTitle extends St.BoxLayout {
-    _init(metaWindow) {
-        this._metaWindow = metaWindow;
+    static {
+        GObject.registerClass(this);
+    }

-        super._init({
+    constructor(metaWindow) {
+        super({
            style_class: 'window-button-box',
            x_expand: true,
            y_expand: true,
        });

-        this._icon = new St.Bin({ style_class: 'window-button-icon' });
+        this._metaWindow = metaWindow;
+
+        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 = new St.Label({y_align: Clutter.ActorAlign.CENTER});
        this.label_actor.clutter_text.single_line_mode = true;
        this.add(this.label_actor);

@@ -175,30 +178,33 @@ class WindowTitle extends St.BoxLayout {
        this._metaWindow.disconnect(this._notifyWmClass);
        this._metaWindow.disconnect(this._notifyAppId);
    }
-});
+}

+class BaseButton extends St.Button {
+    static {
+        GObject.registerClass({
+            GTypeFlags: GObject.TypeFlags.ABSTRACT,
+            Properties: {
+                'ignore-workspace': GObject.ParamSpec.boolean(
+                    'ignore-workspace', 'ignore-workspace', 'ignore-workspace',
+                    GObject.ParamFlags.READWRITE,
+                    false),
+            },
+        }, this);
+    }

-const BaseButton = GObject.registerClass({
-    GTypeFlags: GObject.TypeFlags.ABSTRACT,
-    Properties: {
-        'ignore-workspace': GObject.ParamSpec.boolean(
-            'ignore-workspace', 'ignore-workspace', 'ignore-workspace',
-            GObject.ParamFlags.READWRITE,
-            false),
-    },
-}, class BaseButton extends St.Button {
-    _init(perMonitor, monitorIndex) {
-        this._perMonitor = perMonitor;
-        this._monitorIndex = monitorIndex;
-        this._ignoreWorkspace = false;
-
-        super._init({
+    constructor(perMonitor, monitorIndex) {
+        super({
            style_class: 'window-button',
            can_focus: true,
            x_expand: true,
            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
        });

+        this._perMonitor = perMonitor;
+        this._monitorIndex = monitorIndex;
+        this._ignoreWorkspace = false;
+
        this.connect('notify::allocation',
            this._updateIconGeometry.bind(this));
        this.connect('clicked', this._onClicked.bind(this));
@@ -240,6 +246,48 @@ const BaseButton = GObject.registerClass({
        this._updateVisibility();
    }

+    _setLongPressTimeout() {
+        if (this._longPressTimeoutId)
+            return;
+
+        const {longPressDuration} = Clutter.Settings.get_default();
+        this._longPressTimeoutId =
+            GLib.timeout_add(GLib.PRIORITY_DEFAULT, longPressDuration, () => {
+                delete this._longPressTimeoutId;
+
+                if (this._canOpenPopupMenu() && !this._contextMenu.isOpen)
+                    this._openMenu(this._contextMenu);
+                return GLib.SOURCE_REMOVE;
+            });
+    }
+
+    _removeLongPressTimeout() {
+        if (!this._longPressTimeoutId)
+            return;
+        GLib.source_remove(this._longPressTimeoutId);
+        delete this._longPressTimeoutId;
+    }
+
+    vfunc_button_press_event(buttonEvent) {
+        if (buttonEvent.button === 1)
+            this._setLongPressTimeout();
+        return super.vfunc_button_press_event(buttonEvent);
+    }
+
+    vfunc_button_release_event(buttonEvent) {
+        this._removeLongPressTimeout();
+
+        return super.vfunc_button_release_event(buttonEvent);
+    }
+
+    vfunc_touch_event(touchEvent) {
+        if (touchEvent.type === Clutter.EventType.TOUCH_BEGIN)
+            this._setLongPressTimeout();
+        else if (touchEvent.type === Clutter.EventType.TOUCH_END)
+            this._removeLongPressTimeout();
+        return super.vfunc_touch_event(touchEvent);
+    }
+
    activate() {
        if (this.active)
            return;
@@ -344,13 +392,15 @@ const BaseButton = GObject.registerClass({
            global.display.disconnect(this._windowLeftMonitorId);
        this._windowLeftMonitorId = 0;
    }
-});
+}

-
-const WindowButton = GObject.registerClass(
 class WindowButton extends BaseButton {
-    _init(metaWindow, perMonitor, monitorIndex) {
-        super._init(perMonitor, monitorIndex);
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(metaWindow, perMonitor, monitorIndex) {
+        super(perMonitor, monitorIndex);

        this.metaWindow = metaWindow;
        this._skipTaskbarId = metaWindow.connect('notify::skip-taskbar', () => {
@@ -383,7 +433,7 @@ class WindowButton extends BaseButton {
            return;
        }

-        if (button === 1)
+        if (!button || button === 1)
            this._minimizeOrActivateWindow(this.metaWindow);
        else
            this._openMenu(this._contextMenu);
@@ -422,8 +472,7 @@ class WindowButton extends BaseButton {
        global.display.disconnect(this._notifyFocusId);
        this._contextMenu.destroy();
    }
-});
-
+}

 class AppContextMenu extends PopupMenu.PopupMenu {
    constructor(source) {
@@ -483,15 +532,18 @@ class AppContextMenu extends PopupMenu.PopupMenu {
    }
 }

-const AppButton = GObject.registerClass(
 class AppButton extends BaseButton {
-    _init(app, perMonitor, monitorIndex) {
-        super._init(perMonitor, monitorIndex);
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(app, perMonitor, monitorIndex) {
+        super(perMonitor, monitorIndex);

        this.app = app;
        this._updateVisibility();

-        let stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
+        let stack = new St.Widget({layout_manager: new Clutter.BinLayout()});
        this.set_child(stack);

        this._singleWindowTitle = new St.Bin({
@@ -627,7 +679,7 @@ class AppButton extends BaseButton {
        if (contextMenuWasOpen)
            this._contextMenu.close();

-        if (button === 1) {
+        if (!button || button === 1) {
            if (menuWasOpen)
                return;

@@ -670,16 +722,15 @@ class AppButton extends BaseButton {
        this.app.disconnect(this._windowsChangedId);
        this._menu.destroy();
    }
-});
+}

-
-const WindowList = GObject.registerClass(
 class WindowList extends St.Widget {
-    _init(perMonitor, monitor) {
-        this._perMonitor = perMonitor;
-        this._monitor = monitor;
+    static {
+        GObject.registerClass(this);
+    }

-        super._init({
+    constructor(perMonitor, monitor) {
+        super({
            name: 'panel',
            style_class: 'bottom-panel solid',
            reactive: true,
@@ -688,7 +739,10 @@ class WindowList extends St.Widget {
        });
        this.connect('destroy', this._onDestroy.bind(this));

-        let box = new St.BoxLayout({ x_expand: true, y_expand: true });
+        this._perMonitor = perMonitor;
+        this._monitor = monitor;
+
+        let box = new St.BoxLayout({x_expand: true, y_expand: true});
        this.add_actor(box);

        let toggle = new WindowPickerToggle();
@@ -697,7 +751,7 @@ class WindowList extends St.Widget {
        toggle.connect('notify::checked',
            this._updateWindowListVisibility.bind(this));

-        let layout = new Clutter.BoxLayout({ homogeneous: true });
+        let layout = new Clutter.BoxLayout({homogeneous: true});
        this._windowList = new St.Widget({
            style_class: 'window-list',
            reactive: true,
@@ -715,13 +769,13 @@ class WindowList extends St.Widget {
        });
        this._windowList.connect('scroll-event', this._onScrollEvent.bind(this));

-        let indicatorsBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.END });
+        let indicatorsBox = new St.BoxLayout({x_align: Clutter.ActorAlign.END});
        box.add(indicatorsBox);

        this._workspaceIndicator = new WorkspaceIndicator();
        indicatorsBox.add_child(this._workspaceIndicator.container);

-        this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
+        this._mutterSettings = new Gio.Settings({schema_id: 'org.gnome.mutter'});
        this._workspacesOnlyOnPrimaryChangedId = this._mutterSettings.connect(
            'changed::workspaces-only-on-primary',
            this._updateWorkspaceIndicatorVisibility.bind(this));
@@ -778,7 +832,7 @@ class WindowList extends St.Widget {
        });

        this._overviewHidingId = Main.overview.connect('hidden', () => {
-            this.visible = !Main.layoutManager.primaryMonitor.inFullscreen;
+            this.visible = !this._monitor.inFullscreen;
            this._updateKeyboardAnchor();
        });

@@ -806,8 +860,8 @@ class WindowList extends St.Widget {
        this._dndWindow = null;

        this._settings = ExtensionUtils.getSettings();
-        this._groupingModeChangedId = this._settings.connect(
-            'changed::grouping-mode', this._groupingModeChanged.bind(this));
+        this._settings.connect('changed::grouping-mode',
+            () => this._groupingModeChanged());
        this._grouped = undefined;
        this._groupingModeChanged();
    }
@@ -864,7 +918,7 @@ class WindowList extends St.Widget {

        let children = this._windowList.get_children();
        let [, childWidth] = children[0].get_preferred_width(-1);
-        let { spacing } = this._windowList.layout_manager;
+        let {spacing} = this._windowList.layout_manager;

        let workspace = global.workspace_manager.get_active_workspace();
        let windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
@@ -986,7 +1040,7 @@ class WindowList extends St.Widget {
        const id = this._windowSignals.get(win);
        if (id)
            win.disconnect(id);
-        this._windowSignals.delete(id);
+        this._windowSignals.delete(win);

        let children = this._windowList.get_children();
        let child = children.find(c => c.metaWindow === win);
@@ -1076,13 +1130,13 @@ class WindowList extends St.Widget {
        Main.xdndHandler.disconnect(this._dragBeginId);
        Main.xdndHandler.disconnect(this._dragEndId);

-        this._settings.disconnect(this._groupingModeChangedId);
+        this._settings.run_dispose();

        let windows = global.get_window_actors();
        for (let i = 0; i < windows.length; i++)
            windows[i].metaWindow.set_icon_geometry(null);
    }
-});
+}

 class Extension {
    constructor() {
--- a/extensions/window-list/meson.build
+++ b/extensions/window-list/meson.build
@@ -3,6 +3,7 @@ extension_data += configure_file(
  output: metadata_name,
  configuration: metadata_conf
 )
+extension_data += files('stylesheet.css')

 extension_sources += files('prefs.js', 'windowPicker.js', 'workspaceIndicator.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -1,7 +1,7 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init buildPrefsWidget */

-const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
+const {Adw, Gio, GLib, GObject, Gtk} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;

@@ -12,10 +12,13 @@ function init() {
    ExtensionUtils.initTranslations();
 }

-const WindowListPrefsWidget = GObject.registerClass(
 class WindowListPrefsWidget extends Adw.PreferencesPage {
-    _init() {
-        super._init();
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super();

        this._actionGroup = new Gio.SimpleActionGroup();
        this.insert_action_group('window-list', this._actionGroup);
@@ -34,12 +37,12 @@ class WindowListPrefsWidget extends Adw.PreferencesPage {
        this.add(groupingGroup);

        const modes = [
-            { mode: 'never', title: _('Never group windows') },
-            { mode: 'auto', title: _('Group windows when space is limited') },
-            { mode: 'always', title: _('Always group windows') },
+            {mode: 'never', title: _('Never group windows')},
+            {mode: 'auto', title: _('Group windows when space is limited')},
+            {mode: 'always', title: _('Always group windows')},
        ];

-        for (const { mode, title } of modes) {
+        for (const {mode, title} of modes) {
            const check = new Gtk.CheckButton({
                action_name: 'window-list.grouping-mode',
                action_target: new GLib.Variant('s', mode),
@@ -79,7 +82,7 @@ class WindowListPrefsWidget extends Adw.PreferencesPage {
        row.add_suffix(toggle);
        miscGroup.add(row);
    }
-});
+}

 /**
 * @returns {Gtk.Widget} - the prefs widget
--- a/extensions/window-list/windowPicker.js
+++ b/extensions/window-list/windowPicker.js
@@ -1,25 +1,27 @@
 /* exported WindowPicker, WindowPickerToggle */
-const { Clutter, GObject, Shell, St } = imports.gi;
+const {Clutter, GObject, Shell, St} = imports.gi;

 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
-const { WorkspacesDisplay } = imports.ui.workspacesView;
+const {WorkspacesDisplay} = imports.ui.workspacesView;
 const Workspace = imports.ui.workspace;

-const { VIGNETTE_BRIGHTNESS } = imports.ui.lightbox;
+const {VIGNETTE_BRIGHTNESS} = imports.ui.lightbox;
 const {
    SIDE_CONTROLS_ANIMATION_TIME,
    OverviewAdjustment,
    ControlsState,
 } = imports.ui.overviewControls;

-let MyWorkspacesDisplay = GObject.registerClass(
 class MyWorkspacesDisplay extends WorkspacesDisplay {
-    _init(controls, overviewAdjustment) {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(controls, overviewAdjustment) {
        let workspaceManager = global.workspace_manager;

-        this._overviewAdjustment = overviewAdjustment;
-        this._workspaceAdjustment = new St.Adjustment({
+        const workspaceAdjustment = new St.Adjustment({
            value: workspaceManager.get_active_workspace_index(),
            lower: 0,
            page_increment: 1,
@@ -28,14 +30,15 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
            upper: workspaceManager.n_workspaces,
        });

+        super(controls, workspaceAdjustment, overviewAdjustment);
+
+        this._workspaceAdjustment = workspaceAdjustment;
+        this._workspaceAdjustment.actor = this;
+
        this._nWorkspacesChangedId =
            workspaceManager.connect('notify::n-workspaces',
                this._updateAdjustment.bind(this));

-        super._init(controls, this._workspaceAdjustment, this._overviewAdjustment);
-
-        this._workspaceAdjustment.actor = this;
-
        this.add_constraint(
            new Layout.MonitorConstraint({
                primary: true,
@@ -75,16 +78,19 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {

        super._onDestroy();
    }
-});
+}

-const MyWorkspace = GObject.registerClass(
 class MyWorkspace extends Workspace.Workspace {
-    _init(...args) {
-        super._init(...args);
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(...args) {
+        super(...args);

        this._adjChangedId =
            this._overviewAdjustment.connect('notify::value', () => {
-                const { value: progress } = this._overviewAdjustment;
+                const {value: progress} = this._overviewAdjustment;
                const brightness = 1 - (1 - VIGNETTE_BRIGHTNESS) * progress;
                for (const bg of this._background?._backgroundGroup ?? []) {
                    bg.content.set({
@@ -102,10 +108,13 @@ class MyWorkspace extends Workspace.Workspace {
            this._overviewAdjustment.disconnect(this._adjChangedId);
        this._adjChangedId = 0;
    }
-});
+}

-const MyWorkspaceBackground = GObject.registerClass(
 class MyWorkspaceBackground extends Workspace.WorkspaceBackground {
+    static {
+        GObject.registerClass(this);
+    }
+
    _updateBorderRadius() {
    }

@@ -138,22 +147,26 @@ class MyWorkspaceBackground extends Workspace.WorkspaceBackground {
            offsets.top + contentHeight + offsets.bottom);
        this._backgroundGroup.allocate(contentBox);
    }
-});
+}
+
+var WindowPicker = class WindowPicker extends Clutter.Actor {
+    static [GObject.signals] = {
+        'open-state-changed': {param_types: [GObject.TYPE_BOOLEAN]},
+    };
+
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super({reactive: true});

-var WindowPicker = GObject.registerClass({
-    Signals: {
-        'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
-    },
-}, class extends Clutter.Actor {
-    _init() {
        this._visible = false;
        this._modal = false;

        this._overlayKeyId = 0;
        this._stageKeyPressId = 0;

-        super._init({ reactive: true });
-
        this._adjustment = new OverviewAdjustment(this);

        this.connect('destroy', this._onDestroy.bind(this));
@@ -311,11 +324,14 @@ var WindowPicker = GObject.registerClass({
            global.stage.disconnect(this._stageKeyPressId);
        this._stageKeyPressId = 0;
    }
-});
+};

-var WindowPickerToggle = GObject.registerClass(
-class WindowPickerToggle extends St.Button {
-    _init() {
+var WindowPickerToggle = class WindowPickerToggle extends St.Button {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
        let iconBin = new St.Widget({
            layout_manager: new Clutter.BinLayout(),
        });
@@ -327,7 +343,7 @@ class WindowPickerToggle extends St.Button {
            x_align: Clutter.ActorAlign.CENTER,
            y_align: Clutter.ActorAlign.CENTER,
        }));
-        super._init({
+        super({
            style_class: 'window-picker-toggle',
            child: iconBin,
            visible: !Main.sessionMode.hasOverview,
@@ -345,4 +361,4 @@ class WindowPickerToggle extends St.Button {
            this.checked = Main.windowPicker.visible;
        });
    }
-});
+};
--- a/extensions/window-list/workspaceIndicator.js
+++ b/extensions/window-list/workspaceIndicator.js
@@ -1,5 +1,5 @@
 /* exported WorkspaceIndicator */
-const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+const {Clutter, Gio, GObject, Meta, St} = imports.gi;

 const DND = imports.ui.dnd;
 const ExtensionUtils = imports.misc.extensionUtils;
@@ -14,15 +14,18 @@ const TOOLTIP_ANIMATION_TIME = 150;

 const MAX_THUMBNAILS = 6;

-let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
-    _init(window) {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(window) {
+        super({
            style_class: 'window-list-window-preview',
        });

        this._delegate = this;
-        DND.makeDraggable(this, { restoreOnSuccess: true });
+        DND.makeDraggable(this, {restoreOnSuccess: true});

        this._window = window;

@@ -69,10 +72,13 @@ class WindowPreview extends St.Button {
            this._window.window_type !== Meta.WindowType.DESKTOP &&
            this._window.showing_on_its_workspace();
    }
-});
+}

-let WorkspaceLayout = GObject.registerClass(
 class WorkspaceLayout extends Clutter.LayoutManager {
+    static {
+        GObject.registerClass(this);
+    }
+
    vfunc_get_preferred_width() {
        return [0, 0];
    }
@@ -99,12 +105,15 @@ class WorkspaceLayout extends Clutter.LayoutManager {
            child.allocate(childBox);
        }
    }
-});
+}

-let WorkspaceThumbnail = GObject.registerClass(
 class WorkspaceThumbnail extends St.Button {
-    _init(index) {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(index) {
+        super({
            style_class: 'workspace',
            child: new Clutter.Actor({
                layout_manager: new WorkspaceLayout(),
@@ -241,12 +250,15 @@ class WorkspaceThumbnail extends St.Button {
        this._workspace.disconnect(this._windowRemovedId);
        global.display.disconnect(this._restackedId);
    }
-});
+}

-var WorkspaceIndicator = GObject.registerClass(
-class WorkspaceIndicator extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Workspace Indicator'), true);
+var WorkspaceIndicator = class WorkspaceIndicator extends PanelMenu.Button {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super(0.5, _('Workspace Indicator'), true);
        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
        this.add_style_class_name('window-list-workspace-indicator');
        this.remove_style_class_name('panel-button');
@@ -262,7 +274,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
        let workspaceManager = global.workspace_manager;

        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-        this._statusLabel = new St.Label({ text: this._getStatusText() });
+        this._statusLabel = new St.Label({text: this._getStatusText()});

        this._statusBin = new St.Bin({
            style_class: 'status-label-bin',
@@ -297,7 +309,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
        this._updateThumbnails();
        this._updateThumbnailVisibility();

-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
+        this._settings = new Gio.Settings({schema_id: 'org.gnome.desktop.wm.preferences'});
        this._settingsChangedId = this._settings.connect(
            'changed::workspace-names', this._updateMenuLabels.bind(this));
    }
@@ -315,7 +327,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    _updateThumbnailVisibility() {
-        const { workspaceManager } = global;
+        const {workspaceManager} = global;
        const vertical = workspaceManager.layout_rows === -1;
        const useMenu =
            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
@@ -435,5 +447,4 @@ class WorkspaceIndicator extends PanelMenu.Button {
        let newIndex = this._currentWorkspace + diff;
        this._activate(newIndex);
    }
-});
-
+};
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -1,6 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported init */
-const { Clutter, Graphene, GObject, St } = imports.gi;
+const {Clutter, Graphene, GObject, St} = imports.gi;

 const Main = imports.ui.main;
 const OverviewControls = imports.ui.overviewControls;
@@ -9,10 +9,13 @@ const WorkspacesView = imports.ui.workspacesView;

 const WINDOW_SLOT = 4;

-var MyWorkspace = GObject.registerClass(
 class MyWorkspace extends Workspace.Workspace {
-    _init(...args) {
-        super._init(...args);
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(...args) {
+        super(...args);

        if (this.metaWorkspace && this.metaWorkspace.index() < 9) {
            this._tip = new St.Label({
@@ -50,13 +53,13 @@ class MyWorkspace extends Workspace.Workspace {
    }

    getWindowWithTooltip(id) {
-        const { layoutManager } = this._container;
+        const {layoutManager} = this._container;
        const slot = layoutManager._windowSlots[id - 1];
        return slot ? slot[WINDOW_SLOT].metaWindow : null;
    }

    showWindowsTooltips() {
-        const { layoutManager } = this._container;
+        const {layoutManager} = this._container;
        for (let i = 0; i < layoutManager._windowSlots.length; i++) {
            if (layoutManager._windowSlots[i])
                layoutManager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
@@ -64,7 +67,7 @@ class MyWorkspace extends Workspace.Workspace {
    }

    hideWindowsTooltips() {
-        const { layoutManager } = this._container;
+        const {layoutManager} = this._container;
        for (let i in layoutManager._windowSlots) {
            if (layoutManager._windowSlots[i])
                layoutManager._windowSlots[i][WINDOW_SLOT].hideTooltip();
@@ -90,13 +93,13 @@ class MyWorkspace extends Workspace.Workspace {
            this._text.add_constraint(new Clutter.AlignConstraint({
                source: this.windowContainer,
                align_axis: Clutter.AlignAxis.X_AXIS,
-                pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
+                pivot_point: new Graphene.Point({x: 0.5, y: -1}),
                factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
            }));
            this._text.add_constraint(new Clutter.AlignConstraint({
                source: this.windowContainer,
                align_axis: Clutter.AlignAxis.Y_AXIS,
-                pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
+                pivot_point: new Graphene.Point({x: -1, y: 0.5}),
                factor: 0,
            }));

@@ -104,7 +107,7 @@ class MyWorkspace extends Workspace.Workspace {
        }).call(clone);

        clone.showTooltip = function (text) {
-            this._text.set({ text });
+            this._text.set({text});
            this._text.show();
        };

@@ -115,12 +118,15 @@ class MyWorkspace extends Workspace.Workspace {

        return clone;
    }
-});
+}

-var MyWorkspacesView = GObject.registerClass(
 class MyWorkspacesView extends WorkspacesView.WorkspacesView {
-    _init(...args) {
-        super._init(...args);
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(...args) {
+        super(...args);

        this._pickWorkspace = false;
        this._pickWindow = false;
@@ -164,7 +170,7 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
    }

    _onKeyPress(s, o) {
-        const { ControlsState } = OverviewControls;
+        const {ControlsState} = OverviewControls;
        if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
            return false;

@@ -243,7 +249,7 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
        }
        return false;
    }
-});
+}

 class Extension {
    constructor() {
--- a/extensions/windowsNavigator/meson.build
+++ b/extensions/windowsNavigator/meson.build
@@ -3,3 +3,4 @@ extension_data += configure_file(
  output: metadata_name,
  configuration: metadata_conf
 )
+extension_data += files('stylesheet.css')
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -1,7 +1,7 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init enable disable */

-const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+const {Clutter, Gio, GObject, Meta, St} = imports.gi;

 const DND = imports.ui.dnd;
 const ExtensionUtils = imports.misc.extensionUtils;
@@ -19,15 +19,18 @@ const TOOLTIP_ANIMATION_TIME = 150;

 const MAX_THUMBNAILS = 6;

-let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
-    _init(window) {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(window) {
+        super({
            style_class: 'workspace-indicator-window-preview',
        });

        this._delegate = this;
-        DND.makeDraggable(this, { restoreOnSuccess: true });
+        DND.makeDraggable(this, {restoreOnSuccess: true});

        this._window = window;

@@ -74,10 +77,13 @@ class WindowPreview extends St.Button {
            this._window.window_type !== Meta.WindowType.DESKTOP &&
            this._window.showing_on_its_workspace();
    }
-});
+}

-let WorkspaceLayout = GObject.registerClass(
 class WorkspaceLayout extends Clutter.LayoutManager {
+    static {
+        GObject.registerClass(this);
+    }
+
    vfunc_get_preferred_width() {
        return [0, 0];
    }
@@ -104,12 +110,15 @@ class WorkspaceLayout extends Clutter.LayoutManager {
            child.allocate(childBox);
        }
    }
-});
+}

-let WorkspaceThumbnail = GObject.registerClass(
 class WorkspaceThumbnail extends St.Button {
-    _init(index) {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(index) {
+        super({
            style_class: 'workspace',
            child: new Clutter.Actor({
                layout_manager: new WorkspaceLayout(),
@@ -246,12 +255,15 @@ class WorkspaceThumbnail extends St.Button {
        this._workspace.disconnect(this._windowRemovedId);
        global.display.disconnect(this._restackedId);
    }
-});
+}

-let WorkspaceIndicator = GObject.registerClass(
 class WorkspaceIndicator extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Workspace Indicator'));
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super(0.5, _('Workspace Indicator'));

        let container = new St.Widget({
            layout_manager: new Clutter.BinLayout(),
@@ -298,7 +310,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
        this._updateThumbnails();
        this._updateThumbnailVisibility();

-        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
+        this._settings = new Gio.Settings({schema_id: WORKSPACE_SCHEMA});
        this._settingsChangedId = this._settings.connect(
            `changed::${WORKSPACE_KEY}`,
            this._updateMenuLabels.bind(this));
@@ -319,7 +331,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    _updateThumbnailVisibility() {
-        const { workspaceManager } = global;
+        const {workspaceManager} = global;
        const vertical = workspaceManager.layout_rows === -1;
        const useMenu =
            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
@@ -440,7 +452,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
        let newIndex = global.workspace_manager.get_active_workspace_index() + diff;
        this._activate(newIndex);
    }
-});
+}

 /** */
 function init() {
--- a/extensions/workspace-indicator/meson.build
+++ b/extensions/workspace-indicator/meson.build
@@ -3,5 +3,6 @@ extension_data += configure_file(
  output: metadata_name,
  configuration: metadata_conf
 )
+extension_data += files('stylesheet.css')

 extension_sources += files('prefs.js')
--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -1,7 +1,7 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init buildPrefsWidget */

-const { Adw, Gio, GLib, GObject, Gtk, Pango } = imports.gi;
+const {Adw, Gio, GLib, GObject, Gtk, Pango} = imports.gi;

 const ExtensionUtils = imports.misc.extensionUtils;

@@ -11,13 +11,131 @@ const N_ = e => e;
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';

-const WorkspaceSettingsWidget = GObject.registerClass(
+class NewItem extends GObject.Object {}
+GObject.registerClass(NewItem);
+
+class NewItemModel extends GObject.Object {
+    static [GObject.interfaces] = [Gio.ListModel];
+    static {
+        GObject.registerClass(this);
+    }
+
+    #item = new NewItem();
+
+    vfunc_get_item_type() {
+        return NewItem;
+    }
+
+    vfunc_get_n_items() {
+        return 1;
+    }
+
+    vfunc_get_item(_pos) {
+        return this.#item;
+    }
+}
+
+class WorkspacesList extends GObject.Object {
+    static [GObject.interfaces] = [Gio.ListModel];
+    static {
+        GObject.registerClass(this);
+    }
+
+    #settings = new Gio.Settings({schema_id: WORKSPACE_SCHEMA});
+    #names = this.#settings.get_strv(WORKSPACE_KEY);
+    #items = Gtk.StringList.new(this.#names);
+    #changedId;
+
+    constructor() {
+        super();
+
+        this.#changedId =
+            this.#settings.connect(`changed::${WORKSPACE_KEY}`, () => {
+                const removed = this.#names.length;
+                this.#names = this.#settings.get_strv(WORKSPACE_KEY);
+                this.#items.splice(0, removed, this.#names);
+                this.items_changed(0, removed, this.#names.length);
+            });
+    }
+
+    append() {
+        const name = _('Workspace %d').format(this.#names.length + 1);
+
+        this.#names.push(name);
+        this.#settings.block_signal_handler(this.#changedId);
+        this.#settings.set_strv(WORKSPACE_KEY, this.#names);
+        this.#settings.unblock_signal_handler(this.#changedId);
+
+        const pos = this.#items.get_n_items();
+        this.#items.append(name);
+        this.items_changed(pos, 0, 1);
+    }
+
+    remove(name) {
+        const pos = this.#names.indexOf(name);
+        if (pos < 0)
+            return;
+
+        this.#names.splice(pos, 1);
+
+        this.#settings.block_signal_handler(this.#changedId);
+        this.#settings.set_strv(WORKSPACE_KEY, this.#names);
+        this.#settings.unblock_signal_handler(this.#changedId);
+
+        this.#items.remove(pos);
+        this.items_changed(pos, 1, 0);
+    }
+
+    rename(oldName, newName) {
+        const pos = this.#names.indexOf(oldName);
+        if (pos < 0)
+            return;
+
+        this.#names.splice(pos, 1, newName);
+        this.#items.splice(pos, 1, [newName]);
+
+        this.#settings.block_signal_handler(this.#changedId);
+        this.#settings.set_strv(WORKSPACE_KEY, this.#names);
+        this.#settings.unblock_signal_handler(this.#changedId);
+    }
+
+    vfunc_get_item_type() {
+        return Gtk.StringObject;
+    }
+
+    vfunc_get_n_items() {
+        return this.#items.get_n_items();
+    }
+
+    vfunc_get_item(pos) {
+        return this.#items.get_item(pos);
+    }
+}
+
 class WorkspaceSettingsWidget extends Adw.PreferencesGroup {
-    _init() {
-        super._init({
+    static {
+        GObject.registerClass(this);
+
+        this.install_action('workspaces.add', null,
+            self => self._workspaces.append());
+        this.install_action('workspaces.remove', 's',
+            (self, name, param) => self._workspaces.remove(param.unpack()));
+        this.install_action('workspaces.rename', '(ss)',
+            (self, name, param) => self._workspaces.rename(...param.deepUnpack()));
+    }
+
+    constructor() {
+        super({
            title: _('Workspace Names'),
        });

+        this._workspaces = new WorkspacesList();
+
+        const store = new Gio.ListStore({item_type: Gio.ListModel});
+        const listModel = new Gtk.FlattenListModel({model: store});
+        store.append(this._workspaces);
+        store.append(new NewItemModel());
+
        this._list = new Gtk.ListBox({
            selection_mode: Gtk.SelectionMode.NONE,
            css_classes: ['boxed-list'],
@@ -25,73 +143,21 @@ class WorkspaceSettingsWidget extends Adw.PreferencesGroup {
        this._list.connect('row-activated', (l, row) => row.edit());
        this.add(this._list);

-        this._list.append(new NewWorkspaceRow());
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this._list.insert_action_group('workspaces', this._actionGroup);
-
-        let action;
-        action = new Gio.SimpleAction({ name: 'add' });
-        action.connect('activate', () => {
-            const names = this._settings.get_strv(WORKSPACE_KEY);
-            this._settings.set_strv(WORKSPACE_KEY, [
-                ...names,
-                _('Workspace %d').format(names.length + 1),
-            ]);
-        });
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'remove',
-            parameter_type: new GLib.VariantType('s'),
-        });
-        action.connect('activate', (a, param) => {
-            const removed = param.deepUnpack();
-            this._settings.set_strv(WORKSPACE_KEY,
-                this._settings.get_strv(WORKSPACE_KEY)
-                    .filter(name => name !== removed));
-        });
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({ name: 'update' });
-        action.connect('activate', () => {
-            const names = this._getWorkspaceRows().map(row => row.name);
-            this._settings.set_strv(WORKSPACE_KEY, names);
-        });
-        this._actionGroup.add_action(action);
-
-        this._settings = new Gio.Settings({
-            schema_id: WORKSPACE_SCHEMA,
-        });
-        this._settings.connect(`changed::${WORKSPACE_KEY}`,
-            this._sync.bind(this));
-        this._sync();
-    }
-
-    _getWorkspaceRows() {
-        return [...this._list].filter(row => row.name);
-    }
-
-    _sync() {
-        const rows = this._getWorkspaceRows();
-
-        const oldNames = rows.map(row => row.name);
-        const newNames = this._settings.get_strv(WORKSPACE_KEY);
-
-        const removed = oldNames.filter(n => !newNames.includes(n));
-        const added = newNames.filter(n => !oldNames.includes(n));
-
-        removed.forEach(n => this._list.remove(rows.find(r => r.name === n)));
-        added.forEach(n => {
-            this._list.insert(new WorkspaceRow(n), newNames.indexOf(n));
+        this._list.bind_model(listModel, item => {
+            return item instanceof NewItem
+                ? new NewWorkspaceRow()
+                : new WorkspaceRow(item.string);
        });
    }
-});
+}

-const WorkspaceRow = GObject.registerClass(
 class WorkspaceRow extends Adw.PreferencesRow {
-    _init(name) {
-        super._init({ name });
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(name) {
+        super({name});

        const box = new Gtk.Box({
            spacing: 12,
@@ -113,12 +179,17 @@ class WorkspaceRow extends Adw.PreferencesRow {

        const button = new Gtk.Button({
            action_name: 'workspaces.remove',
-            action_target: new GLib.Variant('s', name),
            icon_name: 'edit-delete-symbolic',
            has_frame: false,
        });
        box.append(button);

+        this.bind_property_full('name',
+            button, 'action-target',
+            GObject.BindingFlags.SYNC_CREATE,
+            (bind, target) => [true, new GLib.Variant('s', target)],
+            null);
+
        this._entry = new Gtk.Entry({
            max_width_chars: 25,
        });
@@ -139,6 +210,8 @@ class WorkspaceRow extends Adw.PreferencesRow {
        this.child = this._stack;

        this._entry.connect('activate', () => {
+            this.activate_action('workspaces.rename',
+                new GLib.Variant('(ss)', [this.name, this._entry.text]));
            this.name = this._entry.text;
            this._stopEdit();
        });
@@ -147,11 +220,6 @@ class WorkspaceRow extends Adw.PreferencesRow {
                return;
            this._stopEdit();
        });
-
-        this.connect('notify::name', () => {
-            button.action_target = new GLib.Variant('s', this.name);
-            this.activate_action('workspaces.update', null);
-        });
    }

    edit() {
@@ -164,12 +232,15 @@ class WorkspaceRow extends Adw.PreferencesRow {
        this.grab_focus();
        this._stack.visible_child_name = 'display';
    }
-});
+}

-const NewWorkspaceRow = GObject.registerClass(
 class NewWorkspaceRow extends Adw.PreferencesRow {
-    _init() {
-        super._init({
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super({
            action_name: 'workspaces.add',
            child: new Gtk.Image({
                icon_name: 'list-add-symbolic',
@@ -183,7 +254,7 @@ class NewWorkspaceRow extends Adw.PreferencesRow {
        this.update_property(
            [Gtk.AccessibleProperty.LABEL], [_('Add Workspace')]);
    }
-});
+}

 /** */
 function init() {
--- a/lint/eslintrc-gjs.yml
+++ b/lint/eslintrc-gjs.yml
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
 # SPDX-FileCopyrightText: 2018 Claudio André <claudioandre.br@gmail.com>
 env:
-  es6: true
-  es2020: true
+  es2021: true
 extends: 'eslint:recommended'
 plugins:
  - jsdoc
@@ -86,7 +85,10 @@ rules:
  linebreak-style:
    - error
    - unix
-  lines-between-class-members: error
+  lines-between-class-members:
+    - error
+    - always
+    - exceptAfterSingleLine: true
  max-nested-callbacks: error
  max-statements-per-line: error
  new-parens: error
@@ -259,5 +261,10 @@ globals:
  window: readonly
  TextEncoder: readonly
  TextDecoder: readonly
+  console: readonly
+  setTimeout: readonly
+  setInterval: readonly
+  clearTimeout: readonly
+  clearInterval: readonly
 parserOptions:
-  ecmaVersion: 2020
+  ecmaVersion: 2022
--- a/lint/eslintrc-shell.yml
+++ b/lint/eslintrc-shell.yml
@@ -3,9 +3,10 @@ rules:
    - error
    - properties: never
      allow: [^vfunc_, ^on_]
-  object-curly-spacing:
+  consistent-return: error
+  eqeqeq:
    - error
-    - always
+    - smart
  prefer-arrow-callback: error
 globals:
  global: readonly
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '42.beta',
+  version: '44.beta',
  meson_version: '>= 0.53.0',
  license: 'GPL2+'
 )
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -33,6 +33,7 @@ id
 is
 it
 ja
+ka
 kab
 kk
 km
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`/* This extensions requires no special styling */`