Add color for text_view_bg. Fixes #755

* Update README.md with instructions to use SassC

Updates the Build It instructions for using SassC instead of Ruby Sass

* Updates Makefile to replace Ruby Sass with SassC

This commit replaces the use of the Ruby Sass scss command with SassC's sassc command. Due to the more limited functionality of sassc, output directories must be created prior to running the command and only one file may be processed at a time unlike the many-to-many mode functionality of the scss command.

* Makes import directive relative in _gnome-terminal.scss

This commit changes the "widgets/button" import directive to be relative in the gtk-3.20 _gnome-terminal.scss file which is necessary when using SassC.

* Removes import directive in _gnome-terminal.scss 

This commit removes the "widgets/button" import directive in the gtk-3.20 _gnome-terminal.scss file which is unnecessary.

Co-authored-by: KTB <ktb83@users.noreply.github.com>

.github/CODE_OF_CONDUCT.md

@@ -1,24 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-- The use of sexualized language or imagery
-- Personal attacks
-- Trolling or insulting/derogatory comments
-- Public or private harassment
-- Publishing other's private information, such as physical or electronic addresses, without explicit permission
-- Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not inline with this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [numixproject@github.com](mailto:numixproject@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
-
-This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/

.github/CONTRIBUTING.md

@@ -26,7 +26,7 @@ These are just guidelines, not rules, use your best judgment and feel free to pr
 
 ### Code of Conduct
 
-This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
+This project adheres to the Contributor Covenant [code of conduct](/CODE_OF_CONDUCT.md).
 By participating, you are expected to uphold this code.
 Please report unacceptable behavior to [numixproject@github.com](mailto:numixproject@github.com).
 

CHANGES

@@ -1,3 +1,69 @@
+-------------->>>> 2.6.7 <<<<-------------------------->>>> 2.6.7 <<<<-------------------------->>>> 2.6.7 <<<<--------------
+[2017-10-14 13:52:32 +0530]  Gtk-3.20: Add message summary and popover-list styles for geary         Khurshid Alam  {fd8e657}
+[2017-10-14 13:49:06 +0530]  Update readme for Ubuntu and Debian                                     Khurshid Alam  {5d031a3}
+[2017-10-05 10:27:02 -0500]  Update README.md                                                       Dustin Falgout  {8d99a96}
+[2017-10-05 10:23:02 -0500]  Update urls for distro logo images in README.md                        Dustin Falgout  {a0bd7d1}
+[2017-08-30 00:16:16 +0100]  Xfwm4: improve accessibility (wider bottom edge)                       Andrew Chadwick {6057a2d}
+[2017-07-26 02:03:28 -0500]  Update CONTRIBUTING.md                                                 Dustin Falgout  {858e629}
+[2017-07-26 02:01:53 -0500]  Delete CODE_OF_CONDUCT.md                                              Dustin Falgout  {68d01fe}
+[2017-07-26 02:01:29 -0500]  Create CODE_OF_CONDUCT.md                                              Dustin Falgout  {88632d8}
+[2017-06-15 14:27:30 +0530]  [Gnome-Panel-3.24] Add style for tasklist-button                        Khurshid Alam  {f2425ca}
+[2017-06-13 20:10:05 +0530]  [Gtk-2.0] Set inkscape-decoration & gtk--small-toolbar icon to 16px..   Khurshid Alam  {abf6111}
+[2017-06-13 02:39:50 +0530]  [Gtk-3.20] Tilix: Do not bottom-border color                            Khurshid Alam  {06be2fa}
+[2017-06-13 02:34:23 +0530]  [Gtk-3.20] Tilix: Add bottom border for active titlebar. Fixes #657     Khurshid Alam  {82568c7}
+[2017-06-06 12:53:28 +0530]  [Gtk-3.20] Metacity: Use normal geometry-style for nautilus dialogs..   Khurshid Alam  {deed3fb}
+[2017-05-14 21:20:12 -0500]  Update README.md                                                       Dustin Falgout  {30ae59b}
+[2017-05-10 20:03:46 +0530]  Fix syntax error in previous commit                                     Khurshid Alam  {402fd48}
+[2017-05-10 14:05:55 +0530]  [Gtk-3.18] Fix white border on tilix. Fixes #655                        Khurshid Alam  {4289b97}
+[2017-04-16 19:49:09 -0400]  README: update Arch package name (#663)                                 Ronan Jouchet  {582f09f}
+[2017-04-14 22:11:26 +0530]  [Gtk-3.22] Tweaks in  popover.events list for gnome-calendar            Khurshid Alam  {487d8e6}
+[2017-04-08 22:58:43 +0530]  Use darker background for solid-csd window. Fixes #659                  Khurshid Alam  {bf8f3b0}
+[2017-03-29 21:44:29 +0530]   Fix indentation                                                        Khurshid Alam  {35e5463}
+[2017-03-29 21:30:13 +0530]  [Gtk-3.22] Re-Introduce disabled state under treeview.progressbar       Khurshid Alam  {ab172c2}
+[2017-03-29 19:35:48 +0530]  [Gtk-3.22] Progressbar under Treeview: Minor fixes                      Khurshid Alam  {c8828c7}
+[2017-03-21 01:23:40 -0500]  Update README.md                                                       Dustin Falgout  {deddc89}
+[2017-03-21 01:22:27 -0500]  Update README.md                                                       Dustin Falgout  {f55b6a7}
+[2017-03-13 22:38:18 +0530]  [Gtk-3.22] Use box-shadow to draw border on Notebook tab                Khurshid Alam  {d99f46c}
+[2017-02-15 13:29:13 +0530]  [Gtk-3.22] Separate titlebar mixin from toolbar                         Khurshid Alam  {f25d7e0}
+[2017-02-15 12:46:53 +0530]  Attempting to fix >1px height in linked combobox-button                 Khurshid Alam  {f52633e}
+[2017-02-09 22:15:04 +0530]  [Gtk-3.22] Provide gap between buttons in message dialog. 3.22 fix ..   Khurshid Alam  {ec299d4}
+[2017-02-09 22:06:13 +0530]  [Gtk-3.22] Fixing & adjusting menu & modelbutton padding                Khurshid Alam  {653556d}
+[2017-02-08 20:20:55 +0530]  [Gtk-3.20][Gtk-3.22] GtkCalendar under popover menu                     Khurshid Alam  {0220883}
+[2017-02-07 16:06:37 +0530]  [Gtk-3.22][Switches] Make slider to fall in-line with the text          Khurshid Alam  {23f1543}
+[2017-02-06 20:15:39 +0530]  [Button-Redesign] Lighten active a checked state button color for l..   Khurshid Alam  {d2f201b}
+[2017-02-06 18:25:09 +0530]  Fixinng notebook-tab-active color and close button style                Khurshid Alam  {777d586}
+[2017-02-05 10:39:36 +0530]  [Gtk-3.22][Button-Redesign] Spinbutton: Fixing color and entry border   Khurshid Alam  {85138a0}
+[2017-02-04 14:32:13 +0530]  [Gtk-3.22][Button-Redesign] Fixed spinbutton hover-state color          Khurshid Alam  {8670cc0}
+[2017-02-04 00:44:26 +0530]  [Gtk-3.22] Redesign-Buttons (Phase1)                                    Khurshid Alam  {9e4844a}
+[2017-01-30 22:22:09 +0530]  Flatter button. More prominent shadow on hover. Fixing #370             Khurshid Alam  {2363312}
+[2017-01-30 22:09:37 +0530]  [Gtk-3.22] Normalize Switches. Fixes #396                               Khurshid Alam  {3be320f}
+[2017-01-23 12:43:55 +0100]  [Gtk-3.22][Gtk-3.20] Fix iconview background for Unity-Control-Cent..   Csaba Jakosa   {1a8c9bf}
+[2017-01-22 19:20:32 +0100]  [GTK 3.22] Add hover effect for menuitem under Unity-LIM. Fixes #632    Csaba Jakosa   {45210ca}
+[2017-01-12 21:39:54 +0530]  Set Numix as default icon theme for MATE's theme picker. Fixes #488     Khurshid Alam  {92b576f}
+[2016-11-19 16:36:45 -0600]  Update README.md                                                       Dustin Falgout  {0e4a840}
+[2016-11-19 23:34:56 +0100]  Add Debian and Ubuntu official distro package, remove Ubuntu PPA. (..    Léo Andrès    {b24ed9e}
+-------------->>>> 2.6.6 <<<<-------------------------->>>> 2.6.6 <<<<-------------------------->>>> 2.6.6 <<<<--------------
+[2016-11-14 16:22:11 -0600]  update utils.sh script                                                 Dustin Falgout  {795932a}
+[2016-11-10 05:37:27 +0100]  [Gtk-3.20] Fixed gnome-terminal scrollbar color. Disable backdrop m..   Csaba Jakosa   {9574a02}
+[2016-11-01 18:10:06 +0100]  Disable box-shadow for osd button in fine-tune mode. Fixes #561.        Csaba Jakosa   {ad37d7f}
+[2016-11-01 19:08:14 +0200]  [Gtk-3.20] Fix for volume OSD slider. Fixes #623                       Nazar Mokrynskyi {14d2a48}
+[2016-11-01 13:58:47 +0530]  GTKHEADERB 3.22 :: Create global OSD file (#628)                        Khurshid Alam  {9ec47ab}
+[2016-11-01 09:21:28 +0100]  * Fixed code.                                                               Megax      {4d33256}
+[2016-11-01 09:18:25 +0100]  * Create global OSD file.                                                   Megax      {b3ba2ee}
+[2016-11-01 09:18:18 +0100]  [Gtk-3.20] Fixed xfce4 code.                                            Csaba Jakosa   {a4cefd6}
+[2016-10-31 18:58:14 +0100]  [GTK-3.20] Code Cleanup                                                 Csaba Jakosa   {6d54958}
+[2016-10-30 18:30:58 +0200]  [GTK-3.20] Added styling to Raven components of Budgie panel. Fixes..  Nazar Mokrynskyi {bbf9dd6}
+[2016-10-28 21:19:49 +0200]  [GTK 3.20] Optimized sidebar padding                                    Csaba Jakosa   {30132a0}
+[2016-10-27 21:13:29 +0530]  Fix syntax in previous commit                                           Khurshid Alam  {1d1d3a2}
+[2016-10-27 21:09:47 +0530]  Fix discrete filled block inside levelbar. Fixes #619                   Khurshid Alam  {32f0fec}
+[2016-10-27 20:35:00 +0530]  Tweak do_install in utils.sh                                            Khurshid Alam  {588a875}
+[2016-10-25 12:43:37 +0200]  [GTK 3.20] Fixed notebook asymmetrical padding                          Csaba Jakosa   {2f94d4c}
+[2016-10-24 08:39:15 +0200]  [Gtk-3.20] Optimized notebook padding                                   Csaba Jakosa   {023bd6f}
+[2016-10-23 16:33:14 -0500]  fix notebook tab padding issues for some applications. Fixes #588      Dustin Falgout  {7ac68f6}
+[2016-10-23 17:15:11 +0200]  * Nemo statusbar button padding fix. (#611)                             Csaba Jakosa   {aea6d16}
+[2016-10-23 02:14:28 -0500]  also support Numix-Frost-Light                                         Dustin Falgout  {05e6198}
+[2016-10-23 02:11:45 -0500]  update zip task in Makefile to support both Numix and Numix-Frost      Dustin Falgout  {95fe512}
+[2016-10-23 00:11:17 -0500]  utils.sh :: support Numix and Numix Frost when generating CHANGES f..  Dustin Falgout  {ee50385}
 -------------->>>> 2.6.5 <<<<-------------------------->>>> 2.6.5 <<<<-------------------------->>>> 2.6.5 <<<<--------------
 [2016-10-22 20:36:07 -0500]  add zip task to Makefile                                               Dustin Falgout  {5ccc199}
 [2016-10-22 20:18:42 -0500]  utils.sh :: fix errors in do_install function                          Dustin Falgout  {5f85cec}

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@numixproject.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

Makefile

@@ -1,5 +1,5 @@
-SASS=scss
-SASSFLAGS=--sourcemap=none
+SASS=sassc
+SASSFLAGS=-M -t expanded
 GLIB_COMPILE_RESOURCES=glib-compile-resources
 RES_DIR=src/gtk-3.0
 SCSS_DIR=$(RES_DIR)/scss
@@ -14,8 +14,12 @@ UTILS=scripts/utils.sh
 all: clean gresource
 
 css:
-	$(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR)
-	$(SASS) --update $(SASSFLAGS) $(SCSS_DIR320):$(DIST_DIR320)
+	mkdir $(DIST_DIR)
+	$(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk.scss $(DIST_DIR)/gtk.css
+	$(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk-dark.scss $(DIST_DIR)/gtk-dark.css
+	mkdir $(DIST_DIR320)
+	$(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk.scss $(DIST_DIR320)/gtk.css
+	$(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk-dark.scss $(DIST_DIR320)/gtk-dark.css
 
 gresource: css
 	$(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml
@@ -45,8 +49,8 @@ changes:
 
 zip: all
 	mkdir $(ROOT_DIR)/dist
-	$(UTILS) install $(ROOT_DIR)/dist/Numix
-	cd $(ROOT_DIR)/dist && zip --symlinks -rq Numix Numix
+	$(UTILS) install $(ROOT_DIR)/dist/$$(basename $(INSTALL_DIR))
+	cd $(ROOT_DIR)/dist && zip --symlinks -rq $$(basename $(INSTALL_DIR)) $$(basename $(INSTALL_DIR))
 
 
 .PHONY: all

README.md

@@ -1,54 +1,35 @@
 ## Numix
 ##### A modern flat theme with a combination of light and dark elements. It supports GNOME, Unity, Xfce and Openbox.
-[![By The Numix Project](https://img.shields.io/badge/By-The%20Numix%20Project-f0544c.svg?style=flat-square)](https://numixproject.org/)  [![Circle CI](https://img.shields.io/circleci/project/numixproject/numix-gtk-theme/master.svg?circle-token=b14acf911433d315298235b0c2fbf7b2670a92a8&maxAge=2592000&style=flat-square)](https://circleci.com/gh/numixproject/numix-gtk-theme/tree/master)  [![GitHub release](https://img.shields.io/github/release/numixproject/numix-gtk-theme.svg?maxAge=3600&style=flat-square)](https://github.com/numixproject/numix-gtk-theme/releases/latest)  ![Supports GTK+ 3.18](https://img.shields.io/badge/GTK%2B-3.18-4a90d9.svg?style=flat-square)  ![Supports GTK+ 3.20](https://img.shields.io/badge/GTK%2B-3.22-4a90d9.svg?style=flat-square)
+[![By The Numix Project](https://img.shields.io/badge/By-The%20Numix%20Project-f0544c.svg?style=flat-square)](https://numixproject.org/)  [![Circle CI](https://img.shields.io/circleci/project/numixproject/numix-gtk-theme/master.svg?circle-token=b14acf911433d315298235b0c2fbf7b2670a92a8&maxAge=3600&style=flat-square)](https://circleci.com/gh/numixproject/numix-gtk-theme/tree/master)  [![GitHub release](https://img.shields.io/github/release/numixproject/numix-gtk-theme.svg?maxAge=3600&style=flat-square)](https://github.com/numixproject/numix-gtk-theme/releases/latest)  ![Supports GTK+ 3.18](https://img.shields.io/badge/GTK%2B-3.18-4a90d9.svg?style=flat-square)  ![Supports GTK+ 3.24](https://img.shields.io/badge/GTK%2B-3.24-4a90d9.svg?style=flat-square)
 
 ## Install It
 
-### Official Distro Packages
+### Distro Packages
 |Distro|Install Command/Links|
 |:----:|:----:|
-|![arch](https://dl.dropboxusercontent.com/u/60521097/archlogo26x26.png) ![antergos](https://dl.dropboxusercontent.com/u/60521097/logo-square26x26.png)|`sudo pacman -S numix-themes`|
-|![openSUSE](https://dl.dropboxusercontent.com/u/60521097/Geeko-button-bling7.png)|[1 Click Install](http://software.opensuse.org/ymp/openSUSE:Factory/standard/numix-gtk-theme.ymp)  \|  [OBS Repo](http://software.opensuse.org/download.html?project=openSUSE%3AFactory&package=numix-gtk-theme)|
-|![fedora](https://dl.dropboxusercontent.com/u/60521097/fedora-logo.png)|`sudo dnf install numix-gtk-theme`|
-
-### Unofficial Distro Packages
-|Distro|Install Command/Links|
-|:----:|:----:|
-|![ubuntu](https://dl.dropboxusercontent.com/u/60521097/ubuntu_orange_hex.png)|[PPA](https://launchpad.net/~numix/+archive/ubuntu/ppa)|
-
+|![arch][arch]  ![antergos][antergos]|`sudo pacman -S numix-gtk-theme`|
+|![opensuse][opensuse]|[1 Click Install](http://software.opensuse.org/ymp/openSUSE:Factory/standard/numix-gtk-theme.ymp)  \|  [OBS Repo](http://software.opensuse.org/download.html?project=openSUSE%3AFactory&package=numix-gtk-theme)|
+|![fedora][fedora]|`sudo dnf install numix-gtk-theme`|
+|![debian][debian]  ![ubuntu][ubuntu]|`sudo apt install numix-gtk-theme`|
 
 ## Build It
 
 First, you need to compile the theme using the [Sass](http://sass-lang.com/) compiler.
 
-To install Sass, install Ruby and the gem command using your distribution's package manager. Then install `sass` with the `gem` command,
-
-`gem install sass`
+You will need to install SassC (`sassc`) which is likely to be available as a package in your distribution's software repositories.
 
 You'll also need the ```glib-compile-schemas``` and  ```gdk-pixbuf-pixdata``` commands in your path to generate the gresource binary. Install them using your distribution's package manager.
 
-#### Debian, Ubuntu
+|Distro|Commands|
+|:----:|:----:|
+|![arch][arch]  ![antergos][antergos]|`sudo pacman -S sassc glib2 gdk-pixbuf2`|
+|![opensuse][opensuse]|`sudo zypper install sassc glib2-devel gdk-pixbuf-devel`|
+|![fedora][fedora]|`sudo dnf install sassc glib2-devel gdk-pixbuf2-devel`|
+|![debian][debian]  ![ubuntu][ubuntu]|`sudo apt-get install sassc libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils`|
 
- ```sh
-sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils
-```
-
-#### Fedora
+After installing all the dependencies, change to the cloned directory and, run the following in Terminal,
 
 ```sh
-sudo dnf install glib2-devel gdk-pixbuf2-devel
-```
-
-#### Arch Linux
-
-```sh
-sudo pacman -S glib2 gdk-pixbuf2
-```
-
-After installing all the dependencies, switch to the cloned directory and, run the following in Terminal,
-
-```sh
-make
 sudo make install
 ```
 
@@ -66,6 +47,8 @@ xfconf-query -c xsettings -p /Net/ThemeName -s "Numix"
 xfconf-query -c xfwm4 -p /general/theme -s "Numix"
 ```
 
+In Openbox you can set the theme with [ObConf](http://openbox.org/wiki/ObConf:About) tool. Alternatively, you can set the theme by changing the `<name> `key value to `Numix` in the `<theme>` section of your rc.xml file.
+
 ### For contributors
 Start by reviewing the [guidelines for contributing](https://github.com/numixproject/numix-gtk-theme/blob/master/.github/CONTRIBUTING.md).
 
@@ -91,3 +74,12 @@ Murrine theme engine
 Report bugs or contribute at [GitHub](https://github.com/numixproject/numix-gtk-theme)
 
 License: GPL-3.0+
+
+
+[antergos]: https://antergos.com/distro-logos/logo-square26x26.png "antergos"
+[arch]: https://antergos.com/distro-logos/archlogo26x26.png "arch"
+[fedora]: https://antergos.com/distro-logos/fedora-logo.png "fedora"
+[openSUSE]: https://antergos.com/distro-logos/Geeko-button-bling7.png "openSUSE"
+[ubuntu]: https://antergos.com/distro-logos/ubuntu_orange_hex.png "ubuntu"
+[debian]: https://antergos.com/distro-logos/openlogo-nd-25.png "debian"
+

scripts/utils.sh

@@ -19,7 +19,7 @@ do_install() {
 	do
 		GTKVER="${_DIR##*/}"
 
-		mkdir "${_DIR}"
+		mkdir -p "${_DIR}"
 
 		cp -t "${_DIR}" \
 			"${GTKVER}/gtk.css" \
@@ -28,7 +28,7 @@ do_install() {
 			"${GTKVER}/thumbnail.png"
 
 		cd "${_DIR}"
-		ln -sr ../assets assets
+		ln -srf ../assets assets
 		cd -
 	done
 }
@@ -48,15 +48,32 @@ output_changes_file_version_marker() {
 
 
 update_changes_file() {
-	local LAST_STABLE_RELEASE NEXT_STABLE_RELEASE
-
-	LAST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1))
-
+	LAST_STABLE_RELEASE=$(git describe --abbrev=0 --tags $(git rev-list --tags --max-count=1))
 	LAST_MAJOR_MINOR="${LAST_STABLE_RELEASE%.*}"
+
+	LAST_MAJOR="${LAST_STABLE_RELEASE%%.*}"
+	LAST_MINOR="${LAST_MAJOR_MINOR#*.}"
 	LAST_PATCH="${LAST_STABLE_RELEASE##*.}"
 
-	NEXT_PATCH=$(($LAST_PATCH + 1))
-	NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}"
+	case "${PWD##*/}" in
+		numix-gtk-theme)
+			NEXT_PATCH=$(($LAST_PATCH + 1))
+
+			NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}"
+		;;
+
+		Numix-Frost)
+			LAST_MAJOR=$(($LAST_MAJOR + 1))
+			NEXT_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}"
+			LAST_PATCH=$(($LAST_PATCH - 1))
+
+			LAST_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}"
+		;;
+
+		*)
+			echo 'Unknown directory!' && exit 1
+		;;
+	esac
 
 	[[ -f CHANGES ]] && mv CHANGES CHANGES.old
 

src/gtk-2.0/gtkrc

@@ -2,6 +2,8 @@
 
 gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#555555\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#444444\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#444444\ntitlebar_fg_color:#dddddd\nmenubar_bg_color:#444444\nmenubar_fg_color:#dddddd\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#555555\nmenu_bg_color:#444444\nmenu_fg_color:#dddddd\npanel_bg_color:#444444\npanel_fg_color:#dddddd\nlink_color:#f06860"
 
+gtk-icon-sizes = "inkscape-decoration=16,16:gtk-small-toolbar=16,16"
+
 # Default Style
 
 style "murrine-default" {

src/gtk-3.0/scss/_colors.scss

@@ -31,6 +31,7 @@
 @define-color success_color #{"" + $success_color};
 @define-color warning_color #{"" + $warning_color};
 @define-color error_color #{"" + $error_color};
+@define-color text_view_bg #{"" + $base_color};
 
 /* widget colors */
 @define-color titlebar_bg_color @dark_bg_color;

src/gtk-3.0/scss/_widgets.scss

@@ -31,7 +31,9 @@
 @import "apps/nemo";
 @import "apps/panel";
 @import "apps/synaptic";
+@import "apps/thunar";
 @import "apps/xfce";
 @import "apps/unity";
 @import "apps/lightdm";
 @import "apps/gnome-terminal";
+@import "apps/gnome-applications";

src/gtk-3.0/scss/apps/_gnome-applications.scss

@@ -0,0 +1,10 @@
+/****************
+ ! Tilix *
+*****************/
+
+@include exports("tilix") {
+    .terminal-titlebar {
+        border-color: $titlebar_bg_color;
+    }
+}
+

src/gtk-3.0/scss/apps/_thunar.scss

@@ -0,0 +1,17 @@
+@include exports("thunar") {
+.thunar {
+  scrolledwindow.sidebar treeview.view {
+    background: $bg_color;
+    color: $fg_color;
+    
+    &:selected, &:active {
+      background: $selected_bg_color;
+      color: $selected_fg_color;
+    }
+  }
+
+  scrolledwindow.shortcuts-pane {
+    border-top-width: 1;
+  }
+ }
+}

src/gtk-3.0/scss/apps/_xfce.scss

@@ -23,4 +23,17 @@
 
         .menu { -gtk-image-effect: none; }
     }
+
+    #XfceNotifyWindow {
+        background-color: $osd_bg;
+        color: $osd_fg;
+        border-radius: $roundness;
+        border: 1px solid border_normal($osd_bg);
+
+        GtkLabel {
+            &#summary {
+                font-weight: bold;
+            }
+        }
+    }
 }

src/gtk-3.0/scss/widgets/_osd.scss

@@ -8,8 +8,7 @@
 @include exports("osd") {
     GtkOverlay.osd { background-color: transparent; }
 
-    .osd,
-    #XfceNotifyWindow {
+    .osd {
         &.background {
             background-color: alpha($osd_bg, .8);
             color: $osd_fg;

src/gtk-3.20/scss/_colors.scss

@@ -31,6 +31,7 @@
 @define-color success_color #{"" + $success_color};
 @define-color warning_color #{"" + $warning_color};
 @define-color error_color #{"" + $error_color};
+@define-color text_view_bg #{"" + $base_color};
 
 /* widget colors */
 @define-color titlebar_bg_color @dark_bg_color;

src/gtk-3.20/scss/_global.scss

@@ -3,7 +3,7 @@
 @import "functions";
 
 // default color scheme
-$bg_color: if($variant == "dark", #444, #eee);
+$bg_color: if($variant == "dark", #444, #dedede);
 $fg_color: if($variant == "dark", #ddd, #555);
 $base_color: if($variant == "dark", #333, #fff);
 $text_color: if($variant == "dark", #eee, #333);

src/gtk-3.20/scss/_widgets.scss

@@ -34,6 +34,10 @@
 @import "apps/nemo";
 @import "apps/panel";
 @import "apps/synaptic";
+@import "apps/thunar";
 @import "apps/xfce";
 @import "apps/unity";
 @import "apps/lightdm";
+@import "apps/gnome-terminal";
+@import "apps/budgie";
+@import "apps/eclipse";

src/gtk-3.20/scss/apps/_budgie.scss

@@ -0,0 +1,61 @@
+/******************
+ ! Budgie Desktop *
+*******************/
+
+@include exports("budgie-desktop") {
+    .budgie-container {
+        background-color: transparent;
+    }
+
+    .raven {
+        background-color: transparentize($bg_color, .07);
+
+        .raven-header {
+            background-color: $bg_color;
+            border: solid $borders_color;
+            border-width: 1px 0;
+        }
+
+        .raven-background {
+            background-color: transparentize($bg_color, .07);
+        }
+    }
+
+    .raven-mpris {
+        background-color: transparentize($bg_color, .3);
+    }
+
+    .budgie-panel {
+        background-color: $dark_bg_color;
+        color: $dark_fg_color;
+    }
+    
+    .budgie-panel > box > widget > separator {
+        background-color: transparentize($dark_fg_color, .8);
+    }
+    
+    .workspace-switcher {
+        background-color: $dark_bg_color;
+        .workspace-icon-button {
+            background-color: transparent;
+            &:hover {
+                background-color: transparentize($selected_bg_color, .5);
+                border: transparent;
+            }
+        }
+        .workspace-more-label {
+            color: $dark_fg_color;
+        }
+        .workspace-add-button {
+            background-color: transparentize($selected_bg_color, .8);
+            color: $selected_bg_color;
+            border: transparent;
+            &:hover {
+                background-color: transparentize($selected_bg_color, .5);
+            }
+        }
+        .current-workspace {
+            background-color: $selected_bg_color;
+        }
+    }
+}

src/gtk-3.20/scss/apps/_eclipse.scss

@@ -0,0 +1,9 @@
+/***********
+ ! Eclipse *
+ ***********/
+
+@include exports("eclipse") {
+	button.flat.image-button > image {
+		padding: 3px;
+	}
+}

src/gtk-3.20/scss/apps/_gnome-applications.scss

@@ -29,3 +29,50 @@
         }
     }
 }
+
+
+/************************
+ ! Unity-Control-Center *
+*************************/
+
+@include exports("unity-control-center") {
+    // Fixed: https://github.com/numixproject/numix-gtk-theme/issues/634
+    .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame {
+        // hide unwanted frames
+        border: 0 none transparent;
+
+        > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical {
+            // reset $base_color;
+            iconview.view {
+                &, &:backdrop {
+                    background-color: transparent;
+                }
+
+                &:selected {
+                    &:focus, & {
+                        @extend %selected_items;
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+/****************
+ ! Geary *
+*****************/
+
+@include exports("geary") {
+   .geary-expanded .geary-message-summary {
+	    background-color: shade($base_color, 0.95);
+    }
+    
+    .geary-folder-popover-list-row {
+        border-color: shade($menu_bg_color, 1.2);
+        box-shadow: None;
+        
+        & > label { color: $bg_color; }
+    }
+    
+}

src/gtk-3.20/scss/apps/_gnome-terminal.scss

@@ -14,10 +14,10 @@
             background-color: $osd_base;
             border-color: border_normal($osd_base);
 
-            &:backdrop {
-                background-color: shade($backdrop_osd_bg, .9);
-                border-color: border_normal(shade($backdrop_osd_bg, .9));
-            }
+            //&:backdrop {
+            //    background-color: shade($backdrop_osd_bg, .9);
+            //    border-color: border_normal(shade($backdrop_osd_bg, .9));
+            //}
         }
 
         scrollbar.vertical {
@@ -28,10 +28,23 @@
 
                 &:hover:active { background-color: $selected_bg_color; }
 
-                &:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); }
+                //&:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); }
 
                 &:disabled { background-color: transparent; }
             }
         }
     }
 }
+
+
+/**********************
+	! Tilix *
+***********************/
+
+@include exports("tilix") {
+    .terminal-titlebar:active {
+        border-width: 0 0 2px 0;
+        border-style: solid;
+        border-color: $selected_bg_color;
+    }
+}

src/gtk-3.20/scss/apps/_nemo.scss

@@ -63,7 +63,7 @@
                 button {
                     min-height: 16px;
                     min-width: 16px;
-                    padding: ($spacing - 1px);
+                    padding: ($spacing - 1px) (($spacing * 2) - 2px);
                 }
 
                 button:first-child {
@@ -108,7 +108,7 @@
                     -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color;
                     -NemoPlacesTreeView-disk-full-bar-width: 2px;
                     -NemoPlacesTreeView-disk-full-bar-radius: 1px;
-                    -NemoPlacesTreeView-disk-full-bottom-padding: 0px;
+                    -NemoPlacesTreeView-disk-full-bottom-padding: 0;
                     -NemoPlacesTreeView-disk-full-max-length: 75px;
 
                     &:selected {

src/gtk-3.20/scss/apps/_panel.scss

@@ -54,7 +54,11 @@
         color: $black;
     }
 
-    #clock-applet-button { &, &:backdrop { @extend %panelbutton; } }
+    #clock-applet-button,
+    #tasklist-button,
+    #showdesktop-button {
+        &, &:backdrop { @extend %panelbutton; }
+    }
 
     panel-applet {
         border: 0;

src/gtk-3.20/scss/apps/_thunar.scss

@@ -0,0 +1,17 @@
+@include exports("thunar") {
+.thunar {
+  scrolledwindow.sidebar treeview.view {
+    background: $bg_color;
+    color: $fg_color;
+    
+    &:selected, &:active {
+      background: $selected_bg_color;
+      color: $selected_fg_color;
+    }
+  }
+
+  scrolledwindow.shortcuts-pane {
+    border-top-width: 1;
+  }
+ }
+}

src/gtk-3.20/scss/apps/_unity.scss

@@ -33,6 +33,16 @@
             color: mix($titlebar_fg_color, $titlebar_bg_color, .1);
             text-shadow: none;
 
+            // Fixed: https://github.com/numixproject/numix-gtk-theme/issues/632
+            // for L.I.M's selected menuitem
+            &:hover {
+                border-radius: 0;
+                border-color: mix($panel_bg_color, $panel_fg_color, .21);
+                background-color: mix($panel_bg_color, $panel_fg_color, .21);
+                background-image: none;
+                color: shade($panel_fg_color, 1.08);
+            }
+
             &:backdrop {
                 border: 1px solid $wm_border_unfocused;
                 color: mix($titlebar_fg_color, $titlebar_bg_color, .4);

src/gtk-3.20/scss/apps/_xfce.scss

@@ -20,5 +20,72 @@
         font: inherit;
 
         button { @extend %panelbutton; }
+
+        menu {
+            -gtk-icon-effect: none;
+
+            text-shadow: none;
+        }
+    }
+
+    #XfceNotifyWindow {
+        .osd {
+            background-color: $osd_bg;
+            color: $osd_fg;
+            border-radius: $roundness;
+            border: 1px solid border_normal($osd_bg);
+        }
+
+        &.osd {
+            label {
+                &#summary {
+                    font-weight: bold;
+                }
+            }
+        }
+    }
+
+    #whiskermenu-window {
+		* {
+			border-color: border_normal($dark_bg_color);
+			outline: none;
+        }
+
+        background-color: $dark_bg_color;
+        color: $dark_fg_color;
+
+        entry {
+			background-color: shade($dark_bg_color, 1.2);
+			color: $dark_fg_color;
+        }
+
+        button {
+            font-weight: bold;
+            padding: 6px 12px;
+			margin: 3px 0px;
+			border: none;
+			@include linear_gradient($dark_bg_color);
+			color: $dark_fg_color;
+
+			&:focus, &:hover {
+			    background-color: $selected_bg_color;
+                color: $selected_fg_color;
+			}
+
+			&:checked {
+                background-color: shade($selected_bg_color, .9);
+                color: $selected_fg_color;
+			}
+        }
+
+        treeview {
+            background-color: shade($dark_bg_color, 1.2);
+			color: $dark_fg_color;
+
+			&:selected, &:hover {
+                background-color: $selected_bg_color;
+                color: $selected_fg_color;
+			}
+        }
     }
 }

src/gtk-3.20/scss/widgets/_button.scss

@@ -43,9 +43,9 @@
     }
 
     %button {
-        min-height: 16px;
-        min-width: 16px;
-        padding: $spacing ($spacing + 2px);
+        //min-height: 16px;
+        //min-width: 16px;
+        padding: $spacing ($spacing + 1);
         border-width: 1px;
         border-style: solid;
         border-radius: $roundness;
@@ -273,14 +273,19 @@
     $border_strength: if(lightness($bg) > 50, 0, .1);
     $shadow_strength: if(lightness($bg) > 50, 0, .1);
 
-    $button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg);
+    $button_bg: if(lightness($bg) > 50, $bg, shade($bg, 1.2));
 
     @extend %button;
-    @include linear-gradient($button_bg);
-    @include border(rgba(0, 0, 0, .12 + $border_strength));
-
+    @if (lightness($button_bg) > 50) {
+        border-color: border_normal($button_bg);
+        @include linear-gradient(shade($button_bg, 1.08));
+    } @else {
+        @include linear-gradient($button_bg);
+        @include border(rgba(0, 0, 0, .12 + $border_strength));  
+    }
+    
     color: $fg;
-    box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
+
 
     &.flat {
         border-color: alpha($button_bg, 0);
@@ -291,24 +296,32 @@
 
     &, &.flat {
         &:focus, &:hover {
-            @include linear-gradient(shade($button_bg, 1.2));
-            @include border(rgba(0, 0, 0, .2 + $border_strength));
+            @if (lightness($button_bg) > 50) {
+                border-color: border_active($button_bg);
+                @include linear-gradient(shade($button_bg, 1.11));
+            } @else {
+                @include linear-gradient(shade($button_bg, 1.2));
+                @include border(rgba(0, 0, 0, .2 + $border_strength));
+            }
 
-            box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength);
+            
         }
+            
 
         &:checked, &:active {
-            @include linear-gradient(shade($button_bg, .7), to top);
-
+            @if (lightness($button_bg) > 50) {
+                @include linear-gradient(shade($button_bg, .8), to top);
+            } @else {
+                @include linear-gradient(shade($button_bg, .7), to top);
+            }
             color: $white;
-            box-shadow: inset 1px 0 alpha($dark_shadow, .06),
-            inset 0 1px alpha($dark_shadow, .07),
-            inset -1px 0 alpha($dark_shadow, .06),
-            inset 0 -1px alpha($dark_shadow, .05);
 
             &:focus, &:hover {
-                @include linear-gradient(shade($button_bg, .65), to top);
-
+		@if (lightness($button_bg) > 50) {
+                    @include linear-gradient(shade($button_bg, .75), to top);
+                } @else {
+		    @include linear-gradient(shade($button_bg, .65), to top);
+                }
                 color: $white;
             }
         }
@@ -364,27 +377,27 @@
         box-shadow: none;
 
         &:focus, &:hover {
-            border: 1px solid alpha($black, .3);
+            border: 1px solid alpha($bg_color, .1);
             background-color: alpha($white, .2);
             background-image: none;
             box-shadow: none;
         }
 
         &:active, &:checked, &:active:hover, &:checked:hover {
-            border: 1px solid alpha($black, .3);
-            background-color: alpha($black, .1);
+            border: 1px solid alpha($selected_bg_color, .2);
+            background-color: alpha($white, .2);
             background-image: none;
             box-shadow: none;
         }
     }
 
     button {
-        @include button(shade($bg_color, 1.2), $fg_color);
+        @include button($bg_color, $fg_color);
 
         .inline-toolbar &,
-        .linked > & { @include linked_button(shade($bg_color, 1.2)); }
+        .linked > & { @include linked_button($bg_color); }
 
-        .linked.vertical > & { @include linked_vertical_button(shade($bg_color, 1.2)); }
+        .linked.vertical > & { @include linked_vertical_button($bg_color); }
 
         &.circular,
         &.circular-button { // FIXME: aggregate to buttons
@@ -412,9 +425,16 @@
         }
 
         &:not(.vertical) {
-            @extend %entry;
-            @include linear-gradient($base_color, to top);
-            @include border($base_color);
+            @if (lightness($bg_color) > 50) {
+                border: 1px solid border_normal($bg_color);
+                background-color: transparent;
+                background-image: none;
+                box-shadow: inset 1px 0 shade($base_color, .9);
+            } @else {
+                @extend %entry;
+                @include linear-gradient($base_color, to top);
+                @include border($base_color);
+            }
 
             padding: 0;
 
@@ -425,7 +445,6 @@
 
             &:disabled {
                 @include linear-gradient(shade($base_color, .9), to top);
-
                 color: mix($base_color, $text_color, .5);
             }
 
@@ -443,6 +462,16 @@
                 background-image: none;
                 box-shadow: none;
 
+                @if (lightness($bg_color) > 50) {
+                    background-color: shade($bg_color, 1.08);
+                }
+
+                &:hover { 
+                    @if (lightness($bg_color) > 50) {
+                        background-color: shade($bg_color, 1.11);
+                    } 
+                }
+
                 &:dir(rtl) { border-style: none solid none none; }
 
                 &:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .8); }
@@ -451,7 +480,6 @@
 
                 &:backdrop:disabled {
                     border-style: none none none solid; // It is needed or it gets overridden
-
                     &:dir(rtl) { border-style: none solid none none; }
                 }
 
@@ -497,8 +525,8 @@
         button.combo {
             // otherwise the arrow placement is not symmetric
             min-width: 0;
-            padding-left: $spacing + 2px;
-            padding-right: $spacing + 2px;
+            //padding-left: $spacing + 1px;
+            //padding-right: $spacing + 1px;
         }
 
         arrow {
@@ -509,9 +537,11 @@
 
         box button, box entry {
             @extend %linked_button;
-            padding: $spacing ($spacing + 2px);
         }
 
+        //hack to get rid of extra +1px height in linked combobox
+        //.linked:not(.vertical) button.combo { padding: 4px; }
+
         .linked:not(.vertical) > & > box > button.combo {
             // the combo is a composite widget so the way we do button linked doesn't
             // work, special case needed. See

src/gtk-3.20/scss/widgets/_choosers.scss

@@ -155,8 +155,6 @@
             &:checked { colorswatch:only-child { box-shadow: none; } }
         }
     }
-
-    colorchooser .popover.osd { border-radius: $roundness; }
 }
 
 

src/gtk-3.20/scss/widgets/_entry.scss

@@ -90,11 +90,16 @@
     border-width: 1px;
     border-style: solid;
     border-radius: $roundness;
-    transition: border 150ms ease;
-    box-shadow: inset 1px 1px alpha($dark_shadow, .06),
-                inset -1px 0 alpha($dark_shadow, .06);
+    border-color: border_normal($bg_color);
+    transition: border 100ms ease-out;
+    &:focus, &:hover, &:active { transition: border 100ms ease-in; }
+
+    box-shadow: inset 1px 0 alpha($dark_shadow, 0.10),
+                inset 0 1px alpha($dark_shadow, 0.12),
+                inset -1px 0 alpha($dark_shadow, 0.10),
+                inset 0 -1px alpha($dark_shadow, 0.05);
+
 
-    &:focus, &:hover, &:active { transition: none; }
 
     &:selected {
         &, &:selected:focus {
@@ -149,7 +154,7 @@
 @mixin entry($bg, $fg, $border: $borders_color) {
     @extend %entry;
     @include linear-gradient($bg, to top);
-    @include border($bg);
+    border-color: border_normal($bg);
 
     padding: $spacing;
 

src/gtk-3.20/scss/widgets/_grid.scss

@@ -17,7 +17,7 @@
     }
 
     row {
-        transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+        transition: all 150ms cubic-bezier(.25, .46, .45, .94);
 
         &:hover { transition: none; }
 

src/gtk-3.20/scss/widgets/_menu.scss

@@ -1,6 +1,32 @@
 @import "entry";
 
 
+
+@mixin menu_calendar($bg, $fg) {
+    color: $fg;
+
+    &.header {
+        border-bottom: 1px solid shade($bg, ($contrast + .1));
+        border-radius: 0;
+
+        &:backdrop { border-color: shade($bg, ($contrast + .1)); }
+    }
+
+    &.button {
+        @extend %undecorated_button;
+        color: alpha($fg, .55);
+
+        &:hover {
+            @extend %undecorated_button;
+            color: $fg;
+        }
+    }
+
+    &:indeterminate,
+    &:indeterminate:backdrop { color: mix($fg, $bg, .5); }
+}
+
+
 /*********
  ! Menubar
 **********/
@@ -47,7 +73,7 @@
     .context-menu {
         border: 0;
         border-radius: 0;
-        padding: 2px 0;
+        padding: 0;
         background-color: $menu_bg_color;
         color: $menu_fg_color;
 
@@ -59,7 +85,7 @@
         separator,
         .csd & separator {
             background-color: shade($menu_bg_color, ($contrast + .1));
-            margin: ($spacing - 2px) 0;
+            margin: 1px 0;
         }
 
         // Firefox workaround
@@ -67,7 +93,7 @@
         .csd & .separator { color: shade($menu_bg_color, ($contrast + .1)); }
 
         menuitem {
-            min-height: 16px;
+            min-height: 14px;
             min-width: 40px;
             padding: $spacing - 1px;
             border-radius: 0;
@@ -85,8 +111,8 @@
 
             // submenu indicators
             arrow {
-                min-height: 16px;
-                min-width: 16px;
+                min-height: 14px;
+                min-width: 14px;
 
                 &:dir(ltr) {
                     -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
@@ -115,31 +141,7 @@
                 }
             }
 
-            calendar {
-                color: $menu_fg_color;
-
-                &.header {
-                    border-bottom: 1px solid shade($menu_bg_color, ($contrast + .1));
-                    border-radius: 0;
-
-                    &:backdrop { border-color: shade($menu_bg_color, ($contrast + .1)); }
-                }
-
-                &.button {
-                    @extend %undecorated_button;
-
-                    color: alpha($menu_fg_color, .55);
-
-                    &:hover {
-                        @extend %undecorated_button;
-
-                        color: $menu_fg_color;
-                    }
-                }
-
-                &:indeterminate,
-                &:indeterminate:backdrop { color: mix($menu_fg_color, $menu_bg_color, .5); }
-            }
+            calendar { @include menu_calendar($menu_bg_color, $menu_fg_color); }
 
             // avoids labels color being overridden, see
             // https://bugzilla.gnome.org/show_bug.cgi?id=767058
@@ -150,8 +152,8 @@
         > arrow {
             //@include button(undecorated);
 
-            min-height: 16px;
-            min-width: 16px;
+            min-height: 14px;
+            min-width: 14px;
             padding: $spacing;
             background-color: $menu_bg_color;
             border-radius: 0;
@@ -194,8 +196,8 @@
         }
 
         check, radio {
-            min-height: 16px;
-            min-width: 16px;
+            min-height: 14px;
+            min-width: 14px;
 
             &:dir(ltr) { margin-right: 7px; }
             &:dir(rtl) { margin-left: 7px; }
@@ -232,17 +234,6 @@
 
         &:backdrop { box-shadow: none; }
 
-        .osd & {
-            box-shadow: 0 2px 7px 3px alpha($black, .5);
-
-            > toolbar button {
-                border-radius: 0;
-                border-width: 0;
-                background-color: transparent;
-                background-image: none;
-            }
-        }
-
         treeview.view {
             &:hover, &:selected, &:selected:focus, &:backdrop:selected, &:backdrop:selected:focus { border-top-color: $selected_bg_color; }
 
@@ -287,15 +278,50 @@
 
         button { @include button($menu_bg_color, $menu_fg_color); }
 
+        calendar { @include menu_calendar($menu_bg_color, $menu_fg_color); }
+
         > list, > .view, > toolbar {
             border-style: none;
             background-color: transparent;
         }
     }
 
+    //gnome-calendar-fix
+    popover.events {
+        grid.vertical {
+            &, & list, & list row, & list box {
+                margin: 0; 
+                border-radius: 0;
+                background-color: $menu_bg_color; 
+            }
+        }
+
+        grid.vertical box.vertical {
+            border-top-left-radius: 0;
+            border-top-right-radius: 0;
+        }
+    }
+
+    popover {
+        list.calendar-list row { padding: 0px; }
+
+        datechooser {
+            & grid.vertical navigator button {
+                min-height: 20px;
+                min-width: 20px;
+                margin: 5px;
+            }
+ 
+            & grid.horizontal day.day {
+                min-height: 24px;
+                min-width: 24px;
+            }
+        }
+    }
+
     modelbutton.flat,
     menuitem.button.flat {
-        padding: $spacing ($spacing + 2px);
+        padding: ($spacing - 1px) ($spacing + 1px);
         outline-color: transparent;
         transition: none;
 

src/gtk-3.20/scss/widgets/_misc.scss

@@ -42,8 +42,8 @@
 @include exports("dialogs") {
     messagedialog, .message-dialog, .prompt {
         -GtkDialog-content-area-border: 0;
-        -GtkDialog-action-area-border: $spacing;
-        -GtkDialog-button-spacing: 0;
+        -GtkDialog-action-area-border: 0;
+        -GtkDialog-button-spacing: $spacing;
 
         margin: 0;
         padding: 0;
@@ -165,7 +165,7 @@
             border-top-left-radius: 0;
         }
 
-        .button {
+        button {
             border: 0;
             background-color: transparent;
             background-image: none;
@@ -235,8 +235,8 @@
     entry.entry.pin-entry {
         font-style: normal;
         font-size: 50px;
-        padding-left: 25px;
-        padding-right: 25px;
+        padding-left: $spacing * 5;
+        padding-right: $spacing * 5;
     }
 
     label.pin-label {

src/gtk-3.20/scss/widgets/_notebook.scss

@@ -144,40 +144,51 @@
             }
 
             tab {
-                padding: ($spacing + 1) 0 0; // top | left/right | bottom
-                border-style: solid;
-                border-width: 1px;         // for reorderable tabs
-                border-color: transparent; //
-                background-image: none;
-                box-shadow: none;
+                padding: 0;
                 outline: none;
 
-                button, button:hover {
-                    margin-left: 15px;
-                    opacity: 0;
-                    transition: opacity .3s ease-in;
+                > box,
+                > label,
+                > widget > box {
+                    padding: ($spacing + 2px) $spacing * 2; // top/bottom | left/right
+                    box-shadow: 1px 1px transparent; //duplicate shadows used for transition?
+                    transition: box-shadow .2s linear;
                 }
 
-                > box, > label {
-                    padding: 0 ($spacing * 3) ($spacing + 1); // top | left/right | bottom
-                    border-width: 2px;
-                    border-style: solid;
-                    border-color: transparent;
-                    transition: border-color .3s ease-out;
+                &.reorderable-page {
+                    > box,
+                    > label,
+                    > widget > box {
+                        padding: ($spacing + 2px) $spacing * 2; // top | right | bottom | left
+                    }
+                }
+
+                /* close button styling */
+                button,
+                button.flat {
+                    @extend %close_button;
+
+                    min-height: 16px;
+                    min-width: 16px;
+                    padding: 0;
+                    margin-left: $spacing * 2;
+                    //border: 1px solid transparent;
+                    transition: all .1s linear;
                 }
 
                 &:hover {
                     background-color: shade($base_color, .93);
                     border-color: transparent;
                     outline: none;
-
-                    button, button:hover {
-                        opacity: 1;
-                    }
                 }
 
                 &:checked {
-                    background-color: mix($bg_color, $base_color, .4);
+                    @if (lightness($bg_color) > 50) {
+                        background-color: mix($bg_color, $base_color, .7);
+                    } @else {
+                        background-color: mix($bg_color, $base_color, .4);
+                    }
+
                     border-bottom-color: transparent;
                     outline: none;
 
@@ -186,110 +197,42 @@
                     }
 
                     &:hover {
-                        background-color: mix($bg_color, $base_color, .6);
+                        @if (lightness($bg_color) > 50) {
+                            background-color: mix($bg_color, $base_color, .9);
+                        } @else {
+                            background-color: mix($bg_color, $base_color, .6);
+                        }
                     }
                 }
 
                 label {
                     color: mix($text_color, $base_color, .3);
                 }
-
-                /* close button styling */
-                button.flat {
-                    min-height: 16px;
-                    min-width: 16px;
-                    padding: 0;
-
-                    @extend %close_button;
-                }
             }
 
-            &.top tab,
-            &.bottom tab {
-                &:hover {
-                    &:not(:first-child):not(:last-child):not(:only-child) {
-                        box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85);
-                    }
-
-                    &:last-child:not(:only-child) {
-                        box-shadow: -1px 0 1px shade($base_color, .85);
-                    }
-
-                    &:first-child:not(:only-child) {
-                        box-shadow: 1px 0 1px shade($base_color, .85);
-                    }
-                }
-
-                &:checked {
-                    &:not(:first-child):not(:last-child):not(:only-child) {
-                        box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8);
-                    }
-
-                    &:last-child:not(:only-child) {
-                        box-shadow: -1px 0 1px shade($base_color, .8);
-                    }
-
-                    &:first-child:not(:only-child) {
-                        box-shadow: 1px 0 1px shade($base_color, .8);
-                    }
-                }
-            }
-
-            &.right tab,
-            &.left tab {
-                &:hover {
-                    &:not(:first-child):not(:last-child):not(:only-child) {
-                        box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85);
-                    }
-
-                    &:last-child:not(:only-child) {
-                        box-shadow: 0 -1px 1px shade($base_color, .85);
-                    }
-
-                    &:first-child:not(:only-child) {
-                        box-shadow: 0 1px 1px shade($base_color, .85);
-                    }
-                }
-
-                &:checked {
-                    &:not(:first-child):not(:last-child):not(:only-child) {
-                        box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8);
-                    }
-
-                    &:last-child:not(:only-child) {
-                        box-shadow: 0 -1px 1px shade($base_color, .8);
-                    }
-
-                    &:first-child:not(:only-child) {
-                        box-shadow: 0 1px 1px shade($base_color, .8);
-                    }
-                }
-            }
 
             &.top tab {
-                padding: ($spacing + 1) 0 0; // top | left/right | bottom
-                border-style: solid;
-                border-color: $borders_color;
-                border-width: 0;
-                border-bottom-width: 1px;
-                transition: border-bottom-color .3s ease-out;
-
-                > box, > label {
-                    padding: 0 ($spacing * 3) ($spacing + 1); // top | left/right | bottom
-                }
+                box-shadow: inset 0 -1px $borders_color; 
+                transition: box-shadow .2s ease-out;
 
                 &:hover {
-                    outline: none;
+                    outline: none; 
+                    &:not(:first-child):not(:last-child):not(:only-child) {
+                        box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color;
+                    }
+
+                    &:last-child:not(:only-child) {
+                        box-shadow: -1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color;
+                    }
+
+                    &:first-child:not(:only-child) {
+                        box-shadow: 1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color;
+                    }       
                 }
 
                 &:checked {
-                    border-bottom-color: $selected_bg_color;
                     outline: none;
 
-                    > box, > label {
-                        border-bottom-color: $selected_bg_color;
-                    }
-
                     label {
                         margin-bottom: 0;
                         color: $selected_bg_color;
@@ -298,33 +241,46 @@
                     &:hover {
                         background-color: mix($bg_color, $base_color, .6);
                     }
+
+                    &:not(:first-child):not(:last-child):not(:only-child) {
+                        box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color;
+                    }
+
+                    &:last-child:not(:only-child) {
+                        box-shadow: -1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color;
+
+                    }
+
+                    &:first-child:not(:only-child) {
+                        box-shadow: 1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color;
+
+                    }
                 }
             }
 
             &.right tab {
-                padding: 0 ($spacing + 1) 0 0; // top | right | bottom | left
-                border-style: solid;
-                border-color: $borders_color;
-                border-width: 0;
-                border-left-width: 1px;
-                transition: border-left-color .3s ease-out;
-
-                > box, > label {
-                    padding: ($spacing + 1) ($spacing * 3); // top | right | bottom | left
-                }
+                box-shadow: inset 1px 0 $borders_color;
+                transition: box-shadow .3s ease-out;
 
                 &:hover {
                     outline: none;
+
+                    &:not(:first-child):not(:last-child):not(:only-child) {
+                        box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85), inset 1px 0 $borders_color;
+                    }
+
+                    &:last-child:not(:only-child) {
+                        box-shadow: 0 -1px 1px shade($base_color, .85), inset 1px 0 $borders_color;
+                    }
+
+                    &:first-child:not(:only-child) {
+                        box-shadow: 0 1px 1px shade($base_color, .85), inset 1px 0 $borders_color;
+                    }
                 }
 
                 &:checked {
-                    border-left-color: $selected_bg_color;
                     outline: none;
 
-                    > box, > label {
-                        border-left-color: $selected_bg_color;
-                    }
-
                     label {
                         margin-left: 0;
                         color: $selected_bg_color;
@@ -333,33 +289,43 @@
                     &:hover {
                         background-color: mix($bg_color, $base_color, .6);
                     }
+
+                    &:not(:first-child):not(:last-child):not(:only-child) {
+                        box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color;
+                    }
+
+                    &:last-child:not(:only-child) {
+                        box-shadow: 0 -1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color;
+                    }
+
+                    &:first-child:not(:only-child) {
+                        box-shadow: 0 1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color;
+                    }
                 }
             }
 
             &.bottom tab {
-                padding: 0 0 ($spacing + 1); // top | left/right | bottom
-                border-style: solid;
-                border-color: $borders_color;
-                border-width: 0;
-                border-top-width: 1px;
-                transition: border-top-color .3s ease-out;
-
-                > box, > label {
-                    padding: ($spacing + 1) ($spacing * 3) 0;  // top/bottom | left/right
-                }
+                box-shadow: inset 0 1px $borders_color;
+                transition: box-shadow .3s ease-out;
 
                 &:hover {
                     outline: none;
+                    &:not(:first-child):not(:last-child):not(:only-child) {
+                        box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85), inset 0 1px $borders_color;
+                    }
+
+                    &:last-child:not(:only-child) {
+                        box-shadow: -1px 0 1px shade($base_color, .85), inset 0 1px $borders_color;
+                    }
+
+                    &:first-child:not(:only-child) {
+                        box-shadow: 1px 0 1px shade($base_color, .85), inset 0 1px $borders_color;
+                    }
                 }
 
                 &:checked {
-                    border-top-color: $selected_bg_color;
                     outline: none;
 
-                    > box, > label {
-                        border-top-color: $selected_bg_color;
-                    }
-
                     label {
                         margin-top: 0;
                         color: $selected_bg_color;
@@ -368,33 +334,44 @@
                     &:hover {
                         background-color: mix($bg_color, $base_color, .6);
                     }
+
+                    &:not(:first-child):not(:last-child):not(:only-child) {
+                        box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color;
+                    }
+
+                    &:last-child:not(:only-child) {
+                        box-shadow: -1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color;
+                    }
+
+                    &:first-child:not(:only-child) {
+                        box-shadow: 1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color;
+                    }
                 }
             }
 
             &.left tab {
-                padding: 0 0 0 ($spacing + 1); // top | right | bottom | left
-                border-style: solid;
-                border-color: $borders_color;
-                border-width: 0;
-                border-right-width: 1px;
-                transition: border-right-color .3s ease-out;
-
-                > box, > label {
-                    padding: ($spacing + 1) ($spacing * 3); // top/bottom | left/right
-                }
+                box-shadow: inset -1px 0 $borders_color;
+                transition: box-shadow .3s ease-out; 
 
                 &:hover {
                     outline: none;
+
+                    &:not(:first-child):not(:last-child):not(:only-child) {
+                        box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85), inset -1px 0 $borders_color;
+                    }
+
+                    &:last-child:not(:only-child) {
+                        box-shadow: 0 -1px 1px shade($base_color, .85), inset -1px 0 $borders_color;
+                    }
+
+                    &:first-child:not(:only-child) {
+                        box-shadow: 0 1px 1px shade($base_color, .85), inset -1px 0 $borders_color;
+                    }
                 }
 
                 &:checked {
-                    border-right-color: $selected_bg_color;
                     outline: none;
 
-                    > box, > label {
-                        border-right-color: $selected_bg_color;
-                    }
-
                     label {
                         margin-right: 0;
                         color: $selected_bg_color;
@@ -403,6 +380,18 @@
                     &:hover {
                         background-color: mix($bg_color, $base_color, .6);
                     }
+
+                    &:not(:first-child):not(:last-child):not(:only-child) {
+                        box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color;
+                    }
+
+                    &:last-child:not(:only-child) {
+                        box-shadow: 0 -1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color;
+                    }
+
+                    &:first-child:not(:only-child) {
+                        box-shadow: 0 1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color;
+                    }
                 }
             }
         }

src/gtk-3.20/scss/widgets/_osd.scss

@@ -8,8 +8,22 @@
 @include exports("osd") {
     overlay.osd { background-color: transparent; }
 
-    button.osd,
-    #XfceNotifyWindow button {
+    colorchooser .popover.osd { border-radius: $roundness; }
+
+    button.color {
+        .osd colorswatch:only-child { box-shadow: none; }
+
+        @if $variant == 'light' {
+            .osd & {
+                &:disabled,
+                &:backdrop,
+                &:active,
+                &:checked { colorswatch:only-child { box-shadow: none; } }
+            }
+        }
+    }
+
+    button.osd {
         @include button($osd_bg, $osd_fg);
 
         &.image-button {
@@ -38,8 +52,27 @@
         &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars
     }
 
-    .osd,
-    #XfceNotifyWindow {
+    progressbar.osd { // progressbar.osd used for epiphany page loading progress
+        margin: 2px;
+        min-height: 2px;
+        min-width: 2px;
+
+        trough {
+            border-style: none;
+            border-radius: 0;
+            background-image: none;
+            background-color: transparent;
+        }
+
+        progress {
+            border-style: none;
+            border-radius: 0;
+            background-color: $selected_bg_color;
+            background-image: none;
+        }
+    }
+
+    .osd {
         background-color: $osd_bg;
         color: $osd_fg;
 
@@ -58,10 +91,17 @@
         entry { @include entry($osd_base, $osd_text_color, $osd_borders_color); }
 
         /* used by gnome-settings-daemon's media-keys OSD */
-        trough { background-color: shade($osd_bg, .8); }
+        trough,
+        &.trough {
+            background-color: alpha($osd_fg, .3);
+        }
 
-        progressbar { background-color: $osd_fg; }
+        progressbar,
+        &.progressbar {
+            background-color: $osd_fg;
+        }
 
+        // Old GTK 3.0 code
         scale {
             slider {
                 @include linear-gradient(shade($osd_bg, 1.08));
@@ -89,6 +129,33 @@
             }
         }
 
+        // New GTK 3.20 code
+        scale {
+            //OSD troughs
+            trough {
+                background-color: lighten($osd_bg, 7%);
+
+                highlight { background-color: $selected_bg_color; }
+            }
+
+            // OSD sliders
+            slider {
+                background-clip: border-box;
+                background-color: $selected_bg_color;
+                border-color: $selected_bg_color;
+
+                &:hover {
+                    background-color: lighten($selected_bg_color, 10%);
+                    border-color: lighten($selected_bg_color, 10%);
+                }
+
+                &:active {
+                    background-color: darken($selected_bg_color, 10%);
+                    border-color: darken($selected_bg_color, 10%);
+                }
+            }
+        }
+
         &.view, .view, view { background-color: $osd_bg; }
 
         scrollbar {
@@ -127,6 +194,17 @@
             background-color: $osd_bg;
         }
 
+        popover.background {
+            box-shadow: 0 2px 7px 3px alpha($black, .5);
+
+            > toolbar button {
+                border-radius: 0;
+                border-width: 0;
+                background-color: transparent;
+                background-image: none;
+            }
+        }
+
         spinbutton {
             // OSD horizontal
             &:not(.vertical) {

src/gtk-3.20/scss/widgets/_overshoot.scss

@@ -75,6 +75,7 @@
         $_bg_pos: $position center;
     }
 
+    // Disable
     /*background-image: linear-gradient(to $_gradient_dir, // this is the dashed line
                                          $_undershoot_color_light 50%,
                                          $_undershoot_color_dark 50%);*/

src/gtk-3.20/scss/widgets/_progress.scss

@@ -22,7 +22,7 @@
 
         trough {
             border: 1px solid alpha(border_normal($bg_color), .5);
-            background-color: shade($bg_color, 1.08);
+            background-color: shade($bg_color, 1.1);
             background-image: none;
             border-radius: $roundness;
         }
@@ -52,36 +52,16 @@
                 border-top-right-radius: $roundness;
             }
         }
-
-        &.osd { // progressbar.osd used for epiphany page loading progress
-            margin: 2px;
-            min-height: 2px;
-            min-width: 2px;
-
-            trough {
-                border-style: none;
-                border-radius: 0;
-                background-image: none;
-                background-color: transparent;
-            }
-
-            progress {
-                border-style: none;
-                border-radius: 0;
-                background-color: $selected_bg_color;
-                background-image: none;
-            }
-        }
     }
 
     levelbar {
-        block {
+        &.horizontal block {
             min-width: 34px;
-            min-height: 3px;
+            min-height: 4px;
         }
 
         &.vertical block {
-            min-width: 3px;
+            min-width: 4px;
             min-height: 34px;
         }
 
@@ -92,16 +72,17 @@
 
             border: 1px solid alpha(border_normal($bg_color), .5);
             border-radius: $roundness;
+            padding: 2px; // make discrete block appear inside levelbar
         }
 
         &.horizontal.discrete block {
-            margin: 0 2px;
+            margin: 0 1px;
 
             &:first-child { margin: 0; }
         }
 
         &.vertical.discrete block {
-            margin: 2px 0;
+            margin: 1px 0;
 
             &:first-child { margin: 0; }
         }
@@ -110,7 +91,7 @@
             @include linear-gradient($selected_bg_color);
 
             border-color: transparent;
-            border-radius: 0;
+            border-radius: $roundness;
 
             &.low {
                 background-color: $warning_color;
@@ -119,12 +100,12 @@
 
             &.high,
             &:not(.empty) {
-                background-color: $selected_bg_color;
+                background-color: $success_color;
                 border-color: transparent;
             }
 
             &.full {
-                background-color: $success_color;
+                background-color: shade($selected_bg_color, .8);
                 border-color: transparent;
             }
 
@@ -193,13 +174,6 @@
 
             &:disabled { background-color: transparentize($_scale_trough_bg, .45); }
 
-            //OSD troughs
-            .osd & {
-                background-color: lighten($osd_bg, 7%);
-
-                highlight { background-color: $selected_bg_color; }
-            }
-
             // Troughs in selected list-rows and infobars
             menuitem:hover &,
             row:selected &,
@@ -279,23 +253,6 @@
                     border-color: mix($selected_fg_color, $selected_bg_color, .55);
                 }
             }
-
-            // OSD sliders
-            .osd & {
-                background-clip: border-box;
-                background-color: $selected_bg_color;
-                border-color: $selected_bg_color;
-
-                &:hover {
-                    background-color: lighten($selected_bg_color, 10%);
-                    border-color: lighten($selected_bg_color, 10%)
-                }
-
-                &:active {
-                    background-color: darken($selected_bg_color, 10%);
-                    border-color: darken($selected_bg_color, 10%);
-                }
-            }
         }
 
         value { color: alpha(currentColor, .4); }

src/gtk-3.20/scss/widgets/_sidebar.scss

@@ -72,12 +72,12 @@
 
         row {
             // Needs overriding of the GtkListBoxRow padding
-            min-height: 36px;
+            min-height: 32px;
             padding: 0;
 
             // Using margins/padding directly in the SidebarRow
             // will make the animation of the new bookmark row jump
-            > revealer { padding: 0 14px; }
+            > revealer { padding: 0 $spacing * 2; }
 
             &:selected { color: $selected_fg_color; }
 
@@ -110,10 +110,10 @@
 
                 //@extend %button_selected.flat;
 
-                min-height: 26px;
-                min-width: 26px;
-                margin-top: 3px;
-                margin-bottom: 3px;
+                min-height: 20px;
+                min-width: 20px;
+                margin-top: 2px;
+                margin-bottom: 2px;
                 padding: 0;
                 border-radius: 100%;
                 -gtk-outline-radius: 100%;

src/gtk-3.20/scss/widgets/_toggle.scss

@@ -104,18 +104,22 @@ $suffix: if($variant == "dark", "-dark", "");
 
 @include exports("switch") {
     switch {
+        min-height: 16px;
+        padding: $spacing - 2px;
         border-radius: $roundness;
-        padding: $spacing - 1;
         border: none;
         outline: none;
         transition: background-color .3s linear;
-        min-width: 88px;
-        min-height: 24px;
+
         background-color: $switch_bg_color;
         color: $switch_fg_color;
         box-shadow: inset 1px -1px 0 alpha($dark_shadow, .06), inset -1px 1px 0 alpha($dark_shadow, .06);
 
         slider {
+            min-height: 18px;
+    	    min-width: 26px;
+	    padding: 0 2px;
+
             background-color: $switch_slider_bg_color;
             transition: all 0.3s ease-in;
             box-shadow: 0 1px 2px 0 alpha($dark_shadow, .07), 1px 0 2px 0 alpha($dark_shadow, .07);

src/gtk-3.20/scss/widgets/_toolbar.scss

@@ -5,7 +5,7 @@
  ! Toolbar
 **********/
 
-@mixin toolbar($bg, $fg) {
+@mixin titlebar($bg, $fg) {
     @include linear-gradient($bg);
     @include border($bg);
 
@@ -13,7 +13,6 @@
 
     &:disabled {
         @include linear-gradient(shade($bg, .9));
-
         color: mix($fg, $bg, .5);
     }
 
@@ -28,33 +27,77 @@
     }
 
     button { @include button($bg, $fg); }
-
     .linked > button { @include linked_button($bg); }
 
-    combobox, button {
-        padding: $spacing;
+    combobox { padding: 4px; }
 
-        &.text-button { padding: $spacing; }
+    separator {
+        &, &:disabled {
+            color: shade($bg, ($contrast - .2));
+            border-color: currentColor;
+            -GtkWidget-window-dragging: true;
+        }
+    }
+}
 
-        &.image-button { padding: $spacing; }
+
+
+
+
+@mixin toolbar($bg, $fg) {
+    @include linear-gradient($bg);
+    @include border($bg);
+
+    color: $fg;
+
+    &:disabled {
+        @include linear-gradient(shade($bg, .9));
+        color: mix($fg, $bg, .5);
+    }
+
+    .title {
+        font-weight: bold;
+        padding: 0 ($spacing * 2);
+    }
+
+    .subtitle {
+        font-size: smaller;
+        padding: 0 ($spacing * 2);
+    }
+
+    button { @include button($bg, $fg); }
+    .linked > button { @include linked_button($bg); }
+
+    &.horizontal combobox { padding: 4px; }
+    
+    &.horizontal button {
+        padding: 4px;
+        &.text-button { padding: 4px; }
+        &.image-button { padding: 4px; }
+    }
+
+    &.vertical button {
+        padding: 5px;
+        &.text-button { padding: 5px; }
+        &.image-button { padding: 5px; }
     }
 
     separator {
         &, &:disabled {
             color: shade($bg, ($contrast - .2));
             border-color: currentColor;
-
             -GtkWidget-window-dragging: true;
         }
     }
 }
 
 @mixin inline-toolbar($bg, $fg) {
-    background-image: none;
+    padding: 1px;
     border-width: 0 1px 1px;
     border-style: solid;
     border-color: $borders_color;
-    background-color: mix($borders_color, $bg_color, .7);
+    background-color: shade($bg, 1.08);
+    background-image: none;
 
     &:backdrop {
         border-color: $backdrop_borders_color;
@@ -80,6 +123,7 @@
     %toolbar {
         padding: $spacing - 1px;
         border-style: none;
+        -gtk-icon-style: symbolic;
 
         // toolbar separators
         &.horizontal separator { margin: 0 ($spacing + 2px) 1px; }
@@ -98,6 +142,11 @@
         button { // Size height
             margin-top: $spacing + 3px;
             margin-bottom: $spacing + 3px;
+            &.popup { padding: 5px; }
+            &.image-button { padding: 5px; }
+            &.text-button.image-button { padding: 5px; }
+            &.text-button { padding: 5px; }
+
         }
 
         switch { // Size height
@@ -112,7 +161,7 @@
     }
 
     %titlebar { // Default headerbar and titlebar code.
-        @include toolbar($titlebar_bg_color, $titlebar_fg_color);
+        @include titlebar($titlebar_bg_color, $titlebar_fg_color);
         @include linear-gradient($titlebar_bg_color);
 
         border-radius: $roundness $roundness 0 0;
@@ -185,7 +234,6 @@
 @include exports("toolbar") {
     toolbar {
         @include toolbar($toolbar_bg_color, $toolbar_fg_color);
-
         @extend %toolbar;
 
         &.inline-toolbar { @include inline-toolbar($toolbar_bg_color, $toolbar_fg_color); }

src/gtk-3.20/scss/widgets/_view.scss

@@ -177,9 +177,6 @@
             border-radius: $roundness;
             border: 1px solid $selected_borders_color;
             background-color: $selected_bg_color;
-            //background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1));
-            box-shadow: inset 0 1px if($variant == 'light', transparentize($white, .7), transparentize($white, .85)),
-            0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9));
 
             &:selected {
                 &:focus, & {
@@ -202,13 +199,12 @@
 
                         background-color: mix($backdrop_base_color, $selected_bg_color, .9);
                     }
+
+                    &:disabled { background-color: shade($selected_bg_color, 1.08); } //required if disabled state is turned on
                 }
             }
 
-            &:disabled {
-                @include linear-gradient($bg_color);
-                border-color: border_insensitive($bg_color);
-            }
+            &:disabled { background-color: shade($selected_bg_color, 1.08);  }
 
             &:backdrop {
                 @if $variant == 'light' {
@@ -223,20 +219,20 @@
         }
 
         &.trough { // progress bar trough in treeviews
-            background-color: transparentize($fg_color, .9);
             border-radius: $roundness;
+            border: 1px solid alpha(border_normal($bg_color), .5);
+            background-color: shade($bg_color, 1.1);
 
             &:selected {
                 &:focus, & {
-                    background-color: if($variant == 'light', transparentize($selected_fg_color, .7), darken($selected_bg_color, .1));
+                    background-color: if($variant == 'light', shade($bg_color, 1.1), darken($selected_bg_color, .1));
+                    @if $variant == 'light' { border: 1px solid $selected_borders_color; }
 
-                    @if $variant == 'light' {
-                        border-width: 1px 0;
-                        border-style: solid;
-                        border-color: $selected_bg_color;
-                    }
+                    &:disabled { background-color: shade($bg_color, 1.08); }
                 }
             }
+
+            &:disabled { background-color: shade($bg_color, 1.08); }
         }
 
         header {

src/gtk-3.20/scss/widgets/_window.scss

@@ -33,7 +33,7 @@
         .solid-csd & {
             border-radius: 0;
             margin: 1px;
-            background-color: $bg_color;
+            background-color: $titlebar_bg_color;
             // Unity/compiz regression: Issue: https://github.com/numixproject/numix-gtk-theme/issues/206
             box-shadow: none;
         }

src/index.theme

@@ -6,5 +6,6 @@ Encoding=UTF-8
 
 [X-GNOME-Metatheme]
 GtkTheme=Numix
+IconTheme=Numix
 MetacityTheme=Numix
 ButtonLayout=:minimize,maximize,close

src/metacity-1/metacity-theme-2.xml

@@ -990,7 +990,7 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="dialog_focused" geometry="nobuttons">
+<frame_style name="dialog_focused" geometry="normal">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
 	<piece position="title" draw_ops="title_focused" />
@@ -1024,7 +1024,7 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="dialog_unfocused" geometry="nobuttons">
+<frame_style name="dialog_unfocused" geometry="normal">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
 	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />

src/metacity-1/metacity-theme-3.xml

@@ -1002,7 +1002,7 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="dialog_focused" geometry="nobuttons">
+<frame_style name="dialog_focused" geometry="normal">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
 	<piece position="title" draw_ops="title_focused" />
@@ -1036,7 +1036,7 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="dialog_unfocused" geometry="nobuttons">
+<frame_style name="dialog_unfocused" geometry="normal">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
 	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />

src/openbox-3/themerc

@@ -59,6 +59,9 @@ window.active.button.hover.bg: flat solid
 window.active.button.hover.bg.color: #444444
 window.active.button.hover.image.color: #f06860
 
+window.active.button.toggled.image.color: #eeeeee
+window.active.button.toggled.hover.image.color: #f06860
+
 
 # Inactive window
 window.inactive.border.color: #393939
@@ -93,6 +96,9 @@ window.inactive.button.hover.bg: flat solid
 window.inactive.button.hover.bg.color: #444444
 window.inactive.button.hover.image.color: #f06860
 
+window.inactive.button.toggled.image.color: #888888
+window.inactive.button.toggled.hover.image.color: #f06860
+
 
 # OSD
 osd.border.width: 1

src/xfwm4/bottom-active.xpm

@@ -1,6 +1,11 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"8 1 2 1",
+"8 5 3 1",
 " 	c None",
-".	c #484848",
-"........"};
+".	c #444444",
+"#	c #484848",
+"........",
+"........",
+"........",
+"........",
+"########"};

src/xfwm4/bottom-inactive.xpm

@@ -1,6 +1,11 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"8 1 2 1",
+"8 5 3 1",
 " 	c None",
-".	c #393939",
-"........"};
+".	c #444444",
+"#	c #393939",
+"........",
+"........",
+"........",
+"........",
+"########"};

src/xfwm4/bottom-left-active.xpm

@@ -1,6 +1,11 @@
 /* XPM */
 static char * bottom_left_active_xpm[] = {
-"1 1 2 1",
+"24 5 3 1",
 " 	c None",
-".	c #484848",
-"."};
+".	c #444444",
+"#	c #484848",
+"#.......................",
+"#.......................",
+"#.......................",
+"#.......................",
+"########################"};

src/xfwm4/bottom-left-inactive.xpm

@@ -1,6 +1,11 @@
 /* XPM */
 static char * bottom_left_inactive_xpm[] = {
-"1 1 2 1",
+"24 5 3 1",
 " 	c None",
-".	c #393939",
-"."};
+".	c #444444",
+"#	c #393939",
+"#.......................",
+"#.......................",
+"#.......................",
+"#.......................",
+"########################"};

src/xfwm4/bottom-right-active.xpm

@@ -1,6 +1,11 @@
 /* XPM */
 static char * bottom_right_active_xpm[] = {
-"1 1 2 1",
+"24 5 3 1",
 " 	c None",
-".	c #484848",
-"."};
+".	c #444444",
+"#	c #484848",
+".......................#",
+".......................#",
+".......................#",
+".......................#",
+"########################"};

src/xfwm4/bottom-right-inactive.xpm

@@ -1,6 +1,11 @@
 /* XPM */
 static char * bottom_right_inactive_xpm[] = {
-"1 1 2 1",
+"24 5 3 1",
 " 	c None",
-".	c #393939",
-"."};
+".	c #444444",
+"#	c #393939",
+".......................#",
+".......................#",
+".......................#",
+".......................#",
+"########################"};