update README.md

Support installing transparent and non-transparent variant in parallel

HACKING.md

@@ -24,7 +24,7 @@ This theme uses node-sass/libsass to process the various .scss files. Never edit
 
 * `main.rc` contains the major part of the theme
 
-* `panel.rc` contains the panel styling for XFCE and Mate
+* `panel.rc` contains the panel styling for Xfce and MATE
 
 * `apps.rc` contains some application specific rules
 

README.md

@@ -1,101 +1,76 @@
 # Arc Theme
 
-Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments like Gnome, Unity, Budgie, Pantheon, XFCE, Mate, etc.
+Arc is a flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments like GNOME, Unity, Budgie, Pantheon, Xfce, MATE, etc.
 
-###Arc is available in three variants 
+## Arc is available in three variants 
 
-#####Arc
+##### Arc
 
 ![A screenshot of the Arc theme](http://i.imgur.com/Ph5ObOa.png)
 
-#####Arc-Darker
+##### Arc-Darker
 
 ![A screenshot of the Arc-Darker theme](http://i.imgur.com/NC6dqyl.png)
 
-#####Arc-Dark
+##### Arc-Dark
 
 ![A screenshot of the Arc-Dark theme](http://i.imgur.com/5AGlCnA.png)
 
+## Installation
 
-### Requirements
+### Packages
 
-* Gnome/GTK3 3.14 - 3.22
+|Distro|Package Name/Link|
+|:----:|:----:|
+| Arch Linux | `arc-gtk-theme`, [`gtk-theme-arc-git`](https://aur.archlinux.org/packages/gtk-theme-arc-git) (AUR) |
+| Debian 8 | [OBS Repo][obs-repo] |
+| Debian Testing/Unstable | `arc-theme` |
+| Fedora 21 - 23 | [OBS Repo][obs-repo] |
+| Fedora 24 -25 | `arc-theme` |
+| Gentoo/Funtoo | `x11-themes/arc-theme` from the [Scriptkitties Overlay][sk-overlay] |
+| openSUSE | [OBS Repo][obs-repo] |
+| Solus | `arc-gtk-theme` |
+| Ubuntu 15.04 - 16.04 | [OBS Repo][obs-repo] |
+| Ubuntu 16.10 | `arc-theme` |
+
+**elementary OS Note:** elementary OS Freya users can install the package for Ubuntu 15.04, Loki users can install the package for Ubuntu 16.04.
+
+**AUR Note:** If you're having trouble with the AUR packages please email the package maintainer at zach@zach-adams.com before creating an issue.
+
+A non-transparent version of the theme is available here: [Arc Solid OBS repo](http://software.opensuse.org/download.html?project=home%3AHorst3180&package=arc-theme-solid)
+
+--
+
+### Manual Installation
+
+To build the theme the follwing packages are required 
+* `autoconf`
+* `automake`
+* `pkg-config` or `pkgconfig` for Fedora
+* `libgtk-3-dev` for Debian based distros or `gtk3-devel` for RPM based distros
+* `git` to clone the source directory
+
+**Note:** For distributions which don't ship separate development packages, just the GTK 3 package is needed instead of the `-dev` packages.
+
+For the theme to function properly, install the following
+* GNOME Shell 3.14 - 3.24, GTK 3.14 - 3.22
 * The `gnome-themes-standard` package
-* The murrine engine. This has different names depending on your distro.
+* The murrine engine. This has different names depending on the distro.
   * `gtk-engine-murrine` (Arch Linux)
   * `gtk2-engines-murrine` (Debian, Ubuntu, elementary OS)
   * `gtk-murrine-engine` (Fedora)
   * `gtk2-engine-murrine` (openSUSE)
   * `gtk-engines-murrine` (Gentoo)
 
-Main distributions that meet these requirements are
-
-* Arch Linux and Arch Linux based distros
-* Ubuntu 15.04 or newer (**Ubuntu 14.04 and 14.10 are not supported**)
-* elementary OS Freya/Loki
-* Debian 8, Testing or Unstable
-* Gentoo
-* Fedora 21 or newer
-* openSUSE 13.2, Leap 42.1 and Tumbleweed
-
-Derivatives of these distributions should work, as well.
-
-If your distribution isn't listed, please check the requirements yourself.
-
-### Installation
-
-**Important:** Remove all older versions of the theme from your system before you proceed any further.
-
-    sudo rm -rf /usr/share/themes/{Arc,Arc-Darker,Arc-Dark}
-    rm -rf ~/.local/share/themes/{Arc,Arc-Darker,Arc-Dark}
-    rm -rf ~/.themes/{Arc,Arc-Darker,Arc-Dark}
-
-#### Packages
-
-Prebuilt packages for Ubuntu, Debian, Fedora and openSUSE are available at  
-http://software.opensuse.org/download.html?project=home%3AHorst3180&package=arc-theme  
-
-A non-transparent version of the theme is available here  
-http://software.opensuse.org/download.html?project=home%3AHorst3180&package=arc-theme-solid  
-
-**Note:** elementary OS Freya users can install the package for Ubuntu 15.04, Loki user can install the package for Ubuntu 16.04
-
---
-
-Arch Linux users can install the theme from the AUR
-
-**Official Releases**: https://aur.archlinux.org/packages/gtk-theme-arc/  
-
-**Development Releases**: https://aur.archlinux.org/packages/gtk-theme-arc-git/  
-
-**Note:** If you're having trouble with the AUR packages please email the package maintainer at zach@zach-adams.com before creating an issue.
-
---
-
-Gentoo/Funtoo users can install `x11-themes/arc-theme` from the [Scriptkitties Overlay][sk-overlay].
-
---
-
-#### Manual Installation
-
-To build the theme you'll need 
-* `autoconf`
-* `automake`
-* `pkg-config` or `pkgconfig` if you use Fedora
-* `libgtk-3-dev` for Debian based distros or `gtk3-devel` for RPM based distros
-* `git` if you want to clone the source directory
-
-If your distribution doesn't ship separate development packages you just need GTK 3 instead of the `-dev` packages.
-
 Install the theme with the following commands
 
-**1. Get the source**
+#### 1. Get the source
 
-If you want to install the latest version from git, clone the repository with
+Clone the git repository with
 
     git clone https://github.com/horst3180/arc-theme --depth 1 && cd arc-theme
 
-**2. Build and install the theme**
+#### 2. Build and install the theme
 
     ./autogen.sh --prefix=/usr
     sudo make install
@@ -114,44 +89,51 @@ Other options to pass to autogen.sh are
     --disable-unity            disable Unity support
     --disable-xfwm             disable XFWM support
 
-    --with-gnome=<version>     build the theme for a specific Gnome version (3.14, 3.16, 3.18, 3.20)
-                               Note: Normally the correct version is detected automatically and this
+    --with-gnome=<version>     build the theme for a specific GNOME version (3.14, 3.16, 3.18, 3.20, 3.22)
+                               Note 1: Normally the correct version is detected automatically and this
                                option should not be needed.
+                               Note 2: For GNOME 3.24, use --with-gnome-version=3.22
+                               (this works for now, the build system will be improved in the future)
 
-After the installation is complete you can activate the theme with `gnome-tweak-tool` or a similar program by selecting `Arc`, `Arc-Darker` or `Arc-Dark` as Window/GTK+ theme and `Arc` or `Arc-Dark` as Gnome-Shell and Xfce-Notify theme.
+After the installation is complete the theme can be activated with `gnome-tweak-tool` or a similar program by selecting `Arc`, `Arc-Darker` or `Arc-Dark` as Window/GTK+ theme and `Arc` or `Arc-Dark` as GNOME Shell/Cinnamon theme.
 
-**Uninstall the theme**
+If the `--disable-transparency` option was used, the theme will be installed as `Arc-solid`, `Arc-Darker-solid` and `Arc-Dark-solid`.
+
+## Uninstall
 
 Run
 
     sudo make uninstall
 
-from the same directory as this README resides in, or
+from the cloned git repository, or
 
     sudo rm -rf /usr/share/themes/{Arc,Arc-Darker,Arc-Dark}
 
-### Extras
+## Extras
 
-#### Arc Firefox theme
+### Arc KDE
+A port of Arc for the Plasma 5 desktop with a few additions and extras. Available [here](https://github.com/PapirusDevelopmentTeam/arc-kde).
+
+### Arc Firefox theme
 A theme for Firefox is available at https://github.com/horst3180/arc-firefox-theme
 
-#### Arc icon theme
+### Arc icon theme
 The Arc icon theme is available at https://github.com/horst3180/arc-icon-theme
 
-#### Chrome/Chromium theme
+### Chrome/Chromium theme
 To install the Chrome/Chromium theme go to the `extra/Chrome` folder and drag and drop the arc-theme.crx or arc-dark-theme.crx file into the Chrome/Chromium window. The source of the Chrome themes is located in the source "Chrome/arc-theme" folder.
 
-#### Plank theme
+### Plank theme
 To install the Plank theme, copy the `extra/Arc-Plank` folder to `~/.local/share/plank/themes` or to `/usr/share/plank/themes` for system-wide use.
 Now open the Plank preferences window by executing `plank --preferences` from a terminal and select `Arc-Plank` as the theme.
 
-#### Arc-Dark for Ubuntu Software Center
+### Arc-Dark for Ubuntu Software Center
 The Arc Dark theme for the Ubuntu Software Center by [mervick](https://github.com/mervick) can be installed from [here](https://github.com/mervick/arc-dark-software-center). It solves readability issues with Arc Dark and the Ubuntu Software Center.
 
-### Troubleshooting
+## Troubleshooting
 
-If you have Ubuntu with a newer GTK/Gnome version than the one included by default (i.e Ubuntu 14.04 with GTK 3.14 or Ubuntu 15.04 with GTK 3.16, etc.) the prebuilt packages won't work properly and you have to install the theme manually as described above.
-This is also true for other distros with a different GTK/Gnome version than the one included by default
+If you use Ubuntu with a newer GTK/GNOME version than the one included by default (i.e Ubuntu 14.04 with GTK 3.14 or Ubuntu 15.04 with GTK 3.16, etc.) the prebuilt packages won't work properly and the theme has to be installed manually as described above.
+This is also true for other distros with a different GTK/GNOME version than the one included by default
 
 --
 
@@ -160,15 +142,15 @@ If you get artifacts like black or invisible backgrounds under Unity, disable ov
     gsettings set com.canonical.desktop.interface scrollbar-mode normal
 
 
-### Bugs
+## Bugs
 If you find a bug, please report it at https://github.com/horst3180/arc-theme/issues
 
-### License
-Arc is available under the terms the GPL-3.0. See `COPYING` for details.
+## License
+Arc is available under the terms of the GPL-3.0. See `COPYING` for details.
 
-### Full Preview
+## Full Preview
 ![A full screenshot of the Arc theme](http://i.imgur.com/tD1OBQ3.png)
 <sub>Screenshot Details: Icons: [Arc](https://github.com/horst3180/arc-icon-theme) | Launcher Icons based on [White Pixel Icons](http://darkdawg.deviantart.com/art/White-Pixel-Icons-252310560) | [Wallpaper](https://pixabay.com/photo-869593/) | Font: Futura Bk bt</sub>
 
-
+[obs-repo]: http://software.opensuse.org/download.html?project=home%3AHorst3180&package=arc-theme
 [sk-overlay]: https://c.darenet.org/scriptkitties/overlay

common/Makefile.am

@@ -1,6 +1,12 @@
+if !ENABLE_TRANSPARENCY
+themedir        = $(datadir)/themes/Arc-solid
+themedarkerdir  = $(datadir)/themes/Arc-Darker-solid
+themedarkdir    = $(datadir)/themes/Arc-Dark-solid
+else
 themedir        = $(datadir)/themes/Arc
 themedarkerdir  = $(datadir)/themes/Arc-Darker
 themedarkdir    = $(datadir)/themes/Arc-Dark
+endif
 
 ithemedir       = $(DESTDIR)$(themedir)
 ithemedarkerdir   = $(DESTDIR)$(themedarkerdir)
@@ -29,6 +35,8 @@ endif # ENABLE_DARK
 if ENABLE_CINNAMON
 	$(MKDIR_P) $(ithemedir)/cinnamon
 
+	cd $(srcdir)/cinnamon && cp thumbnail.png $(ithemedir)/cinnamon
+
 	cd $(srcdir)/cinnamon && cp -R \
 		common-assets \
 		light-assets \
@@ -38,6 +46,8 @@ if ENABLE_CINNAMON
 if ENABLE_DARK
 	$(MKDIR_P) $(ithemedarkdir)/cinnamon
 
+	cd $(srcdir)/cinnamon && cp thumbnail-dark.png $(ithemedarkdir)/cinnamon/thumbnail.png
+
 	cd $(srcdir)/cinnamon && cp -R \
 		common-assets \
 		dark-assets \
@@ -128,6 +138,8 @@ if ENABLE_GTK3
 if ENABLE_LIGHT
 	$(MKDIR_P) $(ithemedir)/gtk-3.0
 
+	cd $(srcdir)/gtk-3.0 && cp thumbnail.png $(ithemedir)/gtk-3.0
+
 	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -R \
 		assets \
 		gtk.css \
@@ -138,6 +150,8 @@ endif # ENABLE_LIGHT
 if ENABLE_DARKER
 	$(MKDIR_P) $(ithemedarkerdir)/gtk-3.0
 
+	cd $(srcdir)/gtk-3.0 && cp thumbnail.png $(ithemedarkerdir)/gtk-3.0
+
 	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -R \
 		assets \
 		gtk-dark.css \
@@ -151,6 +165,8 @@ endif # ENABLE_DARKER
 if ENABLE_DARK
 	$(MKDIR_P) $(ithemedarkdir)/gtk-3.0
 
+	cd $(srcdir)/gtk-3.0 && cp thumbnail-dark.png $(ithemedarkdir)/gtk-3.0/thumbnail.png
+
 	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -R \
 		assets \
 		$(ithemedarkdir)/gtk-3.0
@@ -198,7 +214,7 @@ if ENABLE_METACITY
 if ENABLE_LIGHT
 	cp -R $(srcdir)/metacity-1 $(ithemedir)
 
-	cd $(ithemedir)/metacity-1 && rm metacity-theme-1-dark.xml metacity-theme-2-dark.xml
+	cd $(ithemedir)/metacity-1 && rm metacity-theme-1-dark.xml metacity-theme-2-dark.xml thumbnail-dark.png
 endif # ENABLE_LIGHT
 
 if ENABLE_DARKER
@@ -206,7 +222,8 @@ if ENABLE_DARKER
 
 	cd $(ithemedarkerdir)/metacity-1 && \
 		mv metacity-theme-1-dark.xml metacity-theme-1.xml && \
-		mv metacity-theme-2-dark.xml metacity-theme-2.xml
+		mv metacity-theme-2-dark.xml metacity-theme-2.xml && \
+		mv thumbnail-dark.png thumbnail.png
 endif # ENABLE_DARKER
 
 if ENABLE_DARK
@@ -214,7 +231,8 @@ if ENABLE_DARK
 
 	cd $(ithemedarkdir)/metacity-1 && \
 		mv metacity-theme-1-dark.xml metacity-theme-1.xml && \
-		mv metacity-theme-2-dark.xml metacity-theme-2.xml
+		mv metacity-theme-2-dark.xml metacity-theme-2.xml && \
+		mv thumbnail-dark.png thumbnail.png
 endif # ENABLE_DARK
 
 endif # ENABLE_METACITY

common/cinnamon/cinnamon-dark.css

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 stage {
   font-family: Futura Bk bt, sans, Sans-Serif;
   font-size: 9pt;
@@ -7,7 +6,9 @@ stage {
 .label-shadow {
   color: transparent; }
 
-.popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button {
+.menu #notification .notification-button, .menu #notification .notification-icon-button,
+.popup-menu #notification .notification-button,
+.popup-menu #notification .notification-icon-button, .sound-button {
   min-height: 20px;
   padding: 5px 32px;
   transition-duration: 0;
@@ -16,33 +17,59 @@ stage {
   background-color: #444a58;
   border: 1px solid #2b2e39;
   box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
-  .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
+  .menu #notification .notification-button, .menu #notification .notification-icon-button,
+  .popup-menu #notification .notification-button,
+  .popup-menu #notification .notification-icon-button, .sound-button, .menu #notification .notification-button:focus, .menu #notification .notification-icon-button:focus,
+  .popup-menu #notification .notification-button:focus,
+  .popup-menu #notification .notification-icon-button:focus, .sound-button:focus, .menu #notification .notification-button:hover, .menu #notification .notification-icon-button:hover,
+  .popup-menu #notification .notification-button:hover,
+  .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover, .menu #notification .notification-button:hover:focus, .menu #notification .notification-icon-button:hover:focus,
+  .popup-menu #notification .notification-button:hover:focus,
+  .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus, .menu #notification .notification-button:active, .menu #notification .notification-icon-button:active,
+  .popup-menu #notification .notification-button:active,
+  .popup-menu #notification .notification-icon-button:active, .sound-button:active, .menu #notification .notification-button:active:focus, .menu #notification .notification-icon-button:active:focus,
+  .popup-menu #notification .notification-button:active:focus,
+  .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus, .menu #notification .notification-button:insensitive, .menu #notification .notification-icon-button:insensitive,
+  .popup-menu #notification .notification-button:insensitive,
+  .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
     border-radius: 2px; }
-  .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus {
+  .menu #notification .notification-button:focus, .menu #notification .notification-icon-button:focus,
+  .popup-menu #notification .notification-button:focus,
+  .popup-menu #notification .notification-icon-button:focus, .sound-button:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
     border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
-  .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover {
+  .menu #notification .notification-button:hover, .menu #notification .notification-icon-button:hover,
+  .popup-menu #notification .notification-button:hover,
+  .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #505666;
     border: 1px solid #2b2e39;
     box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); }
-  .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus {
+  .menu #notification .notification-button:hover:focus, .menu #notification .notification-icon-button:hover:focus,
+  .popup-menu #notification .notification-button:hover:focus,
+  .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
     border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
-  .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus {
+  .menu #notification .notification-button:active, .menu #notification .notification-icon-button:active,
+  .popup-menu #notification .notification-button:active,
+  .popup-menu #notification .notification-icon-button:active, .sound-button:active, .menu #notification .notification-button:active:focus, .menu #notification .notification-icon-button:active:focus,
+  .popup-menu #notification .notification-button:active:focus,
+  .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
     background-color: #5294e2;
     border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px #5294e2; }
-  .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
+  .menu #notification .notification-button:insensitive, .menu #notification .notification-icon-button:insensitive,
+  .popup-menu #notification .notification-button:insensitive,
+  .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: rgba(211, 218, 227, 0.45);
     border: 1px solid rgba(43, 46, 57, 0.55);
@@ -76,6 +103,7 @@ stage {
     border: 1px solid rgba(26, 28, 34, 0.35);
     background-color: rgba(102, 109, 132, 0.2); }
 
+.menu #notification StEntry,
 .popup-menu #notification StEntry, #menu-search-entry {
   padding: 7px;
   caret-size: 1px;
@@ -87,16 +115,20 @@ stage {
   background-color: #404552;
   border: 1px solid #2b2e39;
   box-shadow: inset 0 2px 4px rgba(64, 69, 82, 0.05); }
-  .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:hover, #menu-search-entry:hover {
+  .menu #notification StEntry:focus,
+  .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .menu #notification StEntry:hover,
+  .popup-menu #notification StEntry:hover, #menu-search-entry:hover {
     color: #D3DAE3;
     background-color: #404552;
     border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(64, 69, 82, 0.05); }
+  .menu #notification StEntry:insensitive,
   .popup-menu #notification StEntry:insensitive, #menu-search-entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     background-color: #3c414e;
     border-color: 1px solid #313440;
     box-shadow: inset 0 2px 4px rgba(60, 65, 78, 0.05); }
+  .menu #notification StEntry StIcon.capslock-warning,
   .popup-menu #notification StEntry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning {
     icon-size: 16px;
     warning-color: #F27835;
@@ -249,44 +281,58 @@ StScrollBar {
   font-weight: normal;
   text-align: center; }
 
+.menu,
 .popup-menu,
 .popup-combo-menu {
-  color: white;
-  min-width: 200px;
   color: #D3DAE3;
   border-image: url("dark-assets/menu/menu.svg") 9 9 9 9; }
+  .menu-arrow,
   .popup-menu-arrow {
     icon-size: 16px; }
+  .menu .popup-sub-menu,
   .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu {
     background-gradient-direction: none;
     box-shadow: none;
     border-image: url("dark-assets/menu/submenu.svg") 9 9 9 9; }
+    .menu .popup-sub-menu .popup-menu-item:ltr,
     .popup-menu .popup-sub-menu .popup-menu-item:ltr, .popup-combo-menu .popup-sub-menu .popup-menu-item:ltr {
       padding-right: 0em; }
+    .menu .popup-sub-menu .popup-menu-item:rtl,
     .popup-menu .popup-sub-menu .popup-menu-item:rtl, .popup-combo-menu .popup-sub-menu .popup-menu-item:rtl {
       padding-left: 0em; }
+    .menu .popup-sub-menu StScrollBar,
     .popup-menu .popup-sub-menu StScrollBar, .popup-combo-menu .popup-sub-menu StScrollBar {
       padding: 4px; }
-      .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle, .popup-combo-menu .popup-sub-menu StScrollBar StBin#trough, .popup-combo-menu .popup-sub-menu StScrollBar StBin#vhandle {
+      .menu .popup-sub-menu StScrollBar StBin#trough, .menu .popup-sub-menu StScrollBar StBin#vhandle,
+      .popup-menu .popup-sub-menu StScrollBar StBin#trough,
+      .popup-menu .popup-sub-menu StScrollBar StBin#vhandle, .popup-combo-menu .popup-sub-menu StScrollBar StBin#trough, .popup-combo-menu .popup-sub-menu StScrollBar StBin#vhandle {
         border-width: 0; }
+  .menu .popup-menu-content,
   .popup-menu .popup-menu-content, .popup-combo-menu .popup-menu-content {
     padding: 1em 0em 1em 0em; }
+  .menu .popup-menu-item,
   .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item {
     padding: .4em 1.75em;
     spacing: 1em; }
+    .menu .popup-menu-item:active,
     .popup-menu .popup-menu-item:active, .popup-combo-menu .popup-menu-item:active {
       color: #ffffff;
       background-color: transparent;
       border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; }
+    .menu .popup-menu-item:insensitive,
     .popup-menu .popup-menu-item:insensitive, .popup-combo-menu .popup-menu-item:insensitive {
       color: rgba(211, 218, 227, 0.5);
       background: none; }
+  .menu .popup-inactive-menu-item,
   .popup-menu .popup-inactive-menu-item, .popup-combo-menu .popup-inactive-menu-item {
     color: #D3DAE3; }
+    .menu .popup-inactive-menu-item:insensitive,
     .popup-menu .popup-inactive-menu-item:insensitive, .popup-combo-menu .popup-inactive-menu-item:insensitive {
       color: rgba(211, 218, 227, 0.45); }
+  .menu .popup-menu-item:active .popup-inactive-menu-item,
   .popup-menu .popup-menu-item:active .popup-inactive-menu-item, .popup-combo-menu .popup-menu-item:active .popup-inactive-menu-item {
     color: #ffffff; }
+  .menu-icon,
   .popup-menu-icon {
     icon-size: 16px; }
 
@@ -305,11 +351,11 @@ StScrollBar {
   spacing: 1em; }
 
 .popup-separator-menu-item {
-  height: 2px;
-  margin: 10px 0px;
-  background-color: transparent;
-  border: none;
-  border-image: url("common-assets/menu-separator.svg") 1 1 1 1; }
+  -gradient-height: 2px;
+  -gradient-start: transparent;
+  -gradient-end: transparent;
+  -margin-horizontal: 1.5em;
+  height: 1em; }
 
 .popup-alternating-menu-item:alternate {
   font-weight: normal; }
@@ -325,28 +371,43 @@ StScrollBar {
 
 #panel {
   font-weight: bold;
-  height: 2.1em;
-  min-height: 27px; }
+  height: 27px;
+  width: 32px; }
+  #panel:highlight {
+    border-image: none;
+    background-color: rgba(252, 65, 56, 0.5); }
   #panelLeft {
     spacing: 4px; }
     #panelLeft:dnd {
       background-gradient-direction: vertical;
       background-gradient-start: rgba(255, 0, 0, 0.05);
       background-gradient-end: rgba(255, 0, 0, 0.2); }
-    #panelLeft:ltr · {
+    #panelLeft:ltr {
       padding-right: 4px; }
-    #panelLeft:rtl · {
+    #panelLeft:rtl {
       padding-left: 4px; }
+    #panelLeft.vertical {
+      padding: 0; }
+      #panelLeft.vertical:ltr {
+        padding-right: 0px; }
+      #panelLeft.vertical:rtl {
+        padding-left: 0px; }
   #panelRight:dnd {
     background-gradient-direction: vertical;
     background-gradient-start: rgba(0, 0, 255, 0.05);
     background-gradient-end: rgba(0, 0, 255, 0.2); }
-  #panelRight:ltr · {
+  #panelRight:ltr {
     padding-left: 4px;
     spacing: 0px; }
-  #panelRight:rtl · {
+  #panelRight:rtl {
     padding-right: 4px;
     spacing: 0px; }
+  #panelRight.vertical {
+    padding: 0; }
+    #panelRight.vertical:ltr {
+      padding-right: 0px; }
+    #panelRight.vertical:rtl {
+      padding-left: 0px; }
   #panelCenter {
     spacing: 4px; }
     #panelCenter:dnd {
@@ -354,7 +415,7 @@ StScrollBar {
       background-gradient-start: rgba(0, 255, 0, 0.05);
       background-gradient-end: rgba(0, 255, 0, 0.2); }
 
-.panel-top, .panel-bottom {
+.panel-top, .panel-bottom, .panel-left, .panel-right {
   color: white;
   font-size: 1em;
   padding: 0px; }
@@ -365,8 +426,19 @@ StScrollBar {
 .panel-bottom {
   border-image: url("common-assets/panel/panel-bottom.svg") 1 1 1 1; }
 
+.panel-left {
+  border-image: url("common-assets/panel/panel-left.svg") 1 1 1 1; }
+
+.panel-right {
+  border-image: url("common-assets/panel/panel-right.svg") 1 1 1 1; }
+
+.panel-dummy {
+  background-color: rgba(252, 65, 56, 0.5); }
+  .panel-dummy:entered {
+    background-color: rgba(252, 65, 56, 0.6); }
+
 .panel-status-button {
-  border-widht: 0;
+  border-width: 0;
   -natural-hpadding: 3px;
   -minimum-hpadding: 3px;
   font-weight: bold;
@@ -608,6 +680,10 @@ StScrollBar {
   color: rgba(211, 218, 227, 0.3);
   opacity: 1; }
 
+.calendar-week-number {
+  color: rgba(211, 218, 227, 0.7);
+  font-size: 80%; }
+
 #notification {
   border-radius: 3px;
   border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
@@ -617,10 +693,16 @@ StScrollBar {
   margin-from-right-edge-of-screen: 20px;
   width: 34em;
   color: #BAC3CF; }
+  .menu #notification,
   .popup-menu #notification {
-    color: #D3DAE3;
     border-image: url("dark-assets/misc/message.svg") 9 9 9 9; }
-    .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button {
+    .menu #notification, .menu #notification.multi-line-notification,
+    .popup-menu #notification,
+    .popup-menu #notification.multi-line-notification {
+      color: #D3DAE3; }
+    .menu #notification .notification-button, .menu #notification .notification-icon-button,
+    .popup-menu #notification .notification-button,
+    .popup-menu #notification .notification-icon-button {
       padding: 5px; }
   #notification.multi-line-notification {
     padding-bottom: 13px;
@@ -1006,6 +1088,11 @@ StScrollBar {
     padding-top: 1px; }
   .panel-top .window-list-box {
     padding-bottom: 1px; }
+  .window-list-box.vertical {
+    spacing: 4px;
+    padding: 10px 0; }
+  .window-list-box:highlight {
+    background-color: rgba(252, 65, 56, 0.5); }
 
 .window-list-item-label {
   font-weight: bold;
@@ -1015,6 +1102,7 @@ StScrollBar {
 .window-list-item-box {
   font-weight: bold;
   background-image: none;
+  padding-top: 0;
   padding-left: 8px;
   padding-right: 8px;
   transition-duration: 100;
@@ -1027,6 +1115,13 @@ StScrollBar {
       border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
     .panel-top .window-list-item-box:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus {
       border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; }
+    .panel-left .window-list-item-box:active, .panel-left .window-list-item-box:checked, .panel-left .window-list-item-box:focus {
+      border-image: url("common-assets/panel/window-list-active-left.svg") 3 1 3 3; }
+    .panel-right .window-list-item-box:active, .panel-right .window-list-item-box:checked, .panel-right .window-list-item-box:focus {
+      border-image: url("common-assets/panel/window-list-active-right.svg") 1 3 3 3; }
+  .window-list-item-box.right, .window-list-item-box.left {
+    padding-left: 0px;
+    padding-right: 0px; }
 
 .window-list-item-demands-attention {
   background-gradient-start: #F27835;
@@ -1184,18 +1279,32 @@ StScrollBar {
 
 #panel-launchers-box {
   padding-left: 7px; }
+  #panel-launchers-box.vertical {
+    padding: 2px 0; }
 
-.panel-launcher {
+.panel-launcher,
+.launcher {
   margin: 1px;
   padding: 1px;
   transition-duration: 200; }
-  .panel-launcher:hover {
+  .panel-launcher:hover,
+  .launcher:hover {
     background-gradient-direction: none;
     border: 0px solid #5294e2; }
-    .panel-bottom .panel-launcher:hover {
+    .panel-bottom .panel-launcher:hover, .panel-bottom
+    .launcher:hover {
       border-bottom-width: 1px; }
-    .panel-top .panel-launcher:hover {
+    .panel-top .panel-launcher:hover, .panel-top
+    .launcher:hover {
       border-top-width: 1px; }
+    .panel-left .panel-launcher:hover, .panel-left
+    .launcher:hover {
+      border-left-width: 1px;
+      padding-left: 0; }
+    .panel-right .panel-launcher:hover, .panel-right
+    .launcher:hover {
+      border-right-width: 1px;
+      padding-right: 0; }
 
 #overview-corner {
   background-image: url("common-assets/misc/overview.png"); }
@@ -1215,9 +1324,15 @@ StScrollBar {
   color: white;
   text-shadow: none;
   transition-duration: 100; }
+  .applet-box.vertical {
+    padding: 3px 0; }
   .applet-box:hover {
     color: #ffffff;
     background-color: #5294e2; }
+  .applet-box:highlight {
+    background-image: none;
+    border-image: none;
+    background-color: rgba(252, 65, 56, 0.5); }
 
 .applet-label {
   font-weight: bold;
@@ -1248,11 +1363,15 @@ StScrollBar {
 
 .desklet {
   color: #BAC3CF; }
+  .desklet:highlight {
+    background-color: rgba(252, 65, 56, 0.5); }
   .desklet-with-borders {
     border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
     color: #BAC3CF;
     padding: 12px;
     padding-bottom: 16px; }
+    .desklet-with-borders:highlight {
+      background-color: rgba(252, 65, 56, 0.5); }
   .desklet-with-borders-and-header {
     border-image: url("common-assets/misc/desklet.svg") 9 9 9 9;
     color: #BAC3CF;
@@ -1261,6 +1380,8 @@ StScrollBar {
     border-radius-topright: 0;
     padding: 12px;
     padding-bottom: 17px; }
+    .desklet-with-borders-and-header:highlight {
+      background-color: rgba(252, 65, 56, 0.5); }
   .desklet-header {
     border-image: url("common-assets/misc/desklet-header.svg") 9 9 9 9;
     color: #BAC3CF;

common/cinnamon/cinnamon.css

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 stage {
   font-family: Futura Bk bt, sans, Sans-Serif;
   font-size: 9pt;
@@ -7,7 +6,9 @@ stage {
 .label-shadow {
   color: transparent; }
 
-.popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button {
+.menu #notification .notification-button, .menu #notification .notification-icon-button,
+.popup-menu #notification .notification-button,
+.popup-menu #notification .notification-icon-button, .sound-button {
   min-height: 20px;
   padding: 5px 32px;
   transition-duration: 0;
@@ -16,33 +17,59 @@ stage {
   background-color: #fbfbfc;
   border: 1px solid #cfd6e6;
   box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
-  .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
+  .menu #notification .notification-button, .menu #notification .notification-icon-button,
+  .popup-menu #notification .notification-button,
+  .popup-menu #notification .notification-icon-button, .sound-button, .menu #notification .notification-button:focus, .menu #notification .notification-icon-button:focus,
+  .popup-menu #notification .notification-button:focus,
+  .popup-menu #notification .notification-icon-button:focus, .sound-button:focus, .menu #notification .notification-button:hover, .menu #notification .notification-icon-button:hover,
+  .popup-menu #notification .notification-button:hover,
+  .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover, .menu #notification .notification-button:hover:focus, .menu #notification .notification-icon-button:hover:focus,
+  .popup-menu #notification .notification-button:hover:focus,
+  .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus, .menu #notification .notification-button:active, .menu #notification .notification-icon-button:active,
+  .popup-menu #notification .notification-button:active,
+  .popup-menu #notification .notification-icon-button:active, .sound-button:active, .menu #notification .notification-button:active:focus, .menu #notification .notification-icon-button:active:focus,
+  .popup-menu #notification .notification-button:active:focus,
+  .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus, .menu #notification .notification-button:insensitive, .menu #notification .notification-icon-button:insensitive,
+  .popup-menu #notification .notification-button:insensitive,
+  .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
     border-radius: 2px; }
-  .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus {
+  .menu #notification .notification-button:focus, .menu #notification .notification-icon-button:focus,
+  .popup-menu #notification .notification-button:focus,
+  .popup-menu #notification .notification-icon-button:focus, .sound-button:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
-  .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover {
+  .menu #notification .notification-button:hover, .menu #notification .notification-icon-button:hover,
+  .popup-menu #notification .notification-button:hover,
+  .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: white;
     border: 1px solid #cfd6e6;
     box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
-  .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus {
+  .menu #notification .notification-button:hover:focus, .menu #notification .notification-icon-button:hover:focus,
+  .popup-menu #notification .notification-button:hover:focus,
+  .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
-  .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus {
+  .menu #notification .notification-button:active, .menu #notification .notification-icon-button:active,
+  .popup-menu #notification .notification-button:active,
+  .popup-menu #notification .notification-icon-button:active, .sound-button:active, .menu #notification .notification-button:active:focus, .menu #notification .notification-icon-button:active:focus,
+  .popup-menu #notification .notification-button:active:focus,
+  .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
     background-color: #5294e2;
     border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px #5294e2; }
-  .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
+  .menu #notification .notification-button:insensitive, .menu #notification .notification-icon-button:insensitive,
+  .popup-menu #notification .notification-button:insensitive,
+  .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: rgba(92, 97, 108, 0.55);
     border: 1px solid rgba(207, 214, 230, 0.55);
@@ -76,6 +103,7 @@ stage {
     border: 1px solid rgba(26, 28, 34, 0.35);
     background-color: rgba(102, 109, 132, 0.2); }
 
+.menu #notification StEntry,
 .popup-menu #notification StEntry, #menu-search-entry {
   padding: 7px;
   caret-size: 1px;
@@ -87,16 +115,20 @@ stage {
   background-color: #ffffff;
   border: 1px solid #cfd6e6;
   box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
-  .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:hover, #menu-search-entry:hover {
+  .menu #notification StEntry:focus,
+  .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .menu #notification StEntry:hover,
+  .popup-menu #notification StEntry:hover, #menu-search-entry:hover {
     color: #5c616c;
     background-color: #ffffff;
     border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
+  .menu #notification StEntry:insensitive,
   .popup-menu #notification StEntry:insensitive, #menu-search-entry:insensitive {
     color: rgba(92, 97, 108, 0.55);
     background-color: #fbfbfb;
     border-color: 1px solid #e0e4ee;
     box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.05); }
+  .menu #notification StEntry StIcon.capslock-warning,
   .popup-menu #notification StEntry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning {
     icon-size: 16px;
     warning-color: #F27835;
@@ -249,44 +281,58 @@ StScrollBar {
   font-weight: normal;
   text-align: center; }
 
+.menu,
 .popup-menu,
 .popup-combo-menu {
-  color: white;
-  min-width: 200px;
   color: #5c616c;
   border-image: url("light-assets/menu/menu.svg") 9 9 9 9; }
+  .menu-arrow,
   .popup-menu-arrow {
     icon-size: 16px; }
+  .menu .popup-sub-menu,
   .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu {
     background-gradient-direction: none;
     box-shadow: none;
     border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; }
+    .menu .popup-sub-menu .popup-menu-item:ltr,
     .popup-menu .popup-sub-menu .popup-menu-item:ltr, .popup-combo-menu .popup-sub-menu .popup-menu-item:ltr {
       padding-right: 0em; }
+    .menu .popup-sub-menu .popup-menu-item:rtl,
     .popup-menu .popup-sub-menu .popup-menu-item:rtl, .popup-combo-menu .popup-sub-menu .popup-menu-item:rtl {
       padding-left: 0em; }
+    .menu .popup-sub-menu StScrollBar,
     .popup-menu .popup-sub-menu StScrollBar, .popup-combo-menu .popup-sub-menu StScrollBar {
       padding: 4px; }
-      .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle, .popup-combo-menu .popup-sub-menu StScrollBar StBin#trough, .popup-combo-menu .popup-sub-menu StScrollBar StBin#vhandle {
+      .menu .popup-sub-menu StScrollBar StBin#trough, .menu .popup-sub-menu StScrollBar StBin#vhandle,
+      .popup-menu .popup-sub-menu StScrollBar StBin#trough,
+      .popup-menu .popup-sub-menu StScrollBar StBin#vhandle, .popup-combo-menu .popup-sub-menu StScrollBar StBin#trough, .popup-combo-menu .popup-sub-menu StScrollBar StBin#vhandle {
         border-width: 0; }
+  .menu .popup-menu-content,
   .popup-menu .popup-menu-content, .popup-combo-menu .popup-menu-content {
     padding: 1em 0em 1em 0em; }
+  .menu .popup-menu-item,
   .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item {
     padding: .4em 1.75em;
     spacing: 1em; }
+    .menu .popup-menu-item:active,
     .popup-menu .popup-menu-item:active, .popup-combo-menu .popup-menu-item:active {
       color: #ffffff;
       background-color: transparent;
       border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; }
+    .menu .popup-menu-item:insensitive,
     .popup-menu .popup-menu-item:insensitive, .popup-combo-menu .popup-menu-item:insensitive {
       color: rgba(92, 97, 108, 0.5);
       background: none; }
+  .menu .popup-inactive-menu-item,
   .popup-menu .popup-inactive-menu-item, .popup-combo-menu .popup-inactive-menu-item {
     color: #5c616c; }
+    .menu .popup-inactive-menu-item:insensitive,
     .popup-menu .popup-inactive-menu-item:insensitive, .popup-combo-menu .popup-inactive-menu-item:insensitive {
       color: rgba(92, 97, 108, 0.55); }
+  .menu .popup-menu-item:active .popup-inactive-menu-item,
   .popup-menu .popup-menu-item:active .popup-inactive-menu-item, .popup-combo-menu .popup-menu-item:active .popup-inactive-menu-item {
     color: #ffffff; }
+  .menu-icon,
   .popup-menu-icon {
     icon-size: 16px; }
 
@@ -305,11 +351,11 @@ StScrollBar {
   spacing: 1em; }
 
 .popup-separator-menu-item {
-  height: 2px;
-  margin: 10px 0px;
-  background-color: transparent;
-  border: none;
-  border-image: url("common-assets/menu-separator.svg") 1 1 1 1; }
+  -gradient-height: 2px;
+  -gradient-start: transparent;
+  -gradient-end: transparent;
+  -margin-horizontal: 1.5em;
+  height: 1em; }
 
 .popup-alternating-menu-item:alternate {
   font-weight: normal; }
@@ -325,28 +371,43 @@ StScrollBar {
 
 #panel {
   font-weight: bold;
-  height: 2.1em;
-  min-height: 27px; }
+  height: 27px;
+  width: 32px; }
+  #panel:highlight {
+    border-image: none;
+    background-color: rgba(252, 65, 56, 0.5); }
   #panelLeft {
     spacing: 4px; }
     #panelLeft:dnd {
       background-gradient-direction: vertical;
       background-gradient-start: rgba(255, 0, 0, 0.05);
       background-gradient-end: rgba(255, 0, 0, 0.2); }
-    #panelLeft:ltr · {
+    #panelLeft:ltr {
       padding-right: 4px; }
-    #panelLeft:rtl · {
+    #panelLeft:rtl {
       padding-left: 4px; }
+    #panelLeft.vertical {
+      padding: 0; }
+      #panelLeft.vertical:ltr {
+        padding-right: 0px; }
+      #panelLeft.vertical:rtl {
+        padding-left: 0px; }
   #panelRight:dnd {
     background-gradient-direction: vertical;
     background-gradient-start: rgba(0, 0, 255, 0.05);
     background-gradient-end: rgba(0, 0, 255, 0.2); }
-  #panelRight:ltr · {
+  #panelRight:ltr {
     padding-left: 4px;
     spacing: 0px; }
-  #panelRight:rtl · {
+  #panelRight:rtl {
     padding-right: 4px;
     spacing: 0px; }
+  #panelRight.vertical {
+    padding: 0; }
+    #panelRight.vertical:ltr {
+      padding-right: 0px; }
+    #panelRight.vertical:rtl {
+      padding-left: 0px; }
   #panelCenter {
     spacing: 4px; }
     #panelCenter:dnd {
@@ -354,7 +415,7 @@ StScrollBar {
       background-gradient-start: rgba(0, 255, 0, 0.05);
       background-gradient-end: rgba(0, 255, 0, 0.2); }
 
-.panel-top, .panel-bottom {
+.panel-top, .panel-bottom, .panel-left, .panel-right {
   color: white;
   font-size: 1em;
   padding: 0px; }
@@ -365,8 +426,19 @@ StScrollBar {
 .panel-bottom {
   border-image: url("common-assets/panel/panel-bottom.svg") 1 1 1 1; }
 
+.panel-left {
+  border-image: url("common-assets/panel/panel-left.svg") 1 1 1 1; }
+
+.panel-right {
+  border-image: url("common-assets/panel/panel-right.svg") 1 1 1 1; }
+
+.panel-dummy {
+  background-color: rgba(252, 65, 56, 0.5); }
+  .panel-dummy:entered {
+    background-color: rgba(252, 65, 56, 0.6); }
+
 .panel-status-button {
-  border-widht: 0;
+  border-width: 0;
   -natural-hpadding: 3px;
   -minimum-hpadding: 3px;
   font-weight: bold;
@@ -608,6 +680,10 @@ StScrollBar {
   color: rgba(92, 97, 108, 0.3);
   opacity: 1; }
 
+.calendar-week-number {
+  color: rgba(92, 97, 108, 0.7);
+  font-size: 80%; }
+
 #notification {
   border-radius: 3px;
   border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
@@ -617,10 +693,16 @@ StScrollBar {
   margin-from-right-edge-of-screen: 20px;
   width: 34em;
   color: #BAC3CF; }
+  .menu #notification,
   .popup-menu #notification {
-    color: #5c616c;
     border-image: url("light-assets/misc/message.svg") 9 9 9 9; }
-    .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button {
+    .menu #notification, .menu #notification.multi-line-notification,
+    .popup-menu #notification,
+    .popup-menu #notification.multi-line-notification {
+      color: #5c616c; }
+    .menu #notification .notification-button, .menu #notification .notification-icon-button,
+    .popup-menu #notification .notification-button,
+    .popup-menu #notification .notification-icon-button {
       padding: 5px; }
   #notification.multi-line-notification {
     padding-bottom: 13px;
@@ -1006,6 +1088,11 @@ StScrollBar {
     padding-top: 1px; }
   .panel-top .window-list-box {
     padding-bottom: 1px; }
+  .window-list-box.vertical {
+    spacing: 4px;
+    padding: 10px 0; }
+  .window-list-box:highlight {
+    background-color: rgba(252, 65, 56, 0.5); }
 
 .window-list-item-label {
   font-weight: bold;
@@ -1015,6 +1102,7 @@ StScrollBar {
 .window-list-item-box {
   font-weight: bold;
   background-image: none;
+  padding-top: 0;
   padding-left: 8px;
   padding-right: 8px;
   transition-duration: 100;
@@ -1027,6 +1115,13 @@ StScrollBar {
       border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
     .panel-top .window-list-item-box:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus {
       border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; }
+    .panel-left .window-list-item-box:active, .panel-left .window-list-item-box:checked, .panel-left .window-list-item-box:focus {
+      border-image: url("common-assets/panel/window-list-active-left.svg") 3 1 3 3; }
+    .panel-right .window-list-item-box:active, .panel-right .window-list-item-box:checked, .panel-right .window-list-item-box:focus {
+      border-image: url("common-assets/panel/window-list-active-right.svg") 1 3 3 3; }
+  .window-list-item-box.right, .window-list-item-box.left {
+    padding-left: 0px;
+    padding-right: 0px; }
 
 .window-list-item-demands-attention {
   background-gradient-start: #F27835;
@@ -1184,18 +1279,32 @@ StScrollBar {
 
 #panel-launchers-box {
   padding-left: 7px; }
+  #panel-launchers-box.vertical {
+    padding: 2px 0; }
 
-.panel-launcher {
+.panel-launcher,
+.launcher {
   margin: 1px;
   padding: 1px;
   transition-duration: 200; }
-  .panel-launcher:hover {
+  .panel-launcher:hover,
+  .launcher:hover {
     background-gradient-direction: none;
     border: 0px solid #5294e2; }
-    .panel-bottom .panel-launcher:hover {
+    .panel-bottom .panel-launcher:hover, .panel-bottom
+    .launcher:hover {
       border-bottom-width: 1px; }
-    .panel-top .panel-launcher:hover {
+    .panel-top .panel-launcher:hover, .panel-top
+    .launcher:hover {
       border-top-width: 1px; }
+    .panel-left .panel-launcher:hover, .panel-left
+    .launcher:hover {
+      border-left-width: 1px;
+      padding-left: 0; }
+    .panel-right .panel-launcher:hover, .panel-right
+    .launcher:hover {
+      border-right-width: 1px;
+      padding-right: 0; }
 
 #overview-corner {
   background-image: url("common-assets/misc/overview.png"); }
@@ -1215,9 +1324,15 @@ StScrollBar {
   color: white;
   text-shadow: none;
   transition-duration: 100; }
+  .applet-box.vertical {
+    padding: 3px 0; }
   .applet-box:hover {
     color: #ffffff;
     background-color: #5294e2; }
+  .applet-box:highlight {
+    background-image: none;
+    border-image: none;
+    background-color: rgba(252, 65, 56, 0.5); }
 
 .applet-label {
   font-weight: bold;
@@ -1248,11 +1363,15 @@ StScrollBar {
 
 .desklet {
   color: #BAC3CF; }
+  .desklet:highlight {
+    background-color: rgba(252, 65, 56, 0.5); }
   .desklet-with-borders {
     border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
     color: #BAC3CF;
     padding: 12px;
     padding-bottom: 16px; }
+    .desklet-with-borders:highlight {
+      background-color: rgba(252, 65, 56, 0.5); }
   .desklet-with-borders-and-header {
     border-image: url("common-assets/misc/desklet.svg") 9 9 9 9;
     color: #BAC3CF;
@@ -1261,6 +1380,8 @@ StScrollBar {
     border-radius-topright: 0;
     padding: 12px;
     padding-bottom: 17px; }
+    .desklet-with-borders-and-header:highlight {
+      background-color: rgba(252, 65, 56, 0.5); }
   .desklet-header {
     border-image: url("common-assets/misc/desklet-header.svg") 9 9 9 9;
     color: #BAC3CF;

common/cinnamon/common-assets/panel/panel-left.svg

@@ -0,0 +1,79 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="27"
+   height="27"
+   viewBox="0 0 27 27"
+   id="svg4196"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="panel-left.svg">
+  <defs
+     id="defs4198" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="4.4037501"
+     inkscape:cy="17.013621"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4762" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4201">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1025.3622)">
+    <g
+       id="g4136"
+       transform="matrix(0,-1,1,0,-1025.3622,1052.3622)">
+      <rect
+         y="1025.3622"
+         x="0"
+         height="26"
+         width="27"
+         id="rect4713"
+         style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="1051.3622"
+         x="0"
+         height="1"
+         width="27"
+         id="rect4713-4"
+         style="display:inline;opacity:0.85;fill:#0f1116;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

common/cinnamon/common-assets/panel/panel-right.svg

@@ -0,0 +1,79 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="27"
+   height="27"
+   viewBox="0 0 27 27"
+   id="svg4196"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="panel-right.svg">
+  <defs
+     id="defs4198" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="4.4037501"
+     inkscape:cy="17.013621"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4762" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4201">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1025.3622)">
+    <g
+       id="g4136"
+       transform="matrix(0,-1,-1,0,1052.3622,1052.3622)">
+      <rect
+         y="1025.3622"
+         x="0"
+         height="26"
+         width="27"
+         id="rect4713"
+         style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="1051.3622"
+         x="0"
+         height="1"
+         width="27"
+         id="rect4713-4"
+         style="display:inline;opacity:0.85;fill:#0f1116;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

common/cinnamon/common-assets/panel/window-list-active-left.svg

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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"
+   inkscape:export-ydpi="90.000000"
+   inkscape:export-xdpi="90.000000"
+   width="4"
+   height="28"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="window-list-active-left.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline;enable-background:new">
+  <sodipodi:namedview
+     stroke="#ef2929"
+     fill="#f57900"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#808080"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.884764"
+     inkscape:cx="6.9544689"
+     inkscape:cy="5.3696817"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="851"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     width="400px"
+     height="300px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     gridtolerance="10000"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="1"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     objecttolerance="10000"
+     guidetolerance="10000"
+     borderlayer="true"
+     showborder="true"
+     guidecolor="#ff0b00"
+     guideopacity="1"
+     guidehicolor="#001aff"
+     guidehiopacity="0.49803922"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3123"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4137" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4139"
+       x1="14"
+       y1="298"
+       x2="14"
+       y2="300"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(272,-300)" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <cc:license
+           rdf:resource="" />
+        <dc:title></dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <dc:date />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier />
+        <dc:relation />
+        <dc:language />
+        <dc:coverage />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1"
+     transform="translate(0,-272)">
+    <rect
+       style="opacity:1;fill:url(#linearGradient4139);fill-opacity:1;stroke:none"
+       id="rect4270-9"
+       width="24"
+       height="2"
+       x="274"
+       y="-2"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>

common/cinnamon/common-assets/panel/window-list-active-right.svg

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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"
+   inkscape:export-ydpi="90.000000"
+   inkscape:export-xdpi="90.000000"
+   width="4"
+   height="28"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="window-list-active-right.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline;enable-background:new">
+  <sodipodi:namedview
+     stroke="#ef2929"
+     fill="#f57900"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#808080"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.884764"
+     inkscape:cx="6.9544689"
+     inkscape:cy="5.3696817"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="851"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     width="400px"
+     height="300px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     gridtolerance="10000"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="1"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     objecttolerance="10000"
+     guidetolerance="10000"
+     borderlayer="true"
+     showborder="true"
+     guidecolor="#ff0b00"
+     guideopacity="1"
+     guidehicolor="#001aff"
+     guidehiopacity="0.49803922"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3123"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4137" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4139"
+       x1="14"
+       y1="298"
+       x2="14"
+       y2="300"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(272,-302)" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <cc:license
+           rdf:resource="" />
+        <dc:title></dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <dc:date />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier />
+        <dc:relation />
+        <dc:language />
+        <dc:coverage />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1"
+     transform="translate(0,-272)">
+    <rect
+       style="opacity:1;fill:url(#linearGradient4139);fill-opacity:1;stroke:none"
+       id="rect4270-9"
+       width="24"
+       height="2"
+       x="274"
+       y="-4"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>

common/cinnamon/sass/_common.scss

@@ -267,10 +267,9 @@ StScrollBar {
 //
 // Popvers/Menus
 //
+.menu,
 .popup-menu,
 %menu {
-  color: white;
-  min-width: 200px;
   color: $fg_color;
   border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9;
 
@@ -335,11 +334,11 @@ StScrollBar {
 .popup-combobox-item { spacing: 1em; }
 
 .popup-separator-menu-item {
-  height: 2px; //not really the whole box
-  margin: 10px 0px;
-  background-color: transparent;
-  border: none;
-  border-image: url("common-assets/menu-separator.svg") 1 1 1 1;
+  -gradient-height: 2px;
+  -gradient-start: transparent;
+  -gradient-end: transparent;
+  -margin-horizontal: 1.5em;
+  height: 1em;
 }
 
 .popup-alternating-menu-item:alternate {
@@ -357,8 +356,13 @@ StScrollBar {
 //
 #panel {
   font-weight: bold;
-  height: 2.1em;
-  min-height: 27px;
+  height: 27px;
+  width: 32px;
+
+  &:highlight {
+    border-image: none;
+    background-color: transparentize($error_color, 0.5);
+  }
 
   &Left {
     spacing: 4px;
@@ -368,8 +372,15 @@ StScrollBar {
       background-gradient-start: rgba(255,0,0,0.05);
       background-gradient-end: rgba(255,0,0,0.2);
     }
-    &:ltr ·{ padding-right: 4px; }
-    &:rtl ·{ padding-left: 4px; }
+    &:ltr { padding-right: 4px; }
+    &:rtl { padding-left: 4px; }
+
+    &.vertical {
+      padding: 0;
+
+      &:ltr { padding-right: 0px; }
+      &:rtl { padding-left: 0px; }
+    }
   }
 
   &Right {
@@ -379,8 +390,15 @@ StScrollBar {
       background-gradient-start: rgba(0,0,255,0.05);
       background-gradient-end: rgba(0,0,255,0.2);
     }
-    &:ltr ·{ padding-left: 4px; spacing: 0px; }
-    &:rtl ·{ padding-right: 4px; spacing: 0px; }
+    &:ltr { padding-left: 4px; spacing: 0px; }
+    &:rtl { padding-right: 4px; spacing: 0px; }
+
+    &.vertical {
+      padding: 0;
+
+      &:ltr { padding-right: 0px; }
+      &:rtl { padding-left: 0px; }
+    }
   }
 
   &Center {
@@ -397,7 +415,7 @@ StScrollBar {
 .panel {
   $_panel_fg_color: $_shell_fg_color;
 
-  &-top, &-bottom {
+  &-top, &-bottom, &-left, &-right {
     color: $_panel_fg_color;
     font-size: 1em;
     padding: 0px;
@@ -405,9 +423,17 @@ StScrollBar {
 
   &-top { border-image: url('common-assets/panel/panel-top.svg') 1 1 1 1; }
   &-bottom { border-image: url('common-assets/panel/panel-bottom.svg') 1 1 1 1; }
+  &-left { border-image: url('common-assets/panel/panel-left.svg') 1 1 1 1; }
+  &-right { border-image: url('common-assets/panel/panel-right.svg') 1 1 1 1; }
+
+  &-dummy {
+    background-color: transparentize($error_color, 0.5);
+
+    &:entered { background-color: transparentize($error_color, 0.4); }
+  }
 
   &-status-button {
-    border-widht: 0;
+    border-width: 0;
     -natural-hpadding: 3px;
     -minimum-hpadding: 3px;
     font-weight: bold;
@@ -716,6 +742,11 @@ StScrollBar {
   opacity: 1;
 }
 
+.calendar-week-number {
+  color: transparentize($fg_color, 0.3);
+  font-size: 80%;
+}
+
 //
 // Notifications
 //
@@ -729,8 +760,9 @@ StScrollBar {
   width: 34em;
   color: $osd_fg_color;
 
+  .menu &,
   .popup-menu & {
-    color: $fg_color;
+    &, &.multi-line-notification { color: $fg_color; }
     border-image: url("#{$asset_path}/misc/message.svg") 9 9 9 9;
 
     .notification-button, .notification-icon-button {
@@ -1226,6 +1258,13 @@ StScrollBar {
 
     .panel-bottom & { padding-top: 1px; }
     .panel-top & { padding-bottom: 1px; }
+
+    &.vertical {
+      spacing: 4px;
+      padding: 10px 0;
+    }
+
+    &:highlight { background-color: transparentize($error_color, 0.5); }
   }
 
   &-item-label {
@@ -1237,6 +1276,7 @@ StScrollBar {
   &-item-box {
     font-weight: bold;
     background-image: none;
+    padding-top: 0;
     padding-left: 8px;
     padding-right: 8px;
     transition-duration: 100;
@@ -1250,8 +1290,14 @@ StScrollBar {
       color: $_shell_fg_color;
 
       .panel-bottom & { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
-
       .panel-top & { border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; }
+      .panel-left & { border-image: url("common-assets/panel/window-list-active-left.svg") 3 1 3 3; }
+      .panel-right & { border-image: url("common-assets/panel/window-list-active-right.svg") 1 3 3 3; }
+    }
+
+    &.right, &.left {
+      padding-left: 0px;
+      padding-right: 0px;
     }
   }
 
@@ -1445,9 +1491,14 @@ StScrollBar {
 //
 #panel-launchers-box {
   padding-left: 7px;
+
+  &.vertical {
+    padding: 2px 0;
+  }
 }
 
-.panel-launcher {
+.panel-launcher,
+.launcher {
   margin: 1px;
   padding: 1px;
   transition-duration: 200;
@@ -1458,6 +1509,8 @@ StScrollBar {
 
     .panel-bottom & { border-bottom-width: 1px; }
     .panel-top & { border-top-width: 1px; }
+    .panel-left & { border-left-width: 1px; padding-left: 0; }
+    .panel-right & { border-right-width: 1px; padding-right: 0; }
   }
 }
 
@@ -1488,10 +1541,20 @@ StScrollBar {
     text-shadow: none;
     transition-duration: 100;
 
+    &.vertical {
+      padding: 3px 0;
+    }
+
     &:hover {
       color: $selected_fg_color;
       background-color: $selected_bg_color;
     }
+
+    &:highlight {
+      background-image: none;
+      border-image: none;
+      background-color: transparentize($error_color, 0.5);
+    }
   }
 
   &-label {
@@ -1540,11 +1603,19 @@ StScrollBar {
 .desklet {
   color: $osd_fg_color;
 
+  &:highlight {
+    background-color: transparentize($error_color, 0.5);
+  }
+
   &-with-borders {
     border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
     color: $osd_fg_color;
     padding: 12px;
     padding-bottom: 16px;
+
+    &:highlight {
+      background-color: transparentize($error_color, 0.5);
+    }
   }
   &-with-borders-and-header {
     border-image: url("common-assets/misc/desklet.svg") 9 9 9 9;
@@ -1554,6 +1625,10 @@ StScrollBar {
     border-radius-topright: 0;
     padding: 12px;
     padding-bottom: 17px;
+
+    &:highlight {
+      background-color: transparentize($error_color, 0.5);
+    }
   }
   &-header {
     border-image: url("common-assets/misc/desklet-header.svg") 9 9 9 9;

common/gnome-shell/3.16/gnome-shell-dark.css

@@ -1116,16 +1116,14 @@ StScrollBar {
   color: #BAC3CF;
   background-color: rgba(53, 57, 69, 0.95);
   border-color: rgba(0, 0, 0, 0.4);
-  padding: 6px 1px 6px 0px;
+  padding: 4px 0;
   border-radius: 0 3px 3px 0; }
   #dash:rtl {
     border-radius: 3px 0 0 3px; }
   .right #dash, #dash:rtl {
-    padding: 6px 0px 6px 1px; }
-  .bottom #dash {
-    padding: 1px 6px 0px 6px; }
-  .top #dash {
-    padding: 0px 6px 1px 6px; }
+    padding: 4px 0; }
+  .top #dash, .bottom #dash {
+    padding: 0; }
   #dash .placeholder {
     background-image: url("common-assets/dash/dash-placeholder.svg");
     background-size: contain;
@@ -1134,14 +1132,11 @@ StScrollBar {
     width: 24px;
     height: 24px; }
 
-.dash-item-container > StWidget {
-  padding: 0px 4px 0px 5px; }
-  .right .dash-item-container > StWidget, .dash-item-container > StWidget:rtl {
-    padding: 0px 5px 0px 4px; }
-  .bottom .dash-item-container > StWidget {
-    padding: 4px 0px 5px 0px; }
-  .top .dash-item-container > StWidget {
-    padding: 5px 0px 4px 0px; }
+.dash-item-container > StWidget, .dash-item-container > StWidget:rtl, .right .dash-item-container > StWidget {
+  padding: 4px 8px; }
+
+.top .dash-item-container > StWidget, .bottom .dash-item-container > StWidget {
+  padding: 6px; }
 
 .dash-label {
   border-radius: 3px;
@@ -1154,12 +1149,6 @@ StScrollBar {
     -y-offset: 3px;
     -x-offset: 0; }
 
-#dash .app-well-app .overview-icon,
-.right #dash .app-well-app .overview-icon,
-.bottom #dash .app-well-app .overview-icon,
-.top #dash .app-well-app .overview-icon {
-  padding: 10px; }
-
 #dash .app-well-app:hover .overview-icon,
 .right #dash .app-well-app:hover .overview-icon,
 .bottom #dash .app-well-app:hover .overview-icon,
@@ -1176,7 +1165,7 @@ StScrollBar {
 #dash .app-well-app-running-dot {
   width: 11px;
   height: 2px;
-  margin-bottom: 6px;
+  margin-bottom: 2px;
   background-color: #5294e2; }
 
 #dashtodockContainer .app-well-app-running-dot {
@@ -1197,7 +1186,6 @@ StScrollBar {
   background-image: url("common-assets/dash/running4.svg"); }
 
 .show-apps .overview-icon {
-  padding: 11px;
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 2px;
   border: 0px solid; }

common/gnome-shell/3.16/gnome-shell.css

@@ -1116,16 +1116,14 @@ StScrollBar {
   color: #BAC3CF;
   background-color: rgba(53, 57, 69, 0.95);
   border-color: rgba(0, 0, 0, 0.4);
-  padding: 6px 1px 6px 0px;
+  padding: 4px 0;
   border-radius: 0 3px 3px 0; }
   #dash:rtl {
     border-radius: 3px 0 0 3px; }
   .right #dash, #dash:rtl {
-    padding: 6px 0px 6px 1px; }
-  .bottom #dash {
-    padding: 1px 6px 0px 6px; }
-  .top #dash {
-    padding: 0px 6px 1px 6px; }
+    padding: 4px 0; }
+  .top #dash, .bottom #dash {
+    padding: 0; }
   #dash .placeholder {
     background-image: url("common-assets/dash/dash-placeholder.svg");
     background-size: contain;
@@ -1134,14 +1132,11 @@ StScrollBar {
     width: 24px;
     height: 24px; }
 
-.dash-item-container > StWidget {
-  padding: 0px 4px 0px 5px; }
-  .right .dash-item-container > StWidget, .dash-item-container > StWidget:rtl {
-    padding: 0px 5px 0px 4px; }
-  .bottom .dash-item-container > StWidget {
-    padding: 4px 0px 5px 0px; }
-  .top .dash-item-container > StWidget {
-    padding: 5px 0px 4px 0px; }
+.dash-item-container > StWidget, .dash-item-container > StWidget:rtl, .right .dash-item-container > StWidget {
+  padding: 4px 8px; }
+
+.top .dash-item-container > StWidget, .bottom .dash-item-container > StWidget {
+  padding: 6px; }
 
 .dash-label {
   border-radius: 3px;
@@ -1154,12 +1149,6 @@ StScrollBar {
     -y-offset: 3px;
     -x-offset: 0; }
 
-#dash .app-well-app .overview-icon,
-.right #dash .app-well-app .overview-icon,
-.bottom #dash .app-well-app .overview-icon,
-.top #dash .app-well-app .overview-icon {
-  padding: 10px; }
-
 #dash .app-well-app:hover .overview-icon,
 .right #dash .app-well-app:hover .overview-icon,
 .bottom #dash .app-well-app:hover .overview-icon,
@@ -1176,7 +1165,7 @@ StScrollBar {
 #dash .app-well-app-running-dot {
   width: 11px;
   height: 2px;
-  margin-bottom: 6px;
+  margin-bottom: 2px;
   background-color: #5294e2; }
 
 #dashtodockContainer .app-well-app-running-dot {
@@ -1197,7 +1186,6 @@ StScrollBar {
   background-image: url("common-assets/dash/running4.svg"); }
 
 .show-apps .overview-icon {
-  padding: 11px;
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 2px;
   border: 0px solid; }

common/gnome-shell/3.16/sass/_common.scss

@@ -1419,21 +1419,16 @@ StScrollBar {
   color: $osd_fg_color;
   background-color: $dark_sidebar_bg;
   border-color: rgba(0,0,0,0.4);
-  padding: 6px 1px 6px 0px;
+  padding: 4px 0;
   border-radius: 0 3px 3px 0;
 
   &:rtl { border-radius: 3px 0 0 3px; }
 
   .right &,
-  &:rtl {
-    padding: 6px 0px 6px 1px;
-  }
-  .bottom & {
-    padding: 1px 6px 0px 6px;
-  }
-  .top & {
-    padding: 0px 6px 1px 6px;
-  }
+  &:rtl { padding: 4px 0; }
+
+  .top &, .bottom & { padding: 0; }
+
   .placeholder {
     background-image: url("common-assets/dash/dash-placeholder.svg");
     background-size: contain;
@@ -1447,11 +1442,10 @@ StScrollBar {
 }
 
 .dash-item-container > StWidget {
-  padding: 0px 4px 0px 5px;
 
-  .right &, &:rtl { padding: 0px 5px 0px 4px; }
-  .bottom & { padding: 4px 0px 5px 0px; }
-  .top & { padding: 5px 0px 4px 0px; }
+  &, &:rtl, .right & { padding: 4px 8px; }
+
+  .top &, .bottom & { padding: 6px; }
 }
 
 //osd tooltip
@@ -1472,13 +1466,6 @@ StScrollBar {
 // Dash Buttons
 #dash .app-well-app {
 
-  .overview-icon,
-  .right & .overview-icon,
-  .bottom & .overview-icon,
-  .top & .overview-icon {
-    padding: 10px;
-  }
-
   &:hover .overview-icon,
   .right &:hover .overview-icon,
   .bottom &:hover .overview-icon,
@@ -1497,7 +1484,7 @@ StScrollBar {
   &-running-dot {
     width: 11px;
     height: 2px;
-    margin-bottom: 6px;
+    margin-bottom: 2px;
     background-color: $selected_bg_color;
   }
 }
@@ -1519,7 +1506,6 @@ StScrollBar {
 .show-apps {
 
   .overview-icon {
-    padding: 11px;
     background-color: transparentize(black, 0.5);
     border-radius: 2px;
     border: 0px solid;

common/gnome-shell/3.18/common-assets/misc/calendar-today.svg

@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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="25"
+   height="25"
+   id="svg10621"
+   version="1.1"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="calendar-today.svg">
+  <defs
+     id="defs10623">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4503" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4497"
+       xlink:href="#linearGradient34508-1-3">
+      <stop
+         style="stop-color:#5c616c;stop-opacity:1;"
+         offset="0"
+         id="stop4495" />
+    </linearGradient>
+    <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=""
+         offset="0"
+         id="stop34510-1-9" />
+      <stop
+         style=""
+         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" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4507"
+       x1="481.57138"
+       y1="557.9649"
+       x2="481.57138"
+       y2="560.9649"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.01127006,-0.971853)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-4.7267653"
+     inkscape:cy="-0.085292111"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     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="88"
+     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,-536.99307)">
+    <circle
+       style="fill:url(#linearGradient4507);fill-opacity:1"
+       id="path7305"
+       cx="481.58264"
+       cy="558.49304"
+       r="1.5" />
+  </g>
+</svg>

common/gnome-shell/3.18/gnome-shell-dark.css

@@ -797,17 +797,20 @@ StScrollBar {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 1.5em; }
+  margin: 0 0.4em; }
 
 .datemenu-calendar-column {
-  spacing: 0.5em; }
+  spacing: 0.5em;
+  border: none; }
 
 .datemenu-displays-section {
   padding-bottom: 3em; }
 
 .datemenu-today-button,
 .world-clocks-button,
-.message-list-section-title {
+.weather-button,
+.message-list-section-title,
+.events-section-title {
   border-radius: 3px;
   padding: .4em; }
 
@@ -819,14 +822,20 @@ StScrollBar {
 
 .datemenu-today-button,
 .world-clocks-button,
-.message-list-section-title {
+.weather-button,
+.message-list-section-title,
+.events-section-title {
   padding: 7px 10px 7px 10px;
   border: 1px solid rgba(64, 69, 82, 0); }
   .datemenu-today-button:hover, .datemenu-today-button:focus,
   .world-clocks-button:hover,
   .world-clocks-button:focus,
+  .weather-button:hover,
+  .weather-button:focus,
   .message-list-section-title:hover,
-  .message-list-section-title:focus {
+  .message-list-section-title:focus,
+  .events-section-title:hover,
+  .events-section-title:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #505666;
@@ -834,7 +843,9 @@ StScrollBar {
     box-shadow: inset 0 1px rgba(80, 86, 102, 0.05); }
   .datemenu-today-button:active,
   .world-clocks-button:active,
-  .message-list-section-title:active {
+  .weather-button:active,
+  .message-list-section-title:active,
+  .events-section-title:active {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
     background-color: #5294e2;
@@ -845,16 +856,22 @@ StScrollBar {
   font-size: 1.5em; }
 
 .world-clocks-header,
-.message-list-section-title {
+.weather-header,
+.message-list-section-title,
+.events-section-title {
   color: rgba(211, 218, 227, 0.4);
   font-weight: bold; }
 
-.world-clocks-button:active .world-clocks-header {
+.world-clocks-button:active .world-clocks-header,
+.weather-button:active .weather-header {
   color: #ffffff; }
 
 .world-clocks-grid {
   spacing-rows: 0.4em; }
 
+.weather-box {
+  spacing: 0.4em; }
+
 .calendar-month-label {
   color: #D3DAE3;
   font-weight: bold;
@@ -929,6 +946,7 @@ StScrollBar {
 
 .calendar-today,
 .calendar-today:active,
+.calendar-today:selected,
 .calendar-today:focus,
 .calendar-today:hover {
   font-weight: bold;
@@ -937,8 +955,8 @@ StScrollBar {
   border-width: 0; }
 
 .calendar-day-with-events {
-  color: #5294e2;
-  font-weight: bold; }
+  font-weight: bold;
+  background-image: url("common-assets/misc/calendar-today.svg"); }
 
 .calendar-today.calendar-day-with-events {
   color: #ffffff; }
@@ -971,6 +989,9 @@ StScrollBar {
     height: 0; }
   .message-list-placeholder StLabel {
     color: rgba(211, 218, 227, 0.45); }
+  .message-list-clear-button.button {
+    margin: 1.5em 1.5em 0;
+    padding: 4px 12px; }
   .message-list-section-close > StIcon {
     icon-size: 18px;
     border-radius: 0px;
@@ -1001,34 +1022,48 @@ StScrollBar {
     .message-icon-bin:rtl {
       padding: 8px 8px 8px 0px; }
     .message-icon-bin > StIcon {
-      icon-size: 32px; }
-  .message-secondary-bin {
-    color: rgba(211, 218, 227, 0.4); }
-    .message-secondary-bin:ltr {
+      color: inherit; }
+  .message-secondary-bin,
+  .message-secondary-bin > .event-time {
+    color: rgba(211, 218, 227, 0.6);
+    font-size: 0.9em; }
+    .message-secondary-bin:ltr,
+    .message-secondary-bin > .event-time:ltr {
       padding-left: 8px; }
-    .message-secondary-bin:rtl {
+    .message-secondary-bin:rtl,
+    .message-secondary-bin > .event-time:rtl {
       padding-right: 8px; }
+  .message:active .message-secondary-bin,
+  .message:active .message-secondary-bin > .event-time {
+    color: rgba(255, 255, 255, 0.6); }
   .message-secondary-bin > StIcon {
     icon-size: 16px; }
   .message-title {
+    color: inherit;
     font-weight: bold;
     font-size: 1em;
     padding: 2px 0 2px 0; }
   .message-content {
+    color: inherit;
     padding: 8px;
     font-size: 1em; }
 
 .message-media-control {
   padding: 6px;
-  color: rgba(211, 218, 227, 0.45); }
+  color: #D3DAE3; }
   .message-media-control:last-child:ltr {
     padding-right: 18px; }
   .message-media-control:last-child:rtl {
     padding-left: 18px; }
   .message-media-control:hover {
-    color: #D3DAE3; }
+    color: rgba(211, 218, 227, 0.7); }
   .message-media-control:active {
     color: #5294e2; }
+  .message-media-control:insensitive {
+    color: rgba(211, 218, 227, 0.45); }
+
+.message:active .message-media-control {
+  color: #ffffff; }
 
 .media-message-cover-icon {
   icon-size: 32px; }
@@ -1214,16 +1249,14 @@ StScrollBar {
   color: #BAC3CF;
   background-color: rgba(53, 57, 69, 0.95);
   border-color: rgba(0, 0, 0, 0.4);
-  padding: 6px 1px 6px 0px;
+  padding: 4px 0;
   border-radius: 0 3px 3px 0; }
   #dash:rtl {
     border-radius: 3px 0 0 3px; }
   .right #dash, #dash:rtl {
-    padding: 6px 0px 6px 1px; }
-  .bottom #dash {
-    padding: 1px 6px 0px 6px; }
-  .top #dash {
-    padding: 0px 6px 1px 6px; }
+    padding: 4px 0; }
+  .top #dash, .bottom #dash {
+    padding: 0; }
   #dash .placeholder {
     background-image: url("common-assets/dash/dash-placeholder.svg");
     background-size: contain;
@@ -1232,14 +1265,11 @@ StScrollBar {
     width: 24px;
     height: 24px; }
 
-.dash-item-container > StWidget {
-  padding: 0px 4px 0px 5px; }
-  .right .dash-item-container > StWidget, .dash-item-container > StWidget:rtl {
-    padding: 0px 5px 0px 4px; }
-  .bottom .dash-item-container > StWidget {
-    padding: 4px 0px 5px 0px; }
-  .top .dash-item-container > StWidget {
-    padding: 5px 0px 4px 0px; }
+.dash-item-container > StWidget, .dash-item-container > StWidget:rtl, .right .dash-item-container > StWidget {
+  padding: 4px 8px; }
+
+.top .dash-item-container > StWidget, .bottom .dash-item-container > StWidget {
+  padding: 6px; }
 
 .dash-label {
   border-radius: 3px;
@@ -1252,12 +1282,6 @@ StScrollBar {
     -y-offset: 3px;
     -x-offset: 0; }
 
-#dash .app-well-app .overview-icon,
-.right #dash .app-well-app .overview-icon,
-.bottom #dash .app-well-app .overview-icon,
-.top #dash .app-well-app .overview-icon {
-  padding: 10px; }
-
 #dash .app-well-app:hover .overview-icon,
 .right #dash .app-well-app:hover .overview-icon,
 .bottom #dash .app-well-app:hover .overview-icon,
@@ -1274,7 +1298,7 @@ StScrollBar {
 #dash .app-well-app-running-dot {
   width: 11px;
   height: 2px;
-  margin-bottom: 6px;
+  margin-bottom: 2px;
   background-color: #5294e2; }
 
 #dashtodockContainer .app-well-app-running-dot {
@@ -1295,7 +1319,6 @@ StScrollBar {
   background-image: url("common-assets/dash/running4.svg"); }
 
 .show-apps .overview-icon {
-  padding: 11px;
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 2px;
   border: 0px solid; }

common/gnome-shell/3.18/gnome-shell.css

@@ -797,17 +797,20 @@ StScrollBar {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 1.5em; }
+  margin: 0 0.4em; }
 
 .datemenu-calendar-column {
-  spacing: 0.5em; }
+  spacing: 0.5em;
+  border: none; }
 
 .datemenu-displays-section {
   padding-bottom: 3em; }
 
 .datemenu-today-button,
 .world-clocks-button,
-.message-list-section-title {
+.weather-button,
+.message-list-section-title,
+.events-section-title {
   border-radius: 3px;
   padding: .4em; }
 
@@ -819,14 +822,20 @@ StScrollBar {
 
 .datemenu-today-button,
 .world-clocks-button,
-.message-list-section-title {
+.weather-button,
+.message-list-section-title,
+.events-section-title {
   padding: 7px 10px 7px 10px;
   border: 1px solid rgba(255, 255, 255, 0); }
   .datemenu-today-button:hover, .datemenu-today-button:focus,
   .world-clocks-button:hover,
   .world-clocks-button:focus,
+  .weather-button:hover,
+  .weather-button:focus,
   .message-list-section-title:hover,
-  .message-list-section-title:focus {
+  .message-list-section-title:focus,
+  .events-section-title:hover,
+  .events-section-title:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: white;
@@ -834,7 +843,9 @@ StScrollBar {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
   .datemenu-today-button:active,
   .world-clocks-button:active,
-  .message-list-section-title:active {
+  .weather-button:active,
+  .message-list-section-title:active,
+  .events-section-title:active {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
     background-color: #5294e2;
@@ -845,16 +856,22 @@ StScrollBar {
   font-size: 1.5em; }
 
 .world-clocks-header,
-.message-list-section-title {
+.weather-header,
+.message-list-section-title,
+.events-section-title {
   color: rgba(92, 97, 108, 0.4);
   font-weight: bold; }
 
-.world-clocks-button:active .world-clocks-header {
+.world-clocks-button:active .world-clocks-header,
+.weather-button:active .weather-header {
   color: #ffffff; }
 
 .world-clocks-grid {
   spacing-rows: 0.4em; }
 
+.weather-box {
+  spacing: 0.4em; }
+
 .calendar-month-label {
   color: #5c616c;
   font-weight: bold;
@@ -929,6 +946,7 @@ StScrollBar {
 
 .calendar-today,
 .calendar-today:active,
+.calendar-today:selected,
 .calendar-today:focus,
 .calendar-today:hover {
   font-weight: bold;
@@ -937,8 +955,8 @@ StScrollBar {
   border-width: 0; }
 
 .calendar-day-with-events {
-  color: #5294e2;
-  font-weight: bold; }
+  font-weight: bold;
+  background-image: url("common-assets/misc/calendar-today.svg"); }
 
 .calendar-today.calendar-day-with-events {
   color: #ffffff; }
@@ -971,6 +989,9 @@ StScrollBar {
     height: 0; }
   .message-list-placeholder StLabel {
     color: rgba(92, 97, 108, 0.55); }
+  .message-list-clear-button.button {
+    margin: 1.5em 1.5em 0;
+    padding: 4px 12px; }
   .message-list-section-close > StIcon {
     icon-size: 18px;
     border-radius: 0px;
@@ -1001,34 +1022,48 @@ StScrollBar {
     .message-icon-bin:rtl {
       padding: 8px 8px 8px 0px; }
     .message-icon-bin > StIcon {
-      icon-size: 32px; }
-  .message-secondary-bin {
-    color: rgba(92, 97, 108, 0.4); }
-    .message-secondary-bin:ltr {
+      color: inherit; }
+  .message-secondary-bin,
+  .message-secondary-bin > .event-time {
+    color: rgba(92, 97, 108, 0.6);
+    font-size: 0.9em; }
+    .message-secondary-bin:ltr,
+    .message-secondary-bin > .event-time:ltr {
       padding-left: 8px; }
-    .message-secondary-bin:rtl {
+    .message-secondary-bin:rtl,
+    .message-secondary-bin > .event-time:rtl {
       padding-right: 8px; }
+  .message:active .message-secondary-bin,
+  .message:active .message-secondary-bin > .event-time {
+    color: rgba(255, 255, 255, 0.6); }
   .message-secondary-bin > StIcon {
     icon-size: 16px; }
   .message-title {
+    color: inherit;
     font-weight: bold;
     font-size: 1em;
     padding: 2px 0 2px 0; }
   .message-content {
+    color: inherit;
     padding: 8px;
     font-size: 1em; }
 
 .message-media-control {
   padding: 6px;
-  color: rgba(92, 97, 108, 0.55); }
+  color: #5c616c; }
   .message-media-control:last-child:ltr {
     padding-right: 18px; }
   .message-media-control:last-child:rtl {
     padding-left: 18px; }
   .message-media-control:hover {
-    color: #5c616c; }
+    color: rgba(92, 97, 108, 0.7); }
   .message-media-control:active {
     color: #5294e2; }
+  .message-media-control:insensitive {
+    color: rgba(92, 97, 108, 0.55); }
+
+.message:active .message-media-control {
+  color: #ffffff; }
 
 .media-message-cover-icon {
   icon-size: 32px; }
@@ -1214,16 +1249,14 @@ StScrollBar {
   color: #BAC3CF;
   background-color: rgba(53, 57, 69, 0.95);
   border-color: rgba(0, 0, 0, 0.4);
-  padding: 6px 1px 6px 0px;
+  padding: 4px 0;
   border-radius: 0 3px 3px 0; }
   #dash:rtl {
     border-radius: 3px 0 0 3px; }
   .right #dash, #dash:rtl {
-    padding: 6px 0px 6px 1px; }
-  .bottom #dash {
-    padding: 1px 6px 0px 6px; }
-  .top #dash {
-    padding: 0px 6px 1px 6px; }
+    padding: 4px 0; }
+  .top #dash, .bottom #dash {
+    padding: 0; }
   #dash .placeholder {
     background-image: url("common-assets/dash/dash-placeholder.svg");
     background-size: contain;
@@ -1232,14 +1265,11 @@ StScrollBar {
     width: 24px;
     height: 24px; }
 
-.dash-item-container > StWidget {
-  padding: 0px 4px 0px 5px; }
-  .right .dash-item-container > StWidget, .dash-item-container > StWidget:rtl {
-    padding: 0px 5px 0px 4px; }
-  .bottom .dash-item-container > StWidget {
-    padding: 4px 0px 5px 0px; }
-  .top .dash-item-container > StWidget {
-    padding: 5px 0px 4px 0px; }
+.dash-item-container > StWidget, .dash-item-container > StWidget:rtl, .right .dash-item-container > StWidget {
+  padding: 4px 8px; }
+
+.top .dash-item-container > StWidget, .bottom .dash-item-container > StWidget {
+  padding: 6px; }
 
 .dash-label {
   border-radius: 3px;
@@ -1252,12 +1282,6 @@ StScrollBar {
     -y-offset: 3px;
     -x-offset: 0; }
 
-#dash .app-well-app .overview-icon,
-.right #dash .app-well-app .overview-icon,
-.bottom #dash .app-well-app .overview-icon,
-.top #dash .app-well-app .overview-icon {
-  padding: 10px; }
-
 #dash .app-well-app:hover .overview-icon,
 .right #dash .app-well-app:hover .overview-icon,
 .bottom #dash .app-well-app:hover .overview-icon,
@@ -1274,7 +1298,7 @@ StScrollBar {
 #dash .app-well-app-running-dot {
   width: 11px;
   height: 2px;
-  margin-bottom: 6px;
+  margin-bottom: 2px;
   background-color: #5294e2; }
 
 #dashtodockContainer .app-well-app-running-dot {
@@ -1295,7 +1319,6 @@ StScrollBar {
   background-image: url("common-assets/dash/running4.svg"); }
 
 .show-apps .overview-icon {
-  padding: 11px;
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 2px;
   border: 0px solid; }

common/gnome-shell/3.18/sass/_common.scss

@@ -1080,15 +1080,17 @@ StScrollBar {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 1.5em;
+  margin: 0 0.4em;
 }
 
-.datemenu-calendar-column { spacing: 0.5em; }
+.datemenu-calendar-column { spacing: 0.5em; border: none; }
 .datemenu-displays-section { padding-bottom: 3em; }
 
 .datemenu-today-button,
 .world-clocks-button,
-.message-list-section-title {
+.weather-button,
+.message-list-section-title,
+.events-section-title {
   border-radius: 3px;
   padding: .4em;
 }
@@ -1103,7 +1105,9 @@ StScrollBar {
 
 .datemenu-today-button,
 .world-clocks-button,
-.message-list-section-title {
+.weather-button,
+.message-list-section-title,
+.events-section-title {
   padding: 7px 10px 7px 10px;
   border: 1px solid transparentize($base_color, 1);
 
@@ -1119,12 +1123,15 @@ StScrollBar {
 }
 
 .world-clocks-header,
-.message-list-section-title {
+.weather-header,
+.message-list-section-title,
+.events-section-title {
   color: transparentize($fg_color, 0.6);
   font-weight: bold;
 }
 
-.world-clocks-button:active .world-clocks-header {
+.world-clocks-button:active .world-clocks-header,
+.weather-button:active .weather-header {
   color: $selected_fg_color;
 }
 
@@ -1132,6 +1139,10 @@ StScrollBar {
   spacing-rows: 0.4em;
 }
 
+.weather-box {
+  spacing: 0.4em;
+}
+
 .calendar-month-label {
   color: $fg_color;
   font-weight: bold;
@@ -1223,6 +1234,7 @@ StScrollBar {
 
 .calendar-today,
 .calendar-today:active,
+.calendar-today:selected,
 .calendar-today:focus,
 .calendar-today:hover {
   font-weight: bold;
@@ -1232,8 +1244,8 @@ StScrollBar {
 }
 
 .calendar-day-with-events {
-  color: $selected_bg_color;
   font-weight: bold;
+  background-image: url("common-assets/misc/calendar-today.svg");
 }
 
 .calendar-today.calendar-day-with-events { color: $selected_fg_color; }
@@ -1272,6 +1284,11 @@ StScrollBar {
     StLabel { color: $insensitive_fg_color; }
   }
 
+  &-clear-button.button {
+    margin: 1.5em 1.5em 0;
+    padding: 4px 12px;
+  }
+
   &-section-close {
 
     > StIcon {
@@ -1315,25 +1332,37 @@ StScrollBar {
 
     &:rtl { padding: 8px 8px 8px 0px; }
 
-    > StIcon { icon-size: 32px; }
+    > StIcon {
+      //icon-size: 32px;
+      color: inherit;
+    }
   }
 
-  &-secondary-bin {
-    color: transparentize($fg_color, 0.6);
+  &-secondary-bin,
+  &-secondary-bin > .event-time {
+    color: transparentize($fg_color, 0.4);
+    font-size: 0.9em;
 
     &:ltr { padding-left: 8px; }
     &:rtl { padding-right: 8px; }
   }
 
+  &:active .message-secondary-bin,
+  &:active .message-secondary-bin > .event-time {
+    color: transparentize($selected_fg_color, 0.4);
+  }
+
   &-secondary-bin > StIcon { icon-size: 16px; }
 
   &-title {
+    color: inherit;
     font-weight: bold;
     font-size: 1em;
     padding: 2px 0 2px 0;
   }
 
   &-content {
+    color: inherit;
     padding: 8px;
     font-size: 1em;
   }
@@ -1341,13 +1370,18 @@ StScrollBar {
 
 .message-media-control {
   padding: 6px;
-  color: $insensitive_fg_color;
+  color: $fg_color;
 
   &:last-child:ltr { padding-right: 18px; }
   &:last-child:rtl { padding-left: 18px; }
 
-  &:hover { color: $fg_color; }
+  &:hover { color: transparentize($fg_color, 0.3); }
   &:active { color: $selected_bg_color; }
+  &:insensitive { color: $insensitive_fg_color; }
+}
+
+.message:active .message-media-control {
+  color: $selected_fg_color;
 }
 
 .media-message-cover-icon {
@@ -1583,21 +1617,16 @@ StScrollBar {
   color: $osd_fg_color;
   background-color: $dark_sidebar_bg;
   border-color: rgba(0,0,0,0.4);
-  padding: 6px 1px 6px 0px;
+  padding: 4px 0;
   border-radius: 0 3px 3px 0;
 
   &:rtl { border-radius: 3px 0 0 3px; }
 
   .right &,
-  &:rtl {
-    padding: 6px 0px 6px 1px;
-  }
-  .bottom & {
-    padding: 1px 6px 0px 6px;
-  }
-  .top & {
-    padding: 0px 6px 1px 6px;
-  }
+  &:rtl { padding: 4px 0; }
+
+  .top &, .bottom & { padding: 0; }
+
   .placeholder {
     background-image: url("common-assets/dash/dash-placeholder.svg");
     background-size: contain;
@@ -1611,11 +1640,10 @@ StScrollBar {
 }
 
 .dash-item-container > StWidget {
-  padding: 0px 4px 0px 5px;
 
-  .right &, &:rtl { padding: 0px 5px 0px 4px; }
-  .bottom & { padding: 4px 0px 5px 0px; }
-  .top & { padding: 5px 0px 4px 0px; }
+  &, &:rtl, .right & { padding: 4px 8px; }
+
+  .top &, .bottom & { padding: 6px; }
 }
 
 //osd tooltip
@@ -1636,13 +1664,6 @@ StScrollBar {
 // Dash Buttons
 #dash .app-well-app {
 
-  .overview-icon,
-  .right & .overview-icon,
-  .bottom & .overview-icon,
-  .top & .overview-icon {
-    padding: 10px;
-  }
-
   &:hover .overview-icon,
   .right &:hover .overview-icon,
   .bottom &:hover .overview-icon,
@@ -1661,7 +1682,7 @@ StScrollBar {
   &-running-dot {
     width: 11px;
     height: 2px;
-    margin-bottom: 6px;
+    margin-bottom: 2px;
     background-color: $selected_bg_color;
   }
 }
@@ -1683,7 +1704,6 @@ StScrollBar {
 .show-apps {
 
   .overview-icon {
-    padding: 11px;
     background-color: transparentize(black, 0.5);
     border-radius: 2px;
     border: 0px solid;

common/gtk-2.0/apps.rc

@@ -76,8 +76,82 @@ style "entry_border" {
   }
 }
 
+style "combobox_entry_border" = "combobox_entry" {
+
+  engine "pixmap" {
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "assets/combo-entry-border.png"
+      border = { 4, 4, 12, 12 }
+      stretch = TRUE
+      direction = LTR
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "assets/combo-entry-border-focus.png"
+      border = { 4, 4, 12, 12 }
+      stretch = TRUE
+      direction = LTR
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "assets/combo-entry-border-rtl.png"
+      border = { 4, 4, 12, 12 }
+      stretch = TRUE
+      direction = RTL
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "assets/combo-entry-border-focus-rtl.png"
+      border = { 4, 4, 12, 12 }
+      stretch = TRUE
+      direction = RTL
+    }
+
+    image {
+      function = FLAT_BOX
+      state    = INSENSITIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+  }
+}
+
+
 # Mousepad search entry
-widget_class "*MousepadSearchBar*.<GtkEntry>"    style "entry_border"
+widget_class "*MousepadSearchBar*.<GtkEntry>"         style "entry_border"
+
+# Mousepad find and replace
+widget_class "*MousepadReplaceDialog*.<GtkEntry>"     style "entry_border"
+
+# Thunar bulk rename
+widget_class "*ThunarRenamerDialog*.<GtkEntry>"         style "entry_border"
 
 # Hexchat input box
-class "SexySpellEntry"                           style:highest "entry_border"
+class "SexySpellEntry"                                style:highest "entry_border"
+
+# Geany search entries
+widget "*GeanyToolbar.*geany-search-entry-no-match*"  style "entry_border"
+widget "*GeanyToolbar.*GtkEntry*"                     style "entry_border"
+
+widget "GeanyDialogSearch.*GtkComboBoxEntry*.*geany-search-entry-no-match*"  style "combobox_entry_border"

common/gtk-2.0/assets-dark.svg

@@ -741,6 +741,90 @@
        x2="51.5"
        y2="-256.63782"
        gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-1-0">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4468-5-9-1"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient5171-1"
+       x1="9.5"
+       y1="-279.63782"
+       x2="9.5"
+       y2="-255.63782"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient6618-1"
+       x1="17.5"
+       y1="-279.13782"
+       x2="17.5"
+       y2="-256.13782"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-8">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4468-5-7"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-1">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4468-5-9"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient5171"
+       x1="9.5"
+       y1="-279.63782"
+       x2="9.5"
+       y2="-255.63782"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient6618"
+       x1="17.5"
+       y1="-279.13782"
+       x2="17.5"
+       y2="-256.13782"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4468-5"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -749,9 +833,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="37.403863"
-     inkscape:cy="228.51884"
+     inkscape:zoom="7.9999996"
+     inkscape:cx="190.41345"
+     inkscape:cy="213.5177"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -5916,5 +6000,129 @@
        rx="2.7755599e-17"
        ry="2.7755599e-17"
        inkscape:label="#rect5008-1" />
+    <g
+       style="display:inline"
+       id="combo-entry-border"
+       inkscape:label="#g9335"
+       transform="translate(161,169)"
+       clip-path="url(#clipPath4466-3)">
+      <path
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70"
+         style="display:inline;opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="combo-entry-border-focus"
+       inkscape:label="#g9335"
+       transform="translate(186,169)"
+       clip-path="url(#clipPath4466-3-1)">
+      <path
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-3"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-9"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5171);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-9"
+         style="display:inline;opacity:1;fill:url(#linearGradient6618);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="combo-entry-border-rtl"
+       inkscape:label="#g9335"
+       transform="matrix(-1,0,0,1,176,199)"
+       clip-path="url(#clipPath4466-3-8)">
+      <path
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-30"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-6"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-6"
+         style="display:inline;opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="combo-entry-border-focus-rtl"
+       inkscape:label="#g9335"
+       transform="matrix(-1,0,0,1,201,199)"
+       clip-path="url(#clipPath4466-3-1-0)">
+      <path
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-3-8"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-9-2"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5171-1);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-9-8"
+         style="display:inline;opacity:1;fill:url(#linearGradient6618-1);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
   </g>
 </svg>

common/gtk-2.0/assets.svg

@@ -19,6 +19,20 @@
    sodipodi:docname="assets.svg">
   <defs
      id="defs9894">
+    <linearGradient
+       id="linearGradient6614">
+      <stop
+         style="stop-color:#cfd6e6;stop-opacity:1;"
+         offset="0"
+         id="stop6616" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5167">
+      <stop
+         style="stop-color:#cfd6e6;stop-opacity:1;"
+         offset="0"
+         id="stop5169" />
+    </linearGradient>
     <linearGradient
        id="linearGradient5117">
       <stop
@@ -866,6 +880,90 @@
        x2="51.5"
        y2="-256.63782"
        gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4468-5"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-1">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4468-5-9"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient5171"
+       x1="9.5"
+       y1="-279.63782"
+       x2="9.5"
+       y2="-255.63782"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient6618"
+       x1="17.5"
+       y1="-279.13782"
+       x2="17.5"
+       y2="-256.13782"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-1-0">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4468-5-9-1"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient5171-1"
+       x1="9.5"
+       y1="-279.63782"
+       x2="9.5"
+       y2="-255.63782"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient6618-1"
+       x1="17.5"
+       y1="-279.13782"
+       x2="17.5"
+       y2="-256.13782"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-8">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4468-5-7"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -874,11 +972,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.828427"
-     inkscape:cx="74.28003"
-     inkscape:cy="188.10678"
+     inkscape:zoom="1.4142135"
+     inkscape:cx="205.16573"
+     inkscape:cy="193.28696"
      inkscape:document-units="px"
-     inkscape:current-layer="combo-entry-focus-notebook-rtl"
+     inkscape:current-layer="layer1"
      showgrid="true"
      showborder="false"
      inkscape:window-width="1366"
@@ -6009,5 +6107,129 @@
        rx="2.7755599e-17"
        ry="2.7755599e-17"
        inkscape:label="#rect5008-1" />
+    <g
+       style="display:inline"
+       id="combo-entry-border"
+       inkscape:label="#g9335"
+       transform="translate(161,169)"
+       clip-path="url(#clipPath4466-3)">
+      <path
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70"
+         style="display:inline;opacity:0.3;fill:#cfd6e6;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="combo-entry-border-focus"
+       inkscape:label="#g9335"
+       transform="translate(186,169)"
+       clip-path="url(#clipPath4466-3-1)">
+      <path
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-3"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-9"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5171);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-9"
+         style="display:inline;opacity:1;fill:url(#linearGradient6618);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="combo-entry-border-rtl"
+       inkscape:label="#g9335"
+       transform="matrix(-1,0,0,1,176,199)"
+       clip-path="url(#clipPath4466-3-8)">
+      <path
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-30"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-6"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-6"
+         style="display:inline;opacity:0.3;fill:#cfd6e6;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="combo-entry-border-focus-rtl"
+       inkscape:label="#g9335"
+       transform="matrix(-1,0,0,1,201,199)"
+       clip-path="url(#clipPath4466-3-1-0)">
+      <path
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-3-8"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-9-2"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5171-1);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-9-8"
+         style="display:inline;opacity:1;fill:url(#linearGradient6618-1);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
   </g>
 </svg>

common/gtk-2.0/assets.txt

@@ -56,13 +56,17 @@ entry-toolbar
 entry-active-toolbar
 entry-disabled-toolbar
 combo-entry
+combo-entry-border
 combo-entry-focus
+combo-entry-border-focus
 combo-entry-insensitive
 combo-entry-notebook
 combo-entry-focus-notebook
 combo-entry-insensitive-notebook
 combo-entry-rtl
+combo-entry-border-rtl
 combo-entry-focus-rtl
+combo-entry-border-focus-rtl
 combo-entry-insensitive-rtl
 combo-entry-notebook-rtl
 combo-entry-focus-notebook-rtl

common/gtk-3.0/3.14/gtk-dark.css

@@ -3521,11 +3521,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.14/gtk-darker.css

@@ -3524,11 +3524,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.14/gtk-solid-dark.css

@@ -3521,11 +3521,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.14/gtk-solid-darker.css

@@ -3524,11 +3524,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.14/gtk-solid.css

@@ -3524,11 +3524,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.14/gtk.css

@@ -3524,11 +3524,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.14/sass/_lightdm.scss

@@ -6,11 +6,14 @@
   box-shadow: inset 0 -1px darken($panel_bg, 7%);
 
   // the menubars/menus of the panel, i.e. indicators
-  .menubar,
-  .menubar > .menuitem {
-    background-color: transparent;
-    color: $panel_fg;
-    font: bold;
+  .menubar {
+    padding-left: 5px;
+
+    &, > .menuitem {
+      background-color: transparent;
+      color: $panel_fg;
+      font: bold;
+    }
   }
 
   .menubar .menuitem:insensitive {

common/gtk-3.0/3.16/gtk-dark.css

@@ -3398,11 +3398,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.16/gtk-darker.css

@@ -3401,11 +3401,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.16/gtk-solid-dark.css

@@ -3398,11 +3398,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.16/gtk-solid-darker.css

@@ -3401,11 +3401,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.16/gtk-solid.css

@@ -3401,11 +3401,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.16/gtk.css

@@ -3401,11 +3401,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.16/sass/_lightdm.scss

@@ -6,11 +6,14 @@
   box-shadow: inset 0 -1px darken($panel_bg, 7%);
 
   // the menubars/menus of the panel, i.e. indicators
-  .menubar,
-  .menubar > .menuitem {
-    background-color: transparent;
-    color: $panel_fg;
-    font: bold;
+  .menubar {
+    padding-left: 5px;
+
+    &, > .menuitem {
+      background-color: transparent;
+      color: $panel_fg;
+      font: bold;
+    }
   }
 
   .menubar .menuitem:insensitive {

common/gtk-3.0/3.18/gtk-dark.css

@@ -3076,14 +3076,14 @@ SynapseGuiViewVirgilio *:selected {
 .tr-workarea .overshoot {
   border-color: transparent; }
 
-.gnome-panel-menu-bar,
+.gnome-panel-menu-bar.menubar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
   color: #BAC3CF;
-  background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); }
+  background-color: #2b2e37; }
 
 PanelApplet .button, PanelApplet .button:backdrop {
   padding: 4px;
@@ -3578,11 +3578,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.18/gtk-darker.css

@@ -3082,14 +3082,14 @@ SynapseGuiViewVirgilio *:selected {
 .tr-workarea .overshoot {
   border-color: transparent; }
 
-.gnome-panel-menu-bar,
+.gnome-panel-menu-bar.menubar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
   color: #BAC3CF;
-  background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); }
+  background-color: #2b2e37; }
 
 PanelApplet .button, PanelApplet .button:backdrop {
   padding: 4px;
@@ -3584,11 +3584,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.18/gtk-solid-dark.css

@@ -3076,14 +3076,14 @@ SynapseGuiViewVirgilio *:selected {
 .tr-workarea .overshoot {
   border-color: transparent; }
 
-.gnome-panel-menu-bar,
+.gnome-panel-menu-bar.menubar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
   color: #BAC3CF;
-  background-image: linear-gradient(to bottom, #2b2e37); }
+  background-color: #2b2e37; }
 
 PanelApplet .button, PanelApplet .button:backdrop {
   padding: 4px;
@@ -3578,11 +3578,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.18/gtk-solid-darker.css

@@ -3082,14 +3082,14 @@ SynapseGuiViewVirgilio *:selected {
 .tr-workarea .overshoot {
   border-color: transparent; }
 
-.gnome-panel-menu-bar,
+.gnome-panel-menu-bar.menubar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
   color: #BAC3CF;
-  background-image: linear-gradient(to bottom, #2b2e37); }
+  background-color: #2b2e37; }
 
 PanelApplet .button, PanelApplet .button:backdrop {
   padding: 4px;
@@ -3584,11 +3584,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.18/gtk-solid.css

@@ -3086,14 +3086,14 @@ SynapseGuiViewVirgilio *:selected {
 .tr-workarea .overshoot {
   border-color: transparent; }
 
-.gnome-panel-menu-bar,
+.gnome-panel-menu-bar.menubar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
   color: #BAC3CF;
-  background-image: linear-gradient(to bottom, #2b2e37); }
+  background-color: #2b2e37; }
 
 PanelApplet .button, PanelApplet .button:backdrop {
   padding: 4px;
@@ -3588,11 +3588,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.18/gtk.css

@@ -3086,14 +3086,14 @@ SynapseGuiViewVirgilio *:selected {
 .tr-workarea .overshoot {
   border-color: transparent; }
 
-.gnome-panel-menu-bar,
+.gnome-panel-menu-bar.menubar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
   color: #BAC3CF;
-  background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); }
+  background-color: #2b2e37; }
 
 PanelApplet .button, PanelApplet .button:backdrop {
   padding: 4px;
@@ -3588,11 +3588,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font: bold; }
+  #panel_window .menubar {
+    padding-left: 5px; }
+    #panel_window .menubar, #panel_window .menubar > .menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font: bold; }
   #panel_window .menubar .menuitem:insensitive {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {

common/gtk-3.0/3.18/sass/_applications.scss

@@ -525,14 +525,14 @@ SynapseGuiViewVirgilio *:selected { background-color: $selected_bg_color; }
 //
 // Fallback Mode/Budgie Panel
 //
-.gnome-panel-menu-bar,
+.gnome-panel-menu-bar.menubar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
   color: $panel_fg;
-  background-image: linear-gradient(to bottom, $panel_bg);
+  background-color: opacify($panel_bg, 1);
 }
 
 PanelApplet .button, PanelApplet .button:backdrop {

common/gtk-3.0/3.18/sass/_lightdm.scss

@@ -6,11 +6,14 @@
   box-shadow: inset 0 -1px darken($panel_bg, 7%);
 
   // the menubars/menus of the panel, i.e. indicators
-  .menubar,
-  .menubar > .menuitem {
-    background-color: transparent;
-    color: $panel_fg;
-    font: bold;
+  .menubar {
+    padding-left: 5px;
+
+    &, > .menuitem {
+      background-color: transparent;
+      color: $panel_fg;
+      font: bold;
+    }
   }
 
   .menubar .menuitem:insensitive {

common/gtk-3.0/3.20/gtk-dark.css

@@ -576,15 +576,15 @@ button {
 .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); }
 
-.linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
-
-.linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); }
 
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
+
 .linked.vertical > entry + entry {
   border-top-color: rgba(43, 46, 57, 0.3); }
 
@@ -881,7 +881,7 @@ toolbar, .inline-toolbar {
   toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
-.primary-toolbar {
+.primary-toolbar:not(.libreoffice-toolbar) {
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343f;
   box-shadow: none;
@@ -1029,13 +1029,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .titlebar:not(headerbar) > separator {
   background-image: linear-gradient(to bottom, rgba(38, 42, 51, 0.97), rgba(38, 42, 51, 0.97)); }
 
-.primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
+.primary-toolbar:not(.libreoffice-toolbar) separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
   border-width: 0 1px;
   border-image: linear-gradient(to bottom, rgba(207, 218, 231, 0) 25%, rgba(207, 218, 231, 0.15) 25%, rgba(207, 218, 231, 0.15) 75%, rgba(207, 218, 231, 0) 75%) 0 1/0 1px stretch; }
-  .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
+  .primary-toolbar:not(.libreoffice-toolbar) separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
     opacity: 0.6; }
 
 .primary-toolbar entry, headerbar entry {
@@ -1055,6 +1055,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar entry:disabled, headerbar entry:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
   .primary-toolbar entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1143,17 +1144,14 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked) {
-  box-shadow: none; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
 
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry {
   border-left-color: rgba(21, 23, 28, 0); }
@@ -1303,6 +1301,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
 
 .primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -2327,9 +2326,11 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid #2b2e39; }
-  frame > border.flat,
-  .frame.flat {
-    border-style: none; }
+
+frame.flat > border,
+frame > border.flat,
+.frame.flat {
+  border-style: none; }
 
 scrolledwindow viewport.frame {
   border-style: none; }
@@ -2828,8 +2829,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
 button.circular, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
-  min-width: 26px;
-  min-height: 26px;
+  min-width: 16px;
+  min-height: 24px;
+  padding: 2px 6px;
   border-radius: 50%;
   -gtk-outline-radius: 50%; }
   button.circular label, button.nautilus-circular-button.image-button label,
@@ -3123,15 +3125,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
   border-left-style: none; }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-last-child(2):not(:active):not(:checked) {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
 
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+
 .caja-notebook {
   border-top: 1px solid #2b2e39; }
 
@@ -3256,6 +3258,8 @@ pillbox {
   color: #ffffff;
   background-color: #5294e2;
   border-radius: 3px; }
+  pillbox:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
 
 docktabstrip {
   padding: 0 6px;
@@ -3289,6 +3293,62 @@ dockoverlayedge {
   dockoverlayedge.right-edge tab:checked {
     border-width: 1px 0; }
 
+popover.messagepopover.background {
+  padding: 0; }
+
+popover.messagepopover .popover-content-area {
+  margin: 16px; }
+
+popover.messagepopover .popover-action-area {
+  margin: 8px; }
+  popover.messagepopover .popover-action-area button:not(:first-child):not(:last-child) {
+    margin: 0 4px; }
+
+popover.popover-selector {
+  padding: 0; }
+  popover.popover-selector list row {
+    padding: 5px 0; }
+  popover.popover-selector list row image {
+    margin-left: 3px;
+    margin-right: 10px; }
+
+entry.search.preferences-search {
+  border: none;
+  border-right: 1px solid #2b2e39;
+  border-bottom: 1px solid #2b2e39;
+  border-radius: 0; }
+
+preferences stacksidebar.sidebar list {
+  background-image: linear-gradient(to bottom, #404552, #404552); }
+
+preferences stacksidebar.sidebar list separator {
+  background-color: transparent; }
+
+devhelppanel entry:focus,
+symboltreepanel entry:focus {
+  border-color: #2b2e39; }
+
+button.run-arrow-button {
+  min-width: 12px; }
+
+omnibar.linked > entry:not(:only-child) {
+  border-style: solid;
+  border-radius: 3px;
+  margin-left: 1px;
+  margin-right: 1px; }
+
+gstyleslidein #scale_box button.toggle:checked,
+gstyleslidein #strings_controls button.toggle:checked,
+gstyleslidein #palette_controls button.toggle:checked,
+gstyleslidein #components_controls button.toggle:checked {
+  color: #D3DAE3; }
+
+configurationview entry.flat {
+  background: none; }
+
+configurationview list {
+  border-width: 0; }
+
 .documents-scrolledwin.frame {
   border-width: 0; }
 
@@ -3336,10 +3396,17 @@ button.documents-favorite:active:hover {
   opacity: 0.0;
   transition: opacity 0.2s ease-out; }
 
+.tweak-categories,
+.tweak-category:not(:selected):not(:hover) {
+  background-image: linear-gradient(to bottom, #404552, #404552); }
+
 .tr-workarea undershoot,
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar {
+  background: none; }
+
 #gf-bubble, #gf-bubble.solid,
 #gf-osd-window,
 #gf-osd-window.solid,
@@ -3393,6 +3460,19 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   background-color: #5294e2;
   border-radius: 2px; }
 
+MsdOsdWindow.background.osd {
+  border-radius: 2px;
+  border: 1px solid rgba(35, 38, 46, 0.95); }
+  MsdOsdWindow.background.osd .progressbar {
+    background-color: #5294e2;
+    border: none;
+    border-color: red;
+    border-radius: 5px; }
+  MsdOsdWindow.background.osd .trough {
+    background-color: rgba(42, 45, 55, 0.95);
+    border: none;
+    border-radius: 5px; }
+
 .mate-panel-menu-bar, .mate-panel-menu-bar menubar,
 panel-toplevel.background,
 panel-toplevel.background menubar {
@@ -3502,6 +3582,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
@@ -3577,7 +3658,7 @@ UnityDecoration {
   -UnityDecoration-title-indent: 10px;
   -UnityDecoration-title-fade: 35px;
   -UnityDecoration-title-alignment: 0.0; }
-  UnityDecoration.top {
+  UnityDecoration .top {
     border: 1px solid rgba(32, 35, 43, 0.97);
     border-bottom-width: 0;
     border-radius: 4px 4px 0 0;
@@ -3585,10 +3666,11 @@ UnityDecoration {
     background-image: linear-gradient(to bottom, #2f343f, #2f343f);
     color: rgba(207, 218, 231, 0.8);
     box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); }
-    UnityDecoration.top:backdrop {
+    UnityDecoration .top:backdrop {
       border-bottom-width: 0;
       color: rgba(207, 218, 231, 0.5); }
-  UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
+  UnityDecoration .left, UnityDecoration .right, UnityDecoration .bottom,
+  UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration .bottom:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97), rgba(32, 35, 43, 0.97)); }
 
@@ -3854,11 +3936,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font-weight: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window menubar,
-  #panel_window menubar > menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font-weight: bold; }
+  #panel_window menubar {
+    padding-left: 5px; }
+    #panel_window menubar, #panel_window menubar > menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font-weight: bold; }
   #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window menubar menuitem:disabled label {

common/gtk-3.0/3.20/gtk-darker.css

@@ -575,15 +575,15 @@ button {
 .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
 
-.linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
-
-.linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
 
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
+
 .linked.vertical > entry + entry {
   border-top-color: rgba(207, 214, 230, 0.3); }
 
@@ -880,7 +880,7 @@ toolbar, .inline-toolbar {
   toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
-.primary-toolbar {
+.primary-toolbar:not(.libreoffice-toolbar) {
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343f;
   box-shadow: none;
@@ -1028,13 +1028,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .titlebar:not(headerbar) > separator {
   background-image: linear-gradient(to bottom, rgba(38, 42, 51, 0.97), rgba(38, 42, 51, 0.97)); }
 
-.primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
+.primary-toolbar:not(.libreoffice-toolbar) separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
   border-width: 0 1px;
   border-image: linear-gradient(to bottom, rgba(207, 218, 231, 0) 25%, rgba(207, 218, 231, 0.15) 25%, rgba(207, 218, 231, 0.15) 75%, rgba(207, 218, 231, 0) 75%) 0 1/0 1px stretch; }
-  .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
+  .primary-toolbar:not(.libreoffice-toolbar) separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
     opacity: 0.6; }
 
 .primary-toolbar entry, headerbar entry {
@@ -1054,6 +1054,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar entry:disabled, headerbar entry:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
   .primary-toolbar entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1142,17 +1143,14 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked) {
-  box-shadow: none; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
 
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry {
   border-left-color: rgba(21, 23, 28, 0); }
@@ -1302,6 +1300,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
 
 .primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -2326,9 +2325,11 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid #dcdfe3; }
-  frame > border.flat,
-  .frame.flat {
-    border-style: none; }
+
+frame.flat > border,
+frame > border.flat,
+.frame.flat {
+  border-style: none; }
 
 scrolledwindow viewport.frame {
   border-style: none; }
@@ -2827,8 +2828,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
 button.circular, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
-  min-width: 26px;
-  min-height: 26px;
+  min-width: 16px;
+  min-height: 24px;
+  padding: 2px 6px;
   border-radius: 50%;
   -gtk-outline-radius: 50%; }
   button.circular label, button.nautilus-circular-button.image-button label,
@@ -3121,15 +3123,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
   border-left-style: none; }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-last-child(2):not(:active):not(:checked) {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
 
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+
 .caja-notebook {
   border-top: 1px solid #dcdfe3; }
 
@@ -3255,6 +3257,8 @@ pillbox {
   color: #ffffff;
   background-color: #5294e2;
   border-radius: 3px; }
+  pillbox:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
 
 docktabstrip {
   padding: 0 6px;
@@ -3288,6 +3292,62 @@ dockoverlayedge {
   dockoverlayedge.right-edge tab:checked {
     border-width: 1px 0; }
 
+popover.messagepopover.background {
+  padding: 0; }
+
+popover.messagepopover .popover-content-area {
+  margin: 16px; }
+
+popover.messagepopover .popover-action-area {
+  margin: 8px; }
+  popover.messagepopover .popover-action-area button:not(:first-child):not(:last-child) {
+    margin: 0 4px; }
+
+popover.popover-selector {
+  padding: 0; }
+  popover.popover-selector list row {
+    padding: 5px 0; }
+  popover.popover-selector list row image {
+    margin-left: 3px;
+    margin-right: 10px; }
+
+entry.search.preferences-search {
+  border: none;
+  border-right: 1px solid #dcdfe3;
+  border-bottom: 1px solid #dcdfe3;
+  border-radius: 0; }
+
+preferences stacksidebar.sidebar list {
+  background-image: linear-gradient(to bottom, #ffffff, #ffffff); }
+
+preferences stacksidebar.sidebar list separator {
+  background-color: transparent; }
+
+devhelppanel entry:focus,
+symboltreepanel entry:focus {
+  border-color: #dcdfe3; }
+
+button.run-arrow-button {
+  min-width: 12px; }
+
+omnibar.linked > entry:not(:only-child) {
+  border-style: solid;
+  border-radius: 3px;
+  margin-left: 1px;
+  margin-right: 1px; }
+
+gstyleslidein #scale_box button.toggle:checked,
+gstyleslidein #strings_controls button.toggle:checked,
+gstyleslidein #palette_controls button.toggle:checked,
+gstyleslidein #components_controls button.toggle:checked {
+  color: #5c616c; }
+
+configurationview entry.flat {
+  background: none; }
+
+configurationview list {
+  border-width: 0; }
+
 .documents-scrolledwin.frame {
   border-width: 0; }
 
@@ -3335,10 +3395,17 @@ button.documents-favorite:active:hover {
   opacity: 0.0;
   transition: opacity 0.2s ease-out; }
 
+.tweak-categories,
+.tweak-category:not(:selected):not(:hover) {
+  background-image: linear-gradient(to bottom, #ffffff, #ffffff); }
+
 .tr-workarea undershoot,
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar {
+  background: none; }
+
 #gf-bubble, #gf-bubble.solid,
 #gf-osd-window,
 #gf-osd-window.solid,
@@ -3392,6 +3459,19 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   background-color: #5294e2;
   border-radius: 2px; }
 
+MsdOsdWindow.background.osd {
+  border-radius: 2px;
+  border: 1px solid rgba(35, 38, 46, 0.95); }
+  MsdOsdWindow.background.osd .progressbar {
+    background-color: #5294e2;
+    border: none;
+    border-color: red;
+    border-radius: 5px; }
+  MsdOsdWindow.background.osd .trough {
+    background-color: rgba(42, 45, 55, 0.95);
+    border: none;
+    border-radius: 5px; }
+
 .mate-panel-menu-bar, .mate-panel-menu-bar menubar,
 panel-toplevel.background,
 panel-toplevel.background menubar {
@@ -3501,6 +3581,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
@@ -3576,7 +3657,7 @@ UnityDecoration {
   -UnityDecoration-title-indent: 10px;
   -UnityDecoration-title-fade: 35px;
   -UnityDecoration-title-alignment: 0.0; }
-  UnityDecoration.top {
+  UnityDecoration .top {
     border: 1px solid rgba(32, 35, 43, 0.97);
     border-bottom-width: 0;
     border-radius: 4px 4px 0 0;
@@ -3584,10 +3665,11 @@ UnityDecoration {
     background-image: linear-gradient(to bottom, #2f343f, #2f343f);
     color: rgba(207, 218, 231, 0.8);
     box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); }
-    UnityDecoration.top:backdrop {
+    UnityDecoration .top:backdrop {
       border-bottom-width: 0;
       color: rgba(207, 218, 231, 0.5); }
-  UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
+  UnityDecoration .left, UnityDecoration .right, UnityDecoration .bottom,
+  UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration .bottom:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97), rgba(32, 35, 43, 0.97)); }
 
@@ -3853,11 +3935,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font-weight: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window menubar,
-  #panel_window menubar > menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font-weight: bold; }
+  #panel_window menubar {
+    padding-left: 5px; }
+    #panel_window menubar, #panel_window menubar > menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font-weight: bold; }
   #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window menubar menuitem:disabled label {

common/gtk-3.0/3.20/gtk-solid-dark.css

@@ -576,15 +576,15 @@ button {
 .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); }
 
-.linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
-
-.linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); }
 
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
+
 .linked.vertical > entry + entry {
   border-top-color: rgba(43, 46, 57, 0.3); }
 
@@ -881,7 +881,7 @@ toolbar, .inline-toolbar {
   toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
-.primary-toolbar {
+.primary-toolbar:not(.libreoffice-toolbar) {
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343f;
   box-shadow: none;
@@ -1029,13 +1029,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .titlebar:not(headerbar) > separator {
   background-image: linear-gradient(to bottom, #262a33, #262a33); }
 
-.primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
+.primary-toolbar:not(.libreoffice-toolbar) separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
   border-width: 0 1px;
   border-image: linear-gradient(to bottom, rgba(207, 218, 231, 0) 25%, rgba(207, 218, 231, 0.15) 25%, rgba(207, 218, 231, 0.15) 75%, rgba(207, 218, 231, 0) 75%) 0 1/0 1px stretch; }
-  .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
+  .primary-toolbar:not(.libreoffice-toolbar) separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
     opacity: 0.6; }
 
 .primary-toolbar entry, headerbar entry {
@@ -1055,6 +1055,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar entry:disabled, headerbar entry:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
   .primary-toolbar entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1143,17 +1144,14 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked) {
-  box-shadow: none; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
 
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry {
   border-left-color: rgba(21, 23, 28, 0); }
@@ -1303,6 +1301,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
 
 .primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -2327,9 +2326,11 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid #2b2e39; }
-  frame > border.flat,
-  .frame.flat {
-    border-style: none; }
+
+frame.flat > border,
+frame > border.flat,
+.frame.flat {
+  border-style: none; }
 
 scrolledwindow viewport.frame {
   border-style: none; }
@@ -2828,8 +2829,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
 button.circular, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
-  min-width: 26px;
-  min-height: 26px;
+  min-width: 16px;
+  min-height: 24px;
+  padding: 2px 6px;
   border-radius: 50%;
   -gtk-outline-radius: 50%; }
   button.circular label, button.nautilus-circular-button.image-button label,
@@ -3123,15 +3125,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
   border-left-style: none; }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-last-child(2):not(:active):not(:checked) {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
 
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+
 .caja-notebook {
   border-top: 1px solid #2b2e39; }
 
@@ -3256,6 +3258,8 @@ pillbox {
   color: #ffffff;
   background-color: #5294e2;
   border-radius: 3px; }
+  pillbox:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
 
 docktabstrip {
   padding: 0 6px;
@@ -3289,6 +3293,62 @@ dockoverlayedge {
   dockoverlayedge.right-edge tab:checked {
     border-width: 1px 0; }
 
+popover.messagepopover.background {
+  padding: 0; }
+
+popover.messagepopover .popover-content-area {
+  margin: 16px; }
+
+popover.messagepopover .popover-action-area {
+  margin: 8px; }
+  popover.messagepopover .popover-action-area button:not(:first-child):not(:last-child) {
+    margin: 0 4px; }
+
+popover.popover-selector {
+  padding: 0; }
+  popover.popover-selector list row {
+    padding: 5px 0; }
+  popover.popover-selector list row image {
+    margin-left: 3px;
+    margin-right: 10px; }
+
+entry.search.preferences-search {
+  border: none;
+  border-right: 1px solid #2b2e39;
+  border-bottom: 1px solid #2b2e39;
+  border-radius: 0; }
+
+preferences stacksidebar.sidebar list {
+  background-image: linear-gradient(to bottom, #404552, #404552); }
+
+preferences stacksidebar.sidebar list separator {
+  background-color: transparent; }
+
+devhelppanel entry:focus,
+symboltreepanel entry:focus {
+  border-color: #2b2e39; }
+
+button.run-arrow-button {
+  min-width: 12px; }
+
+omnibar.linked > entry:not(:only-child) {
+  border-style: solid;
+  border-radius: 3px;
+  margin-left: 1px;
+  margin-right: 1px; }
+
+gstyleslidein #scale_box button.toggle:checked,
+gstyleslidein #strings_controls button.toggle:checked,
+gstyleslidein #palette_controls button.toggle:checked,
+gstyleslidein #components_controls button.toggle:checked {
+  color: #D3DAE3; }
+
+configurationview entry.flat {
+  background: none; }
+
+configurationview list {
+  border-width: 0; }
+
 .documents-scrolledwin.frame {
   border-width: 0; }
 
@@ -3336,10 +3396,17 @@ button.documents-favorite:active:hover {
   opacity: 0.0;
   transition: opacity 0.2s ease-out; }
 
+.tweak-categories,
+.tweak-category:not(:selected):not(:hover) {
+  background-image: linear-gradient(to bottom, #404552, #404552); }
+
 .tr-workarea undershoot,
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar {
+  background: none; }
+
 #gf-bubble, #gf-bubble.solid,
 #gf-osd-window,
 #gf-osd-window.solid,
@@ -3393,6 +3460,19 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   background-color: #5294e2;
   border-radius: 2px; }
 
+MsdOsdWindow.background.osd {
+  border-radius: 2px;
+  border: 1px solid #23262e; }
+  MsdOsdWindow.background.osd .progressbar {
+    background-color: #5294e2;
+    border: none;
+    border-color: red;
+    border-radius: 5px; }
+  MsdOsdWindow.background.osd .trough {
+    background-color: #2a2d37;
+    border: none;
+    border-radius: 5px; }
+
 .mate-panel-menu-bar, .mate-panel-menu-bar menubar,
 panel-toplevel.background,
 panel-toplevel.background menubar {
@@ -3502,6 +3582,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
@@ -3577,7 +3658,7 @@ UnityDecoration {
   -UnityDecoration-title-indent: 10px;
   -UnityDecoration-title-fade: 35px;
   -UnityDecoration-title-alignment: 0.0; }
-  UnityDecoration.top {
+  UnityDecoration .top {
     border: 1px solid #20232b;
     border-bottom-width: 0;
     border-radius: 4px 4px 0 0;
@@ -3585,10 +3666,11 @@ UnityDecoration {
     background-image: linear-gradient(to bottom, #2f343f, #2f343f);
     color: rgba(207, 218, 231, 0.8);
     box-shadow: inset 0 1px #363b48; }
-    UnityDecoration.top:backdrop {
+    UnityDecoration .top:backdrop {
       border-bottom-width: 0;
       color: rgba(207, 218, 231, 0.5); }
-  UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
+  UnityDecoration .left, UnityDecoration .right, UnityDecoration .bottom,
+  UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration .bottom:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #20232b, #20232b); }
 
@@ -3854,11 +3936,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font-weight: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window menubar,
-  #panel_window menubar > menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font-weight: bold; }
+  #panel_window menubar {
+    padding-left: 5px; }
+    #panel_window menubar, #panel_window menubar > menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font-weight: bold; }
   #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window menubar menuitem:disabled label {

common/gtk-3.0/3.20/gtk-solid-darker.css

@@ -575,15 +575,15 @@ button {
 .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
 
-.linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
-
-.linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
 
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
+
 .linked.vertical > entry + entry {
   border-top-color: rgba(207, 214, 230, 0.3); }
 
@@ -880,7 +880,7 @@ toolbar, .inline-toolbar {
   toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
-.primary-toolbar {
+.primary-toolbar:not(.libreoffice-toolbar) {
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343f;
   box-shadow: none;
@@ -1028,13 +1028,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .titlebar:not(headerbar) > separator {
   background-image: linear-gradient(to bottom, #262a33, #262a33); }
 
-.primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
+.primary-toolbar:not(.libreoffice-toolbar) separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
   border-width: 0 1px;
   border-image: linear-gradient(to bottom, rgba(207, 218, 231, 0) 25%, rgba(207, 218, 231, 0.15) 25%, rgba(207, 218, 231, 0.15) 75%, rgba(207, 218, 231, 0) 75%) 0 1/0 1px stretch; }
-  .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
+  .primary-toolbar:not(.libreoffice-toolbar) separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
     opacity: 0.6; }
 
 .primary-toolbar entry, headerbar entry {
@@ -1054,6 +1054,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar entry:disabled, headerbar entry:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
   .primary-toolbar entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1142,17 +1143,14 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked) {
-  box-shadow: none; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
 
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry {
   border-left-color: rgba(21, 23, 28, 0); }
@@ -1302,6 +1300,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
 
 .primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -2326,9 +2325,11 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid #dcdfe3; }
-  frame > border.flat,
-  .frame.flat {
-    border-style: none; }
+
+frame.flat > border,
+frame > border.flat,
+.frame.flat {
+  border-style: none; }
 
 scrolledwindow viewport.frame {
   border-style: none; }
@@ -2827,8 +2828,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
 button.circular, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
-  min-width: 26px;
-  min-height: 26px;
+  min-width: 16px;
+  min-height: 24px;
+  padding: 2px 6px;
   border-radius: 50%;
   -gtk-outline-radius: 50%; }
   button.circular label, button.nautilus-circular-button.image-button label,
@@ -3121,15 +3123,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
   border-left-style: none; }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-last-child(2):not(:active):not(:checked) {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
 
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+
 .caja-notebook {
   border-top: 1px solid #dcdfe3; }
 
@@ -3255,6 +3257,8 @@ pillbox {
   color: #ffffff;
   background-color: #5294e2;
   border-radius: 3px; }
+  pillbox:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
 
 docktabstrip {
   padding: 0 6px;
@@ -3288,6 +3292,62 @@ dockoverlayedge {
   dockoverlayedge.right-edge tab:checked {
     border-width: 1px 0; }
 
+popover.messagepopover.background {
+  padding: 0; }
+
+popover.messagepopover .popover-content-area {
+  margin: 16px; }
+
+popover.messagepopover .popover-action-area {
+  margin: 8px; }
+  popover.messagepopover .popover-action-area button:not(:first-child):not(:last-child) {
+    margin: 0 4px; }
+
+popover.popover-selector {
+  padding: 0; }
+  popover.popover-selector list row {
+    padding: 5px 0; }
+  popover.popover-selector list row image {
+    margin-left: 3px;
+    margin-right: 10px; }
+
+entry.search.preferences-search {
+  border: none;
+  border-right: 1px solid #dcdfe3;
+  border-bottom: 1px solid #dcdfe3;
+  border-radius: 0; }
+
+preferences stacksidebar.sidebar list {
+  background-image: linear-gradient(to bottom, #ffffff, #ffffff); }
+
+preferences stacksidebar.sidebar list separator {
+  background-color: transparent; }
+
+devhelppanel entry:focus,
+symboltreepanel entry:focus {
+  border-color: #dcdfe3; }
+
+button.run-arrow-button {
+  min-width: 12px; }
+
+omnibar.linked > entry:not(:only-child) {
+  border-style: solid;
+  border-radius: 3px;
+  margin-left: 1px;
+  margin-right: 1px; }
+
+gstyleslidein #scale_box button.toggle:checked,
+gstyleslidein #strings_controls button.toggle:checked,
+gstyleslidein #palette_controls button.toggle:checked,
+gstyleslidein #components_controls button.toggle:checked {
+  color: #5c616c; }
+
+configurationview entry.flat {
+  background: none; }
+
+configurationview list {
+  border-width: 0; }
+
 .documents-scrolledwin.frame {
   border-width: 0; }
 
@@ -3335,10 +3395,17 @@ button.documents-favorite:active:hover {
   opacity: 0.0;
   transition: opacity 0.2s ease-out; }
 
+.tweak-categories,
+.tweak-category:not(:selected):not(:hover) {
+  background-image: linear-gradient(to bottom, #ffffff, #ffffff); }
+
 .tr-workarea undershoot,
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar {
+  background: none; }
+
 #gf-bubble, #gf-bubble.solid,
 #gf-osd-window,
 #gf-osd-window.solid,
@@ -3392,6 +3459,19 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   background-color: #5294e2;
   border-radius: 2px; }
 
+MsdOsdWindow.background.osd {
+  border-radius: 2px;
+  border: 1px solid #23262e; }
+  MsdOsdWindow.background.osd .progressbar {
+    background-color: #5294e2;
+    border: none;
+    border-color: red;
+    border-radius: 5px; }
+  MsdOsdWindow.background.osd .trough {
+    background-color: #2a2d37;
+    border: none;
+    border-radius: 5px; }
+
 .mate-panel-menu-bar, .mate-panel-menu-bar menubar,
 panel-toplevel.background,
 panel-toplevel.background menubar {
@@ -3501,6 +3581,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
@@ -3576,7 +3657,7 @@ UnityDecoration {
   -UnityDecoration-title-indent: 10px;
   -UnityDecoration-title-fade: 35px;
   -UnityDecoration-title-alignment: 0.0; }
-  UnityDecoration.top {
+  UnityDecoration .top {
     border: 1px solid #20232b;
     border-bottom-width: 0;
     border-radius: 4px 4px 0 0;
@@ -3584,10 +3665,11 @@ UnityDecoration {
     background-image: linear-gradient(to bottom, #2f343f, #2f343f);
     color: rgba(207, 218, 231, 0.8);
     box-shadow: inset 0 1px #363b48; }
-    UnityDecoration.top:backdrop {
+    UnityDecoration .top:backdrop {
       border-bottom-width: 0;
       color: rgba(207, 218, 231, 0.5); }
-  UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
+  UnityDecoration .left, UnityDecoration .right, UnityDecoration .bottom,
+  UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration .bottom:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #20232b, #20232b); }
 
@@ -3853,11 +3935,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font-weight: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window menubar,
-  #panel_window menubar > menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font-weight: bold; }
+  #panel_window menubar {
+    padding-left: 5px; }
+    #panel_window menubar, #panel_window menubar > menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font-weight: bold; }
   #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window menubar menuitem:disabled label {

common/gtk-3.0/3.20/gtk-solid.css

@@ -575,15 +575,15 @@ button {
 .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
 
-.linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
-
-.linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
 
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
+
 .linked.vertical > entry + entry {
   border-top-color: rgba(207, 214, 230, 0.3); }
 
@@ -880,7 +880,7 @@ toolbar, .inline-toolbar {
   toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
-.primary-toolbar {
+.primary-toolbar:not(.libreoffice-toolbar) {
   color: rgba(82, 93, 118, 0.8);
   background-color: #e7e8eb;
   box-shadow: none;
@@ -1028,13 +1028,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .titlebar:not(headerbar) > separator {
   background-image: linear-gradient(to bottom, #d4d5db, #d4d5db); }
 
-.primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
+.primary-toolbar:not(.libreoffice-toolbar) separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
   border-width: 0 1px;
   border-image: linear-gradient(to bottom, rgba(82, 93, 118, 0) 25%, rgba(82, 93, 118, 0.15) 25%, rgba(82, 93, 118, 0.15) 75%, rgba(82, 93, 118, 0) 75%) 0 1/0 1px stretch; }
-  .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
+  .primary-toolbar:not(.libreoffice-toolbar) separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
     opacity: 0.6; }
 
 .primary-toolbar entry, headerbar entry {
@@ -1054,6 +1054,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar entry:disabled, headerbar entry:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
   .primary-toolbar entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1142,17 +1143,14 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked) {
-  box-shadow: none; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
 
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry {
   border-left-color: rgba(82, 93, 118, 0); }
@@ -1302,6 +1300,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
 
 .primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -2330,9 +2329,11 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid #dcdfe3; }
-  frame > border.flat,
-  .frame.flat {
-    border-style: none; }
+
+frame.flat > border,
+frame > border.flat,
+.frame.flat {
+  border-style: none; }
 
 scrolledwindow viewport.frame {
   border-style: none; }
@@ -2831,8 +2832,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
 button.circular, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
-  min-width: 26px;
-  min-height: 26px;
+  min-width: 16px;
+  min-height: 24px;
+  padding: 2px 6px;
   border-radius: 50%;
   -gtk-outline-radius: 50%; }
   button.circular label, button.nautilus-circular-button.image-button label,
@@ -3125,15 +3127,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
   border-left-style: none; }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-last-child(2):not(:active):not(:checked) {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
 
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+
 .caja-notebook {
   border-top: 1px solid #dcdfe3; }
 
@@ -3259,6 +3261,8 @@ pillbox {
   color: #ffffff;
   background-color: #5294e2;
   border-radius: 3px; }
+  pillbox:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
 
 docktabstrip {
   padding: 0 6px;
@@ -3292,6 +3296,62 @@ dockoverlayedge {
   dockoverlayedge.right-edge tab:checked {
     border-width: 1px 0; }
 
+popover.messagepopover.background {
+  padding: 0; }
+
+popover.messagepopover .popover-content-area {
+  margin: 16px; }
+
+popover.messagepopover .popover-action-area {
+  margin: 8px; }
+  popover.messagepopover .popover-action-area button:not(:first-child):not(:last-child) {
+    margin: 0 4px; }
+
+popover.popover-selector {
+  padding: 0; }
+  popover.popover-selector list row {
+    padding: 5px 0; }
+  popover.popover-selector list row image {
+    margin-left: 3px;
+    margin-right: 10px; }
+
+entry.search.preferences-search {
+  border: none;
+  border-right: 1px solid #dcdfe3;
+  border-bottom: 1px solid #dcdfe3;
+  border-radius: 0; }
+
+preferences stacksidebar.sidebar list {
+  background-image: linear-gradient(to bottom, #ffffff, #ffffff); }
+
+preferences stacksidebar.sidebar list separator {
+  background-color: transparent; }
+
+devhelppanel entry:focus,
+symboltreepanel entry:focus {
+  border-color: #dcdfe3; }
+
+button.run-arrow-button {
+  min-width: 12px; }
+
+omnibar.linked > entry:not(:only-child) {
+  border-style: solid;
+  border-radius: 3px;
+  margin-left: 1px;
+  margin-right: 1px; }
+
+gstyleslidein #scale_box button.toggle:checked,
+gstyleslidein #strings_controls button.toggle:checked,
+gstyleslidein #palette_controls button.toggle:checked,
+gstyleslidein #components_controls button.toggle:checked {
+  color: #5c616c; }
+
+configurationview entry.flat {
+  background: none; }
+
+configurationview list {
+  border-width: 0; }
+
 .documents-scrolledwin.frame {
   border-width: 0; }
 
@@ -3339,10 +3399,17 @@ button.documents-favorite:active:hover {
   opacity: 0.0;
   transition: opacity 0.2s ease-out; }
 
+.tweak-categories,
+.tweak-category:not(:selected):not(:hover) {
+  background-image: linear-gradient(to bottom, #ffffff, #ffffff); }
+
 .tr-workarea undershoot,
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar {
+  background: none; }
+
 #gf-bubble, #gf-bubble.solid,
 #gf-osd-window,
 #gf-osd-window.solid,
@@ -3396,6 +3463,19 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   background-color: #5294e2;
   border-radius: 2px; }
 
+MsdOsdWindow.background.osd {
+  border-radius: 2px;
+  border: 1px solid #23262e; }
+  MsdOsdWindow.background.osd .progressbar {
+    background-color: #5294e2;
+    border: none;
+    border-color: red;
+    border-radius: 5px; }
+  MsdOsdWindow.background.osd .trough {
+    background-color: #2a2d37;
+    border: none;
+    border-radius: 5px; }
+
 .mate-panel-menu-bar, .mate-panel-menu-bar menubar,
 panel-toplevel.background,
 panel-toplevel.background menubar {
@@ -3505,6 +3585,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
@@ -3580,7 +3661,7 @@ UnityDecoration {
   -UnityDecoration-title-indent: 10px;
   -UnityDecoration-title-fade: 35px;
   -UnityDecoration-title-alignment: 0.0; }
-  UnityDecoration.top {
+  UnityDecoration .top {
     border: 1px solid rgba(0, 0, 0, 0.1);
     border-bottom-width: 0;
     border-radius: 4px 4px 0 0;
@@ -3588,10 +3669,11 @@ UnityDecoration {
     background-image: linear-gradient(to bottom, #e7e8eb, #e7e8eb);
     color: rgba(82, 93, 118, 0.8);
     box-shadow: inset 0 1px #eff0f2; }
-    UnityDecoration.top:backdrop {
+    UnityDecoration .top:backdrop {
       border-bottom-width: 0;
       color: rgba(82, 93, 118, 0.5); }
-  UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
+  UnityDecoration .left, UnityDecoration .right, UnityDecoration .bottom,
+  UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration .bottom:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); }
 
@@ -3857,11 +3939,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font-weight: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window menubar,
-  #panel_window menubar > menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font-weight: bold; }
+  #panel_window menubar {
+    padding-left: 5px; }
+    #panel_window menubar, #panel_window menubar > menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font-weight: bold; }
   #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window menubar menuitem:disabled label {

common/gtk-3.0/3.20/gtk.css

@@ -575,15 +575,15 @@ button {
 .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
 
-.linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
-
-.linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
 
+.linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
+
 .linked.vertical > entry + entry {
   border-top-color: rgba(207, 214, 230, 0.3); }
 
@@ -880,7 +880,7 @@ toolbar, .inline-toolbar {
   toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
-.primary-toolbar {
+.primary-toolbar:not(.libreoffice-toolbar) {
   color: rgba(82, 93, 118, 0.8);
   background-color: #e7e8eb;
   box-shadow: none;
@@ -1028,13 +1028,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .titlebar:not(headerbar) > separator {
   background-image: linear-gradient(to bottom, rgba(212, 213, 219, 0.95), rgba(212, 213, 219, 0.95)); }
 
-.primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
+.primary-toolbar:not(.libreoffice-toolbar) separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
   background: none;
   border-width: 0 1px;
   border-image: linear-gradient(to bottom, rgba(82, 93, 118, 0) 25%, rgba(82, 93, 118, 0.15) 25%, rgba(82, 93, 118, 0.15) 75%, rgba(82, 93, 118, 0) 75%) 0 1/0 1px stretch; }
-  .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
+  .primary-toolbar:not(.libreoffice-toolbar) separator:backdrop, headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
     opacity: 0.6; }
 
 .primary-toolbar entry, headerbar entry {
@@ -1054,6 +1054,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar entry:disabled, headerbar entry:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
   .primary-toolbar entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1142,17 +1143,14 @@ window.csd > .titlebar:not(headerbar):backdrop {
 .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
   border-left-style: none; }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical).path-bar button:nth-last-child(2):not(:active):not(:checked) {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-child(2):not(:active):not(:checked), .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked), headerbar .linked:not(.vertical):not(.path-bar).stack-switcher button:nth-last-child(2):not(:active):not(:checked) {
-  box-shadow: none; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
 
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry {
   border-left-color: rgba(82, 93, 118, 0); }
@@ -1302,6 +1300,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
 
 .primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -2330,9 +2329,11 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid #dcdfe3; }
-  frame > border.flat,
-  .frame.flat {
-    border-style: none; }
+
+frame.flat > border,
+frame > border.flat,
+.frame.flat {
+  border-style: none; }
 
 scrolledwindow viewport.frame {
   border-style: none; }
@@ -2831,8 +2832,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection {
 button.circular, button.nautilus-circular-button.image-button,
 button.circular-button {
   padding: 0;
-  min-width: 26px;
-  min-height: 26px;
+  min-width: 16px;
+  min-height: 24px;
+  padding: 2px 6px;
   border-radius: 50%;
   -gtk-outline-radius: 50%; }
   button.circular label, button.nautilus-circular-button.image-button label,
@@ -3125,15 +3127,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
   border-left-style: none; }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child):hover {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-child(2):not(:active):not(:checked) {
-  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-
-.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) button:nth-last-child(2):not(:active):not(:checked) {
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
 
+.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+
 .caja-notebook {
   border-top: 1px solid #dcdfe3; }
 
@@ -3259,6 +3261,8 @@ pillbox {
   color: #ffffff;
   background-color: #5294e2;
   border-radius: 3px; }
+  pillbox:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
 
 docktabstrip {
   padding: 0 6px;
@@ -3292,6 +3296,62 @@ dockoverlayedge {
   dockoverlayedge.right-edge tab:checked {
     border-width: 1px 0; }
 
+popover.messagepopover.background {
+  padding: 0; }
+
+popover.messagepopover .popover-content-area {
+  margin: 16px; }
+
+popover.messagepopover .popover-action-area {
+  margin: 8px; }
+  popover.messagepopover .popover-action-area button:not(:first-child):not(:last-child) {
+    margin: 0 4px; }
+
+popover.popover-selector {
+  padding: 0; }
+  popover.popover-selector list row {
+    padding: 5px 0; }
+  popover.popover-selector list row image {
+    margin-left: 3px;
+    margin-right: 10px; }
+
+entry.search.preferences-search {
+  border: none;
+  border-right: 1px solid #dcdfe3;
+  border-bottom: 1px solid #dcdfe3;
+  border-radius: 0; }
+
+preferences stacksidebar.sidebar list {
+  background-image: linear-gradient(to bottom, #ffffff, #ffffff); }
+
+preferences stacksidebar.sidebar list separator {
+  background-color: transparent; }
+
+devhelppanel entry:focus,
+symboltreepanel entry:focus {
+  border-color: #dcdfe3; }
+
+button.run-arrow-button {
+  min-width: 12px; }
+
+omnibar.linked > entry:not(:only-child) {
+  border-style: solid;
+  border-radius: 3px;
+  margin-left: 1px;
+  margin-right: 1px; }
+
+gstyleslidein #scale_box button.toggle:checked,
+gstyleslidein #strings_controls button.toggle:checked,
+gstyleslidein #palette_controls button.toggle:checked,
+gstyleslidein #components_controls button.toggle:checked {
+  color: #5c616c; }
+
+configurationview entry.flat {
+  background: none; }
+
+configurationview list {
+  border-width: 0; }
+
 .documents-scrolledwin.frame {
   border-width: 0; }
 
@@ -3339,10 +3399,17 @@ button.documents-favorite:active:hover {
   opacity: 0.0;
   transition: opacity 0.2s ease-out; }
 
+.tweak-categories,
+.tweak-category:not(:selected):not(:hover) {
+  background-image: linear-gradient(to bottom, #ffffff, #ffffff); }
+
 .tr-workarea undershoot,
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar {
+  background: none; }
+
 #gf-bubble, #gf-bubble.solid,
 #gf-osd-window,
 #gf-osd-window.solid,
@@ -3396,6 +3463,19 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   background-color: #5294e2;
   border-radius: 2px; }
 
+MsdOsdWindow.background.osd {
+  border-radius: 2px;
+  border: 1px solid rgba(35, 38, 46, 0.95); }
+  MsdOsdWindow.background.osd .progressbar {
+    background-color: #5294e2;
+    border: none;
+    border-color: red;
+    border-radius: 5px; }
+  MsdOsdWindow.background.osd .trough {
+    background-color: rgba(42, 45, 55, 0.95);
+    border: none;
+    border-radius: 5px; }
+
 .mate-panel-menu-bar, .mate-panel-menu-bar menubar,
 panel-toplevel.background,
 panel-toplevel.background menubar {
@@ -3505,6 +3585,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
@@ -3580,7 +3661,7 @@ UnityDecoration {
   -UnityDecoration-title-indent: 10px;
   -UnityDecoration-title-fade: 35px;
   -UnityDecoration-title-alignment: 0.0; }
-  UnityDecoration.top {
+  UnityDecoration .top {
     border: 1px solid rgba(0, 0, 0, 0.1);
     border-bottom-width: 0;
     border-radius: 4px 4px 0 0;
@@ -3588,10 +3669,11 @@ UnityDecoration {
     background-image: linear-gradient(to bottom, #e7e8eb, #e7e8eb);
     color: rgba(82, 93, 118, 0.8);
     box-shadow: inset 0 1px rgba(239, 240, 242, 0.95); }
-    UnityDecoration.top:backdrop {
+    UnityDecoration .top:backdrop {
       border-bottom-width: 0;
       color: rgba(82, 93, 118, 0.5); }
-  UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
+  UnityDecoration .left, UnityDecoration .right, UnityDecoration .bottom,
+  UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration .bottom:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); }
 
@@ -3857,11 +3939,12 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font-weight: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window menubar,
-  #panel_window menubar > menuitem {
-    background-color: transparent;
-    color: #BAC3CF;
-    font-weight: bold; }
+  #panel_window menubar {
+    padding-left: 5px; }
+    #panel_window menubar, #panel_window menubar > menuitem {
+      background-color: transparent;
+      color: #BAC3CF;
+      font-weight: bold; }
   #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
     #panel_window menubar menuitem:disabled label {

common/gtk-3.0/3.20/sass/_applications.scss

@@ -285,6 +285,8 @@ $disk_space_free: darken($bg_color, 3%);
 //
 // Gnome Builder
 //
+// TODO: Merge this with the upstream stylesheet
+
 .gb-search-entry-occurrences-tag { background: none; }
 
 workbench.csd > stack.titlebar:not(headerbar) {
@@ -319,6 +321,8 @@ pillbox {
   color: $selected_fg_color;
   background-color: $selected_bg_color;
   border-radius: 3px;
+
+  &:disabled label { color: transparentize($selected_fg_color, 0.5) }
 }
 
 docktabstrip {
@@ -365,6 +369,63 @@ dockoverlayedge {
   }
 }
 
+popover.messagepopover {
+  &.background { padding: 0; }
+
+  .popover-content-area { margin: 16px; }
+  .popover-action-area {
+    margin: 8px;
+
+    button:not(:first-child):not(:last-child) { margin: 0 4px; }
+  }
+}
+
+popover.popover-selector {
+  padding: 0;
+
+  list {
+    row { padding: 5px 0; }
+    row image { margin-left: 3px; margin-right: 10px; }
+  }
+}
+
+entry.search.preferences-search {
+  border: none;
+  border-right: 1px solid $borders_color;
+  border-bottom: 1px solid $borders_color;
+  border-radius: 0;
+}
+
+preferences stacksidebar.sidebar {
+  list { background-image: _solid($base_color); }
+
+  list separator { background-color: transparent; }
+}
+
+devhelppanel entry:focus,
+symboltreepanel entry:focus {
+  border-color: $borders_color
+}
+
+button.run-arrow-button {
+  min-width: 12px;
+}
+
+omnibar.linked > entry:not(:only-child) { border-style: solid; border-radius: 3px; margin-left: 1px; margin-right: 1px; }
+
+gstyleslidein {
+  #scale_box,
+  #strings_controls,
+  #palette_controls,
+  #components_controls {
+    button.toggle:checked { color: $fg_color; }
+  }
+}
+
+configurationview {
+  entry.flat { background: none; }
+  list { border-width: 0; }
+}
 
 //
 // Epiphany
@@ -440,6 +501,14 @@ button.documents-favorite:active:hover {
     transition: opacity 0.2s ease-out;
 }
 
+//
+// Gnome Tweak Tool
+//
+.tweak-categories,
+.tweak-category:not(:selected):not(:hover) {
+  background-image: _solid($base_color);
+}
+
 //
 // Transmission
 //
@@ -448,6 +517,13 @@ button.documents-favorite:active:hover {
   border-color: transparent; // Remove black border on over- and undershoot
 }
 
+//
+// Atril (MATE pdf viewer)
+//
+.atril-window .primary-toolbar toolbar {
+  background: none;
+}
+
 //
 // Gnome Flashback
 //
@@ -498,6 +574,26 @@ gf-candidate-box {
   }
 }
 
+//
+// Mate OSD Window
+//
+MsdOsdWindow.background.osd {
+  border-radius: 2px;
+  border: 1px solid darken($osd_bg_color, 8%);
+
+  .progressbar {
+    background-color: $selected_bg_color;
+    border: none;
+    border-color: red;
+    border-radius: 5px;
+  }
+  .trough {
+    background-color: darken($osd_bg_color, 5%);
+    border: none;
+    border-radius: 5px;
+  }
+}
+
 //
 // Mate/Gnome Flashback Panel
 //

common/gtk-3.0/3.20/sass/_common.scss

@@ -651,17 +651,17 @@ toolbar.inline-toolbar toolbutton {
 // special case, because path-bars are bugged
 @mixin pathbar_linking_rules($sep_color:if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5))) {
 
-    > button + button { border-left-style: none; }
+  > button + button { border-left-style: none; }
 
-    > button:hover:not(:checked):not(:active):not(:only-child):not(:first-child):not(:last-child) {
+  > button:hover:not(:checked):not(:active):not(:only-child) {
 
-      &:hover {
-        box-shadow: inset  1px 0 $sep_color,
-                    inset -1px 0 $sep_color;
-      }
+    &:hover {
+      box-shadow: inset  1px 0 $sep_color,
+                  inset -1px 0 $sep_color;
     }
-    button:nth-child(2):not(:active):not(:checked) { box-shadow: inset 1px 0 $sep_color; }
-    button:nth-last-child(2):not(:active):not(:checked) { box-shadow: inset -1px 0 $sep_color; }
+    &:first-child:hover { box-shadow: inset -1px 0 $sep_color; }
+    &:last-child:hover { box-shadow: inset 1px 0 $sep_color; }
+  }
 }
 
 // Apply the rules defined above
@@ -927,7 +927,7 @@ toolbar {
   }
 }
 
-.primary-toolbar {
+.primary-toolbar:not(.libreoffice-toolbar) {  // LO messes up the toolbar styling, so exclude LO toolbars
   color: $header_fg;
   background-color: opacify($header_bg, 1);
   box-shadow: none;
@@ -939,10 +939,10 @@ toolbar {
   //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   separator { @extend %header_separator; }
-
-  @extend %header_widgets;
 }
 
+.primary-toolbar { @extend %header_widgets; }
+
 .inline-toolbar {
   @extend toolbar;
   background-color: darken($bg_color, 3%);
@@ -1244,13 +1244,8 @@ headerbar {
 
       &, &:hover, &:active, &:checked, &:disabled { @extend %linked; }
     }
-
     @include pathbar_linking_rules($sep_color:$header_button_border);
   }
-  .linked:not(.vertical):not(.path-bar).stack-switcher {
-    button:nth-child(2):not(:active):not(:checked),
-    button:nth-last-child(2):not(:active):not(:checked) { box-shadow: none; }
-  }
 
   // use linking rules for entries only
   .linked:not(.vertical):not(.path-bar) {
@@ -2407,8 +2402,12 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid $borders_color;
+}
 
-  &.flat { border-style: none; }
+frame.flat > border,
+frame > border.flat,
+.frame.flat {
+  border-style: none;
 }
 
 scrolledwindow {
@@ -3032,8 +3031,9 @@ colorchooser .popover.osd { border-radius: 3px; }
 button.circular,
 button.circular-button {
   padding: 0;
-  min-width: 26px;
-  min-height: 26px;
+  min-width: 16px;
+  min-height: 24px;
+  padding: 2px 6px;
   border-radius: 50%;
   -gtk-outline-radius: 50%;
 

common/gtk-3.0/3.20/sass/_drawing.scss

@@ -74,6 +74,7 @@
   // insensitive header-bar entry
   //
     color: transparentize($header_fg, 0.45);
+    border-color: $header_entry_border;
     background-color: transparentize($header_entry_bg, 0.15);
   }
 

common/gtk-3.0/3.20/sass/_lightdm.scss

@@ -6,11 +6,14 @@
   box-shadow: inset 0 -1px darken($panel_bg, 7%);
 
   // the menubars/menus of the panel, i.e. indicators
-  menubar,
-  menubar > menuitem {
-    background-color: transparent;
-    color: $panel_fg;
-    font-weight: bold;
+  menubar {
+    padding-left: 5px;
+
+    &, > menuitem {
+      background-color: transparent;
+      color: $panel_fg;
+      font-weight: bold;
+    }
   }
 
   menubar menuitem:disabled {

common/gtk-3.0/3.20/sass/_unity.scss

@@ -17,7 +17,7 @@ UnityDecoration {
   -UnityDecoration-title-fade: 35px;
   -UnityDecoration-title-alignment: 0.0;
 
-  &.top {
+  .top {
     border: 1px solid if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9));
     border-bottom-width: 0;
     border-radius: 4px 4px 0 0;
@@ -34,8 +34,8 @@ UnityDecoration {
       color: transparentize($header_fg, 0.3);
     }
   }
-  &.left, &.right, &.bottom,
-  &.left:backdrop, &.right:backdrop, &.bottom:backdrop {
+  .left, .right, .bottom,
+  .left:backdrop, .right:backdrop, .bottom:backdrop {
     background-color: transparent;
     background-image: _solid(if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9)));
   }

configure.ac

@@ -1,6 +1,6 @@
 AC_INIT(
     [arc-theme],
-    [20160923],
+    [20161119],
     [https://github.com/horst3180/Arc-theme/issues],
     [arc-theme],
     [https://github.com/horst3180/Arc-theme],