A lot of changes.

- Added ability to enable CSDs by GTK_CSD=0 or GTK_CSD=1 environment variable.
- Changed icons of context menus in file chooser dialog to match old GTK2 file chooser and Caja places sidebar (because Caja is a fork of old Nautilus).
- Disabled integration with GNOME assistive technologies by default to avoid errors in console output.

- Structure of PKGBUILD and paches refactored.
- gtk3-widget-factory application restored.
- Files of original ArchLinux GTK3 package moved away.

40 files changed, 650 insertions, 1299 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3730c4b8f215..85ad0bc9364e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 library with my modifications (see README).
 	pkgver = 3.22.17
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gtk.org/
-	install = gtk3.install
 	arch = i686
 	arch = x86_64
 	license = LGPL
@@ -38,50 +37,54 @@ pkgbase = gtk3-mushrooms
 	optdepends = gtk3-print-backends: Printing
 	provides = gtk3=3.22.17
 	conflicts = gtk3
-	source = p__file-chooser__cwd-default.patch
-	source = p__file-chooser__places-sidebar.patch
-	source = p__file-chooser__single-click.patch
-	source = p__file-chooser__typeahead.patch
-	source = p__headerbar__buttons.patch
-	source = p__headerbar__disable-csd.patch
-	source = p__headerbar__title.patch
-	source = p__icons__buttons.patch
-	source = p__icons__context-menus.patch
-	source = p__icons__file-chooser.patch
-	source = p__other__mnemonics-delay.patch
-	source = p__other__scrollbar.patch
-	source = p__other__statusbar.patch
-	source = p__popovers__color-chooser.patch
-	source = p__popovers__file-chooser.patch
-	source = p__popovers__menu-button.patch
-	source = p__popovers__places-sidebar.patch
-	source = p__print-dialog__appearance.patch
-	source = p__print-dialog__previewer.patch
+	source = csd__clean-headerbar.patch
+	source = csd__disabled-by-default.patch
+	source = csd__headerbar-title.patch
+	source = csd__server-side-shadow.patch
+	source = file-chooser__cwd-default.patch
+	source = file-chooser__places-sidebar.patch
+	source = file-chooser__single-click.patch
+	source = file-chooser__typeahead.patch
+	source = icons__buttons.patch
+	source = icons__context-menus.patch
+	source = icons__file-chooser.patch
+	source = other__mnemonics-delay.patch
+	source = other__no-at-bridge.patch
+	source = other__statusbar-size.patch
+	source = other__visible-scrollbar.patch
+	source = popovers__color-chooser.patch
+	source = popovers__file-chooser-list.patch
+	source = popovers__menu-button.patch
+	source = popovers__places-sidebar.patch
+	source = print-dialog__appearance.patch
+	source = print-dialog__default-previewer.patch
 	source = smaller-adwaita.css
-	source = https://github.com/GNOME/gtk/archive/3.22.17.zip
-	source = settings.ini
-	source = gtk-query-immodules-3.0.hook
-	sha256sums = da49c43e1b8c53b0fb3a6309f18668952ca7128a4fdcfb97098a7ec9959b1fc6
-	sha256sums = 0615c4aec2ee47d79eee3a27e73b8156e927479c6ee4f1f165e5aaed98a01284
-	sha256sums = 79e69afe150a0393be17f1f8fc65c7c10540ef631a6ea657b01eaf0a99f5ffc5
-	sha256sums = a38bed449757a21a476f0d5f32ad46cefa1793387784e5908da3029a891617c4
-	sha256sums = 49c9847239511c2db0be46cb8f660c2c4a43a45b3deed4443eb449daf9ceaf21
-	sha256sums = 1eac1a085ec83e4c340cdbe97d146e902497115ca29b8278eb645e0b7fce352e
-	sha256sums = 0439a24d7dbc1eba24fa75026f92da00c2b173cb5ccde6318629ffb191692d8d
-	sha256sums = 267995c5aa0541d6d75b0e9c3190c0f63cbf0c18e533997b5ae77318584cad46
-	sha256sums = e120514e4f6f3658e40dc425d4c57f4f62c8007d1210f546a96083ccab87b7d0
-	sha256sums = f7d4dc007352b6f04bef467420fb8b3ed43fbef3cc5928370f926ce22af93ab3
-	sha256sums = ccc9ecc561c56e470a4dced055bafd6ae108c6b86e2a56f965a14afe04d35f62
-	sha256sums = cd6967c6b46581752b2587a6e294950065187e10606987d71b8422b2370ca755
-	sha256sums = d7855f0122bb10f96463433bf60481e2a9d5f435e6618d72254454973872411d
-	sha256sums = 66ad760507ff8da2578bce5cbba933e201995b29a0bc26435b4eb63e6454ef44
-	sha256sums = 4e273cf475f73f52c885ea41d2c72ddd1c0c466b323265f35e084c0038cb9a06
-	sha256sums = f33c1fc18a02eb04a91be6218642ffd7cfa7bfc2c4c1656c413eb78d904862cf
-	sha256sums = 9a5d45d9f0b4c41d2255b042ebc8efe57d3fd096048125c14bc4d95fc83fbf24
-	sha256sums = 9dd136016d59b7b3fe8746c722a6adb9f30aa1dcbf5bf37f0055bb1af5e4d27c
-	sha256sums = 65d8e125c74798d2a1d1e872ee4332b3a3f6332d8860963e9f3e4c8c6f41cb92
-	sha256sums = 0afbd995148ce6e03010b572d69533e4d250a2e5f60323422b16a407ff162885
-	sha256sums = ff9e18073c7ce0cca481f115cc5427625571fb52bdae869ce0248f3091bd5d33
+	source = https://github.com/GNOME/gtk/archive/3.22.17.tar.gz
+	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=1842b0f5f36f64944ea8941928d77468456e432e
+	source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=1842b0f5f36f64944ea8941928d77468456e432e
+	sha256sums = c8255604bb4327279d45abea0b576e09ec0b39ea719587ba5d0eb0dc90ba4219
+	sha256sums = 58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb
+	sha256sums = a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494
+	sha256sums = 831e67a278152e93561658f364a10251ed07a9d05c60828b7ec1ab933ebe67b0
+	sha256sums = 5f6dded28c77cfbd1c58f8c334c8544fc84093124f385f87dcf05eeb045bbd8b
+	sha256sums = 4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb
+	sha256sums = 9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9
+	sha256sums = 114edc66d1453fc3dbf2314b939d135b10ad3414fd972da77c5a44534bb6c6d6
+	sha256sums = 769ad0e70a6ac01c203417e50f06d64dbc9fd260707abf5289642ca5a4d4e7f4
+	sha256sums = 6f37fcf05281642a3a41e9f9994be21905264daf64f6e59455586bc82e502473
+	sha256sums = e8e1a4faceff212cb9ab5d29bbf6e9f6f817cba2fcce61e7e5cd51d0f1dd33dd
+	sha256sums = cf1e95e4a8c9d001d919fddeab9260b39e32739fe66440138dfc70182df5297a
+	sha256sums = 103f86c0f03a1c210a56a44434c19b9f64f8c376bcead689a04919b26b0f4d4c
+	sha256sums = 7908611ae7f85a37542b1f1558f46f1d5f35fa1996551d4e61c163569ea3b0ac
+	sha256sums = cfacf351122f95cbef5e752f8e1850ee4ff5495d3bf43732405c2a51e02a9f24
+	sha256sums = 64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace
+	sha256sums = 1ef8375ec4c9275e0e143a39347c931b85eaa4e393aea8ab375db759d9b8ae0f
+	sha256sums = ae3da3618e294dace5a2459a9e3bfaa3bd50be034449eec2828eaa2e217ce851
+	sha256sums = a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb
+	sha256sums = 692b49bce7143507b5c7f176ac67266d75251088da19b282129ad11a3fab5a41
+	sha256sums = 23cdd8b8034e73bb852d42feaabf4f995983a032be479d9ce84e5858c0bd5c41
+	sha256sums = 0b055f7437d965601fe306631fd29f56bb12018dde005d60729e3f40e85f0824
+	sha256sums = cbd384e5d10587f0bbb12efd6677a08906f0c7ab819a1defa573d7f0dbe93b2d
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..8948decea19e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+pkg
+src
+*.pkg.tar.xz
+
+*.tar.gz
+gtk-query-immodules-3.0.hook
+settings.ini
+
+*.sh
diff --git a/PKGBUILD b/PKGBUILD
index 8798013c4c46..45a1a73f01c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 # This file is based on original PKGBUILD of GTK3 package.
 # https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3
 
+__arch_pkg_commit="1842b0f5f36f64944ea8941928d77468456e432e"
+
 pkgname=gtk3-mushrooms
 pkgver=3.22.17
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK3 library with my modifications (see README)."
 url="http://www.gtk.org/"
-install=gtk3.install
 conflicts=(gtk3)
 provides=("gtk3=$pkgver")
 arch=(i686 x86_64)
@@ -25,113 +26,147 @@ makedepends=(
 	gobject-introspection libcanberra gtk-doc rest libcups glib2-docs
 )
 source=(
-	"p__file-chooser__cwd-default.patch"
-	"p__file-chooser__places-sidebar.patch"
-	"p__file-chooser__single-click.patch"
-	"p__file-chooser__typeahead.patch"
-	"p__headerbar__buttons.patch"
-	"p__headerbar__disable-csd.patch"
-	"p__headerbar__title.patch"
-	"p__icons__buttons.patch"
-	"p__icons__context-menus.patch"
-	"p__icons__file-chooser.patch"
-	"p__other__mnemonics-delay.patch"
-	"p__other__scrollbar.patch"
-	"p__other__statusbar.patch"
-	"p__popovers__color-chooser.patch"
-	"p__popovers__file-chooser.patch"
-	"p__popovers__menu-button.patch"
-	"p__popovers__places-sidebar.patch"
-	"p__print-dialog__appearance.patch"
-	"p__print-dialog__previewer.patch"
-
+	# Patch files.
+	"csd__clean-headerbar.patch"
+	"csd__disabled-by-default.patch"
+	"csd__headerbar-title.patch"
+	"csd__server-side-shadow.patch"
+	"file-chooser__cwd-default.patch"
+	"file-chooser__places-sidebar.patch"
+	"file-chooser__single-click.patch"
+	"file-chooser__typeahead.patch"
+	"icons__buttons.patch"
+	"icons__context-menus.patch"
+	"icons__file-chooser.patch"
+	"other__mnemonics-delay.patch"
+	"other__no-at-bridge.patch"
+	"other__statusbar-size.patch"
+	"other__visible-scrollbar.patch"
+	"popovers__color-chooser.patch"
+	"popovers__file-chooser-list.patch"
+	"popovers__menu-button.patch"
+	"popovers__places-sidebar.patch"
+	"print-dialog__appearance.patch"
+	"print-dialog__default-previewer.patch"
+
+	# Themes CSS file.
 	"smaller-adwaita.css"
 
-	"https://github.com/GNOME/gtk/archive/$pkgver.zip"
-	"settings.ini"
-	"gtk-query-immodules-3.0.hook"
+	# GTK source code from GitHub.
+	"https://github.com/GNOME/gtk/archive/$pkgver.tar.gz"
+
+	# ArchLinux package files.
+	"settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=$__arch_pkg_commit"
+	"gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=$__arch_pkg_commit"
 )
 sha256sums=(
-	"da49c43e1b8c53b0fb3a6309f18668952ca7128a4fdcfb97098a7ec9959b1fc6"
-	"0615c4aec2ee47d79eee3a27e73b8156e927479c6ee4f1f165e5aaed98a01284"
-	"79e69afe150a0393be17f1f8fc65c7c10540ef631a6ea657b01eaf0a99f5ffc5"
-	"a38bed449757a21a476f0d5f32ad46cefa1793387784e5908da3029a891617c4"
-	"49c9847239511c2db0be46cb8f660c2c4a43a45b3deed4443eb449daf9ceaf21"
-	"1eac1a085ec83e4c340cdbe97d146e902497115ca29b8278eb645e0b7fce352e"
-	"0439a24d7dbc1eba24fa75026f92da00c2b173cb5ccde6318629ffb191692d8d"
-	"267995c5aa0541d6d75b0e9c3190c0f63cbf0c18e533997b5ae77318584cad46"
-	"e120514e4f6f3658e40dc425d4c57f4f62c8007d1210f546a96083ccab87b7d0"
-	"f7d4dc007352b6f04bef467420fb8b3ed43fbef3cc5928370f926ce22af93ab3"
-	"ccc9ecc561c56e470a4dced055bafd6ae108c6b86e2a56f965a14afe04d35f62"
-	"cd6967c6b46581752b2587a6e294950065187e10606987d71b8422b2370ca755"
-	"d7855f0122bb10f96463433bf60481e2a9d5f435e6618d72254454973872411d"
-	"66ad760507ff8da2578bce5cbba933e201995b29a0bc26435b4eb63e6454ef44"
-	"4e273cf475f73f52c885ea41d2c72ddd1c0c466b323265f35e084c0038cb9a06"
-	"f33c1fc18a02eb04a91be6218642ffd7cfa7bfc2c4c1656c413eb78d904862cf"
-	"9a5d45d9f0b4c41d2255b042ebc8efe57d3fd096048125c14bc4d95fc83fbf24"
-	"9dd136016d59b7b3fe8746c722a6adb9f30aa1dcbf5bf37f0055bb1af5e4d27c"
-	"65d8e125c74798d2a1d1e872ee4332b3a3f6332d8860963e9f3e4c8c6f41cb92"
-
-	"0afbd995148ce6e03010b572d69533e4d250a2e5f60323422b16a407ff162885"
-
-	"ff9e18073c7ce0cca481f115cc5427625571fb52bdae869ce0248f3091bd5d33"
+	# Patch files.
+	"c8255604bb4327279d45abea0b576e09ec0b39ea719587ba5d0eb0dc90ba4219"  
+	"58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb"  
+	"a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494"  
+	"831e67a278152e93561658f364a10251ed07a9d05c60828b7ec1ab933ebe67b0"  
+	"5f6dded28c77cfbd1c58f8c334c8544fc84093124f385f87dcf05eeb045bbd8b"  
+	"4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb"  
+	"9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9"  
+	"114edc66d1453fc3dbf2314b939d135b10ad3414fd972da77c5a44534bb6c6d6"  
+	"769ad0e70a6ac01c203417e50f06d64dbc9fd260707abf5289642ca5a4d4e7f4"  
+	"6f37fcf05281642a3a41e9f9994be21905264daf64f6e59455586bc82e502473"  
+	"e8e1a4faceff212cb9ab5d29bbf6e9f6f817cba2fcce61e7e5cd51d0f1dd33dd"  
+	"cf1e95e4a8c9d001d919fddeab9260b39e32739fe66440138dfc70182df5297a"  
+	"103f86c0f03a1c210a56a44434c19b9f64f8c376bcead689a04919b26b0f4d4c"  
+	"7908611ae7f85a37542b1f1558f46f1d5f35fa1996551d4e61c163569ea3b0ac"  
+	"cfacf351122f95cbef5e752f8e1850ee4ff5495d3bf43732405c2a51e02a9f24"  
+	"64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace"  
+	"1ef8375ec4c9275e0e143a39347c931b85eaa4e393aea8ab375db759d9b8ae0f"  
+	"ae3da3618e294dace5a2459a9e3bfaa3bd50be034449eec2828eaa2e217ce851"  
+	"a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb"  
+	"692b49bce7143507b5c7f176ac67266d75251088da19b282129ad11a3fab5a41"  
+	"23cdd8b8034e73bb852d42feaabf4f995983a032be479d9ce84e5858c0bd5c41"  
+
+	# Themes CSS file.
+	"0b055f7437d965601fe306631fd29f56bb12018dde005d60729e3f40e85f0824"
+
+	# GTK source code from GitHub.
+	"cbd384e5d10587f0bbb12efd6677a08906f0c7ab819a1defa573d7f0dbe93b2d"
+
+	# ArchLinux package files.
 	"01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202"
 	"de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845"
 )
 
-prepare() {
-	cd "$srcdir/gtk-$pkgver/gtk"
+__patch_makefiles()
+{
+	__replace_string_in_file()
+	{
+		sed -i".bak" "s/$1/$2/" "$3"
+		[[ "$(cat "$3")" != "$(cat "$3.bak")" ]] || return 1
+		rm "$3.bak"
+	}
+
+	__replace_string_in_file \
+		"SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples" \
+		"SRC_SUBDIRS = gdk gtk libgail-util modules demos" \
+		"Makefile.am"
+
+	__replace_string_in_file \
+		"SUBDIRS = po po-properties \$(SRC_SUBDIRS) docs m4macros build" \
+		"SUBDIRS = po \$(SRC_SUBDIRS) m4macros build" \
+		"Makefile.am"
+
+	__replace_string_in_file \
+		"SUBDIRS = gtk-demo widget-factory icon-browser" \
+		"SUBDIRS = widget-factory" \
+		"demos/Makefile.am"
+
+	__replace_string_in_file "SUBDIRS += cloudprint" "" "modules/printbackends/Makefile.am"
+	__replace_string_in_file "SUBDIRS += cups" 	     "" "modules/printbackends/Makefile.am"
+	__replace_string_in_file "gtk-update-icon-cache" "" "gtk/Makefile.am"
+}
 
-	for patchfile in $srcdir/p__*.patch; do
-		patch -p 3 -i "$patchfile"
+__patch_gtk_code()
+{
+	for patchfile in $srcdir/*.patch; do
+		patch -d "gtk" -p 3 -i "$patchfile"
 	done
 
-	cat "$srcdir/smaller-adwaita.css" >> "theme/Adwaita/gtk-contained.css"
-	cat "$srcdir/smaller-adwaita.css" >> "theme/Adwaita/gtk-contained-dark.css"
-	cat "$srcdir/smaller-adwaita.css" >> "theme/HighContrast/gtk-contained.css"
-	cat "$srcdir/smaller-adwaita.css" >> "theme/HighContrast/gtk-contained-inverse.css"
+	cat "$srcdir/smaller-adwaita.css" >> "gtk/theme/Adwaita/gtk-contained.css"
+	cat "$srcdir/smaller-adwaita.css" >> "gtk/theme/Adwaita/gtk-contained-dark.css"
+	cat "$srcdir/smaller-adwaita.css" >> "gtk/theme/HighContrast/gtk-contained.css"
+	cat "$srcdir/smaller-adwaita.css" >> "gtk/theme/HighContrast/gtk-contained-inverse.css"
+}
 
+prepare()
+{
 	cd "$srcdir/gtk-$pkgver"
+
+	# Make building faster by skipping tests, code examples and unused elements.
+	__patch_makefiles
+
+	# Apply patches to GTK code.
+	__patch_gtk_code
+
 	NOCONFIGURE=1 ./autogen.sh
 }
 
-build() {
+build()
+{
 	cd "$srcdir/gtk-$pkgver"
 
 	CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--enable-x11-backend --enable-wayland-backend --disable-schemas-compile --disable-gtk-doc-html \
-		--disable-man --disable-installed-tests --disable-colord  --disable-maintainer-mode
+		--enable-x11-backend --enable-wayland-backend --disable-schemas-compile \
+		--disable-gtk-doc-html --disable-installed-tests  --disable-maintainer-mode
 
-	#https://bugzilla.gnome.org/show_bug.cgi?id=655517
+	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
-	# Make GTK building faster by skipping tests and examples.
-	compatible="no"
-	IFS=; while read -r line; do
-		if [[ $line = "SUBDIRS = po po-properties \$(SRC_SUBDIRS) docs m4macros build" ]]; then
-			echo "SUBDIRS = po gdk gtk libgail-util modules m4macros build"
-			compatible="yes"
-		else
-			echo $line
-		fi;
-	done < Makefile > Makefile.modified
-	mv Makefile Makefile.original
-	mv Makefile.modified Makefile
-	if [[ $compatible = "no" ]]; then
-		echo "Makefile is not compatible."
-		exit 1
-	fi
-
 	make -j 15
 }
 
-package() {
+package()
+{
 	cd "$srcdir/gtk-$pkgver"
 
 	make -j 15 DESTDIR="$pkgdir" install
 	install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
 	install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
-
-	rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-	rm `find "$pkgdir/usr/lib/gtk-3.0/3.0.0/printbackends/"* | grep -v "\-lpr.so" | grep -v "\-file.so"`
 }
diff --git a/README.md b/README.md
index 959580813eba..3560f85fca41 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,23 @@
 GTK3-mushrooms
 ===
 
-This is a set of patches for GTK3 library that makes it better for me and maybe for you too. ;-) I have not wide knowledge about programming in C, so quality of this patches can be not good. But it works! See list of patches below.
+This is a set of patches for GTK3 library that makes it better for me and maybe for you too. ;-) I haven't wide knowledge about programming in C, so quality of this patches can be not good. But it works! See list of patches below.
 
-This package is based on official GTK3 package from Arch Linux. In my version library is compiled without Broadway backend, documentation and example applications. Using this package with GNOME desktop is not recommended. It is for classic GTK-based environments like MATE or XFCE.
+This package is based on official GTK3 package from Arch Linux. In my version library is compiled without Broadway backend, documentation and example applications. Using this package with GNOME desktop is not recommended. It's for classic GTK-based environments like MATE or XFCE.
 
 Client Side Decorations
 ---
 
-* CSDs are permanently and totally disabled. All windows (menus, tooltips) are decorated only by window manager.
-* Window title is removed from headerbar. Subtitle is added to native titlebar.
-* Minimize, maximize and close buttons are removed.
-* Application icon is not used on application menu button.
+* CSDs are totally disabled by default. All windows are decorated only by window manager. You can enable CSDs by setting `GTK_CSD=0` environment variable (or `GTK_CSD=1` to force CSDs on each GTK3 window).
+* Client side shadows of windows, menus and tooltips are disabled by default. You can enable shadows by setting `GTK_CSD=1` environment variable.
+* Window title and subtitle are removed from headerbar. Subtitle is added to native titlebar.
+* Minimize, maximize and close buttons are removed. Application menu button has changed icon.
 
 File chooser
 ---
 
-* Annoying single-click "feature" in file list is disabled. You always have to double-click to choose file from list.
-* Typeahead feature is restored. Recursive file search will not be ran when you start typing.
+* Annoying single-click "feature" in file list is disabled. You always have to double-click to choose file from list. See https://bugzilla.gnome.org/show_bug.cgi?id=758065.
+* Typeahead feature is restored. Recursive file search will not be ran when you start typing. See https://bugzilla.gnome.org/show_bug.cgi?id=784029.
 * Current working directory is opened by default instead of section with recently used files.
 * "Other locations" button is removed from places sidebar. All mounted devices and drives are accessible directly.
 * File system button in places sidebar is labeled as "File System" instead of "Computer".
@@ -47,13 +47,14 @@ Others
 
 * Status bars are smaller regardless of used theme.
 * Scrollbars are always visible. Environment variable is not needed.
-* Delay before showing mnemonics is removed. You do not have to wait.
+* Delay before showing mnemonics is removed. You don't have to wait when you press Left Alt button.
+* Integration with Accessibility Toolkit is disabled by default to avoid errors in console output. See https://unix.stackexchange.com/questions/230238. **Important: if you are using assistive technologies (such as Orca reader) you must restore default GTK behavior by setting `NO_AT_BRIDGE=0` environment variable.**
 
 Themes
 ---
 
-* Default Adwaita theme has smaller controls (buttons, fields, tabs, etc.).
-* Dark Adwaita and HighContrast themes also have reduced controls.
+* Default Adwaita theme and its dark variant have smaller controls (buttons, fields, tabs, etc.).
+* HighContrast themes also have reduced controls (testing).
 
 --------
 
diff --git a/create-patch.sh b/create-patch
index 50cd5cfab39a..8fc1e724c2ca 100644..100755
--- a/create-patch.sh
+++ b/create-patch
@@ -9,7 +9,7 @@
 
 if [[ -d ./org/gtk ]] && [[ -d ./mod/gtk ]] && [[ $1 ]]; then
 	# Save.
-	diff -U 10 -r -Z -B ./org/gtk ./mod/gtk > "$1.patch"
+	diff -U 5 -r -Z -B ./org/gtk ./mod/gtk > "$1.patch"
 	# Preview.
-	reset; diff --color=always -U 10 -r -Z -B ./org/gtk ./mod/gtk
+	reset; diff --color=always -U 5 -r -Z -B ./org/gtk ./mod/gtk
 fi
diff --git a/csd__clean-headerbar.patch b/csd__clean-headerbar.patch
new file mode 100644
index 000000000000..8ebe0f5a3b27
--- /dev/null
+++ b/csd__clean-headerbar.patch
@@ -0,0 +1,46 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
+--- ./org/gtk/gtkheaderbar.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkheaderbar.c	2017-07-30 01:55:07.781552231 +0200
+@@ -321,10 +321,12 @@
+ 
+   is_sovereign_window = (!gtk_window_get_modal (window) &&
+                           gtk_window_get_transient_for (window) == NULL &&
+                           gtk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_NORMAL);
+ 
++  if (g_getenv("GTK_CSD") == FALSE)
++    layout_desc = g_strdup("menu");
+   tokens = g_strsplit (layout_desc, ":", 2);
+   if (tokens)
+     {
+       for (i = 0; i < 2; i++)
+         {
+@@ -382,12 +384,12 @@
+                   gtk_widget_show_all (button);
+                   accessible = gtk_widget_get_accessible (button);
+                   if (GTK_IS_ACCESSIBLE (accessible))
+                     atk_object_set_name (accessible, _("Application menu"));
+                   priv->titlebar_icon = image;
+-                  if (!_gtk_header_bar_update_window_icon (bar, window))
+-                    gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), "process-stop-symbolic", GTK_ICON_SIZE_MENU);
++                  if (g_getenv("GTK_CSD") == FALSE || !_gtk_header_bar_update_window_icon (bar, window))
++                    gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), "pan-down-symbolic", GTK_ICON_SIZE_MENU);
+                 }
+               else if (strcmp (t[j], "minimize") == 0 &&
+                        is_sovereign_window)
+                 {
+                   button = gtk_button_new ();
+diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-07-30 01:52:45.221545167 +0200
+@@ -9092,10 +9092,11 @@
+ 
+ static void
+ gtk_window_do_popup (GtkWindow      *window,
+                      GdkEventButton *event)
+ {
++  if (g_getenv("GTK_CSD") == FALSE) return;
+   if (!gdk_window_show_window_menu (_gtk_widget_get_window (GTK_WIDGET (window)),
+                                     (GdkEvent *) event))
+     gtk_window_do_popup_fallback (window, event);
+ }
+ 
diff --git a/csd__disabled-by-default.patch b/csd__disabled-by-default.patch
new file mode 100644
index 000000000000..6841e927004b
--- /dev/null
+++ b/csd__disabled-by-default.patch
@@ -0,0 +1,16 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-07-30 00:21:00.271272407 +0200
+@@ -4136,11 +4136,11 @@
+   else
+     {
+       gtk_style_context_add_class (gtk_widget_get_style_context (widget), "solid-csd");
+     }
+ 
+-  priv->client_decorated = TRUE;
++  priv->client_decorated = (g_getenv("GTK_CSD") != FALSE);
+ }
+ 
+ static void
+ on_titlebar_title_notify (GtkHeaderBar *titlebar,
+                           GParamSpec   *pspec,
diff --git a/csd__headerbar-title.patch b/csd__headerbar-title.patch
new file mode 100644
index 000000000000..daa2767d8b31
--- /dev/null
+++ b/csd__headerbar-title.patch
@@ -0,0 +1,43 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
+--- ./org/gtk/gtkheaderbar.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkheaderbar.c	2017-07-30 02:19:16.171623995 +0200
+@@ -565,10 +565,11 @@
+ }
+ 
+ static void
+ construct_label_box (GtkHeaderBar *bar)
+ {
++  if (g_getenv("GTK_CSD") == FALSE) return;
+   GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
+ 
+   g_assert (priv->label_box == NULL);
+ 
+   priv->label_box = create_title_box (priv->title,
+@@ -1348,10 +1349,11 @@
+     }
+ 
+   gtk_widget_set_visible (priv->subtitle_sizing_label, priv->has_subtitle || (priv->subtitle && priv->subtitle[0]));
+ 
+   g_object_notify_by_pspec (G_OBJECT (bar), header_bar_props[PROP_SUBTITLE]);
++  g_object_notify_by_pspec (G_OBJECT (bar), header_bar_props[PROP_TITLE]);
+ }
+ 
+ /**
+  * gtk_header_bar_get_subtitle:
+  * @bar: a #GtkHeaderBar
+diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-07-30 02:19:59.491626142 +0200
+@@ -4147,10 +4147,12 @@
+                           GtkWindow    *self)
+ {
+   const gchar *title;
+ 
+   title = gtk_header_bar_get_title (titlebar);
++  if (gtk_header_bar_get_subtitle(titlebar))
++    title = g_strconcat(title, " — ", gtk_header_bar_get_subtitle(titlebar), NULL);
+   gtk_window_set_title_internal (self, title, FALSE);
+ }
+ 
+ /**
+  * gtk_window_set_titlebar:
diff --git a/csd__server-side-shadow.patch b/csd__server-side-shadow.patch
new file mode 100644
index 000000000000..651b1f28dcc0
--- /dev/null
+++ b/csd__server-side-shadow.patch
@@ -0,0 +1,15 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-07-30 00:23:13.484612341 +0200
+@@ -4076,10 +4076,11 @@
+ }
+ 
+ static gboolean
+ gtk_window_supports_client_shadow (GtkWindow *window)
+ {
++  if (g_strcmp0(g_getenv("GTK_CSD"), "1") != 0) return FALSE;
+   GdkDisplay *display;
+   GdkScreen *screen;
+   GdkVisual *visual;
+ 
+   screen = _gtk_window_get_screen (window);
diff --git a/file-chooser__cwd-default.patch b/file-chooser__cwd-default.patch
new file mode 100644
index 000000000000..ff2de3b44f5f
--- /dev/null
+++ b/file-chooser__cwd-default.patch
@@ -0,0 +1,16 @@
+diff -U 5 -r -Z -B ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml
+--- ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml	2017-07-30 13:14:27.850096140 +0200
+@@ -117,11 +117,11 @@
+       <description>
+ 	The size (width, height) of the GtkFileChooserDialog's window, in pixels.
+       </description>
+     </key>
+     <key name='startup-mode' enum='org.gtk.Settings.FileChooser.StartupMode'>
+-      <default>'recent'</default>
++      <default>'cwd'</default>
+       <summary>Startup mode</summary>
+       <description>
+ 	Either "recent" or "cwd"; controls whether the file chooser
+ 	starts up showing the list of recently-used files, or the
+ 	contents of the current working directory.
diff --git a/file-chooser__places-sidebar.patch b/file-chooser__places-sidebar.patch
new file mode 100644
index 000000000000..63a1a759f9ca
--- /dev/null
+++ b/file-chooser__places-sidebar.patch
@@ -0,0 +1,58 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
+--- ./org/gtk/gtkplacessidebar.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkplacessidebar.c	2017-07-30 13:16:32.666768991 +0200
+@@ -594,10 +594,11 @@
+ }
+ 
+ static void
+ add_special_dirs (GtkPlacesSidebar *sidebar)
+ {
++  return;
+   GList *dirs;
+   gint index;
+ 
+   dirs = NULL;
+   for (index = 0; index < G_USER_N_DIRECTORIES; index++)
+@@ -1247,12 +1248,10 @@
+       BookmarkQueryClosure *clos;
+ 
+       root = sl->data;
+       is_native = g_file_is_native (root);
+ 
+-      if (_gtk_bookmarks_manager_get_is_builtin (sidebar->bookmarks_manager, root))
+-        continue;
+ 
+       if (sidebar->local_only && !is_native)
+         continue;
+ 
+       clos = g_slice_new (BookmarkQueryClosure);
+@@ -3872,11 +3871,11 @@
+   sidebar->dragging_over = FALSE;
+   sidebar->drag_data_info = DND_UNKNOWN;
+ 
+   gtk_container_add (GTK_CONTAINER (sidebar), sidebar->list_box);
+ 
+-  sidebar->hostname = g_strdup (_("Computer"));
++  sidebar->hostname = g_strdup (_("File System"));
+   sidebar->hostnamed_cancellable = g_cancellable_new ();
+   g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+                             G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
+                             NULL,
+                             "org.freedesktop.hostname1",
+diff -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
+--- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-07-30 13:17:04.406770563 +0200
+@@ -14,11 +14,12 @@
+             <child>
+               <object class="GtkPlacesSidebar" id="places_sidebar">
+                 <property name="visible">1</property>
+                 <property name="hscrollbar-policy">never</property>
+                 <property name="local-only">1</property>
+-                <property name="show-other-locations">1</property>
++                <property name="show-other-locations">0</property>
++                <property name="show-trash">0</property>
+                 <style>
+                   <class name="sidebar"/>
+                 </style>
+                 <signal name="open-location" handler="places_sidebar_open_location_cb" swapped="no"/>
+                 <signal name="show-error-message" handler="places_sidebar_show_error_message_cb" swapped="no"/>
diff --git a/p__file-chooser__single-click.patch b/file-chooser__single-click.patch
index b6e372c0ede7..2414bf8f2ba1 100644
--- a/p__file-chooser__single-click.patch
+++ b/file-chooser__single-click.patch
@@ -1,12 +1,7 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-06-18 19:21:13.476811543 +0200
-@@ -2415,21 +2415,21 @@
-   gboolean modify, extend, is_touchscreen;
- 
-   if (in_press)
-     return FALSE;
- 
+diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- ./org/gtk/gtkfilechooserwidget.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-07-30 13:18:16.970107493 +0200
+@@ -2420,11 +2420,11 @@
    device = gdk_event_get_source_device ((GdkEvent *) event);
    is_touchscreen = gtk_simulate_touchscreen () ||
                     gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN;
@@ -19,8 +14,3 @@ diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwid
        event->button == GDK_BUTTON_PRIMARY &&
        gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->browse_files_tree_view),
                                       event->x, event->y,
-                                      &path, &column, NULL, NULL))
-     {
-       GtkTreeSelection *selection;
- 
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view));
diff --git a/file-chooser__typeahead.patch b/file-chooser__typeahead.patch
new file mode 100644
index 000000000000..d61f8f732774
--- /dev/null
+++ b/file-chooser__typeahead.patch
@@ -0,0 +1,74 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserdialog.c ./mod/gtk/gtkfilechooserdialog.c
+--- ./org/gtk/gtkfilechooserdialog.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkfilechooserdialog.c	2017-07-30 13:23:41.280123562 +0200
+@@ -479,11 +479,11 @@
+     return;
+ 
+   dialog->priv->search_setup = TRUE;
+ 
+   g_object_get (dialog, "use-header-bar", &use_header, NULL);
+-  if (use_header)
++  if (FALSE && use_header)
+     {
+       GtkWidget *button;
+       GtkWidget *image;
+       GtkWidget *header;
+ 
+diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- ./org/gtk/gtkfilechooserwidget.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-07-30 13:24:45.543460079 +0200
+@@ -2476,11 +2476,11 @@
+ static void
+ file_list_set_sort_column_ids (GtkFileChooserWidget *impl)
+ {
+   GtkFileChooserWidgetPrivate *priv = impl->priv;
+ 
+-  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
++  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), 0);
+ 
+   gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
+   gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
+   gtk_tree_view_column_set_sort_column_id (priv->list_size_column, MODEL_COL_SIZE);
+   gtk_tree_view_column_set_sort_column_id (priv->list_location_column, MODEL_COL_LOCATION_TEXT);
+@@ -3246,10 +3246,12 @@
+     case OPERATION_MODE_BROWSE:
+       operation_mode_set_browse (impl);
+       break;
+ 
+     case OPERATION_MODE_SEARCH:
++      priv->operation_mode = old_mode;
++      return;
+       operation_mode_set_search (impl);
+       break;
+ 
+     case OPERATION_MODE_RECENT:
+       operation_mode_set_recent (impl);
+@@ -7496,11 +7498,11 @@
+   GtkFileChooserWidget *impl = load_data->impl;
+   GtkFileChooserWidgetPrivate *priv = impl->priv;
+ 
+   gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
+                            GTK_TREE_MODEL (priv->recent_model));
+-  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
++  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), 0);
+ 
+   gtk_tree_view_column_set_sort_column_id (priv->list_name_column, -1);
+   gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1);
+   gtk_tree_view_column_set_sort_column_id (priv->list_size_column, -1);
+   gtk_tree_view_column_set_sort_column_id (priv->list_location_column, -1);
+diff -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
+--- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-07-30 13:25:38.093462683 +0200
+@@ -160,11 +160,11 @@
+                                 <property name="hscrollbar-policy">never</property>
+                                 <child>
+                                   <object class="GtkTreeView" id="browse_files_tree_view">
+                                     <property name="visible">1</property>
+                                     <property name="has-tooltip">1</property>
+-                                    <property name="enable-search">0</property>
++                                    <property name="enable-search">1</property>
+                                     <child internal-child="accessible">
+                                       <object class="AtkObject" id="browse_files_tree_view-atkobject">
+                                         <property name="AtkObject::accessible-name" translatable="yes">Files</property>
+                                       </object>
+                                     </child>
diff --git a/gtk-query-immodules-3.0.hook b/gtk-query-immodules-3.0.hook
deleted file mode 100644
index c7703cf432c1..000000000000
--- a/gtk-query-immodules-3.0.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
diff --git a/gtk3.install b/gtk3.install
deleted file mode 100644
index c0c44539de6f..000000000000
--- a/gtk3.install
+++ /dev/null
@@ -1,3 +0,0 @@
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
diff --git a/p__icons__buttons.patch b/icons__buttons.patch
index 44d617e37f6c..6a57faf2a60c 100644
--- a/p__icons__buttons.patch
+++ b/icons__buttons.patch
@@ -1,12 +1,7 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkbutton.c ./mod/gtk/gtkbutton.c
---- ./org/gtk/gtkbutton.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkbutton.c	2017-06-18 20:08:57.103620097 +0200
-@@ -2164,20 +2164,41 @@
-  */
- void
- gtk_button_set_label (GtkButton   *button,
- 		      const gchar *label)
- {
+diff -U 5 -r -Z -B ./org/gtk/gtkbutton.c ./mod/gtk/gtkbutton.c
+--- ./org/gtk/gtkbutton.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkbutton.c	2017-07-30 13:51:31.303539641 +0200
+@@ -2169,10 +2169,30 @@
    GtkButtonPrivate *priv;
    gchar *new_label;
  
@@ -32,14 +27,8 @@ diff -U 10 -r -Z -B ./org/gtk/gtkbutton.c ./mod/gtk/gtkbutton.c
 +    if (use_this_icon)
 +      g_object_set(button, "image", gtk_image_new_from_icon_name(use_this_icon,GTK_ICON_SIZE_BUTTON), NULL);
 +  }
-+
    priv = button->priv;
  
    new_label = g_strdup (label);
    g_free (priv->label_text);
    priv->label_text = new_label;
- 
-   gtk_button_construct_child (button);
-   
-   g_object_notify_by_pspec (G_OBJECT (button), props[PROP_LABEL]);
- }
diff --git a/p__icons__context-menus.patch b/icons__context-menus.patch
index 33f2c74a2227..d8f385a539af 100644
--- a/p__icons__context-menus.patch
+++ b/icons__context-menus.patch
@@ -1,12 +1,7 @@
-diff -U 10 -r -Z -B ./org/gtk/deprecated/gtkimagemenuitem.c ./mod/gtk/deprecated/gtkimagemenuitem.c
---- ./org/gtk/deprecated/gtkimagemenuitem.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/deprecated/gtkimagemenuitem.c	2017-07-02 23:02:26.387051500 +0200
-@@ -484,20 +484,33 @@
-     (gtk_image_menu_item_parent_class)->set_label (GTK_MENU_ITEM (image_menu_item), resolved_label);
- 
- }
- 
- static void
+diff -U 5 -r -Z -B ./org/gtk/deprecated/gtkimagemenuitem.c ./mod/gtk/deprecated/gtkimagemenuitem.c
+--- ./org/gtk/deprecated/gtkimagemenuitem.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/deprecated/gtkimagemenuitem.c	2017-07-30 14:50:21.813714571 +0200
+@@ -489,10 +489,22 @@
  gtk_image_menu_item_set_label (GtkMenuItem      *menu_item,
                                 const gchar      *label)
  {
@@ -24,26 +19,15 @@ diff -U 10 -r -Z -B ./org/gtk/deprecated/gtkimagemenuitem.c ./mod/gtk/deprecated
 +    if (use_this_icon)
 +      g_object_set(menu_item, "image", gtk_image_new_from_icon_name(use_this_icon,GTK_ICON_SIZE_MENU), NULL);
 +  }
-+
    if (priv->label != label)
      {
        g_free (priv->label);
        priv->label = g_strdup (label);
  
-       gtk_image_menu_item_recalculate (GTK_IMAGE_MENU_ITEM (menu_item));
- 
-       g_object_notify (G_OBJECT (menu_item), "label");
- 
-     }
-diff -U 10 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c
---- ./org/gtk/gtkentry.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtkentry.c	2017-07-02 23:01:01.360380621 +0200
-@@ -9442,21 +9442,21 @@
-     }
- }
- 
- static void
- append_action_signal (GtkEntry     *entry,
+diff -U 5 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c
+--- ./org/gtk/gtkentry.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkentry.c	2017-07-30 14:49:33.493712177 +0200
+@@ -9447,11 +9447,11 @@
  		      GtkWidget    *menu,
  		      const gchar  *label,
  		      const gchar  *signal,
@@ -56,17 +40,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c
    g_signal_connect (menuitem, "activate",
  		    G_CALLBACK (activate_cb), entry);
  
-   gtk_widget_set_sensitive (menuitem, sensitive);
-   
-   gtk_widget_show (menuitem);
-   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
- }
-@@ -9509,32 +9509,32 @@
-                             info_entry_priv->editable && mode == DISPLAY_NORMAL &&
-                             info_entry_priv->current_pos != info_entry_priv->selection_bound);
- 
-       append_action_signal (entry, menu, _("_Copy"), "copy-clipboard",
-                             mode == DISPLAY_NORMAL &&
+@@ -9514,22 +9514,22 @@
                              info_entry_priv->current_pos != info_entry_priv->selection_bound);
  
        append_action_signal (entry, menu, _("_Paste"), "paste-clipboard",
@@ -91,20 +65,10 @@ diff -U 10 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c
                                  G_CALLBACK (gtk_entry_select_all), entry);
        gtk_widget_show (menuitem);
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
- 
-       g_signal_emit (entry, signals[POPULATE_POPUP], 0, menu);
- 
-       if (info->trigger_event && gdk_event_triggers_context_menu (info->trigger_event))
-         gtk_menu_popup_at_pointer (GTK_MENU (menu), info->trigger_event);
-diff -U 10 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
---- ./org/gtk/gtklabel.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtklabel.c	2017-07-02 23:01:43.213716028 +0200
-@@ -6542,21 +6542,21 @@
-   g_signal_emit_by_name (label, signal);
- }
- 
- static void
- append_action_signal (GtkLabel     *label,
+diff -U 5 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
+--- ./org/gtk/gtklabel.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtklabel.c	2017-07-30 14:49:33.497045511 +0200
+@@ -6547,11 +6547,11 @@
  		      GtkWidget    *menu,
  		      const gchar  *text,
  		      const gchar  *signal,
@@ -117,17 +81,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
    g_signal_connect (menuitem, "activate",
  		    G_CALLBACK (activate_cb), label);
  
-   gtk_widget_set_sensitive (menuitem, sensitive);
-   
-   gtk_widget_show (menuitem);
-   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
- }
-@@ -6633,53 +6633,53 @@
-         link = priv->select_info->active_link;
-       else
-         link = NULL;
-     }
-   else
+@@ -6638,20 +6638,20 @@
      link = gtk_label_get_focus_link (label);
  
    if (!have_selection && link)
@@ -150,9 +104,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
  
        g_signal_connect (G_OBJECT (menuitem), "activate",
-                         G_CALLBACK (copy_link_activate_cb), label);
-     }
-   else
+@@ -6661,20 +6661,20 @@
      {
        append_action_signal (label, menu, _("Cu_t"), "cut-clipboard", FALSE);
        append_action_signal (label, menu, _("_Copy"), "copy-clipboard", have_selection);
@@ -175,20 +127,10 @@ diff -U 10 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
        gtk_widget_show (menuitem);
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
      }
- 
-   g_signal_emit (label, signals[POPULATE_POPUP], 0, menu);
- 
-   if (event && gdk_event_triggers_context_menu (event))
-     gtk_menu_popup_at_pointer (GTK_MENU (menu), event);
-diff -U 10 -r -Z -B ./org/gtk/gtklinkbutton.c ./mod/gtk/gtklinkbutton.c
---- ./org/gtk/gtklinkbutton.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtklinkbutton.c	2017-07-02 23:01:28.883715318 +0200
-@@ -360,21 +360,21 @@
- 	gtk_widget_destroy (priv->popup_menu);
- 
-       priv->popup_menu = gtk_menu_new ();
-       gtk_style_context_add_class (gtk_widget_get_style_context (priv->popup_menu),
-                                    GTK_STYLE_CLASS_CONTEXT_MENU);
+diff -U 5 -r -Z -B ./org/gtk/gtklinkbutton.c ./mod/gtk/gtklinkbutton.c
+--- ./org/gtk/gtklinkbutton.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtklinkbutton.c	2017-07-30 14:49:33.497045511 +0200
+@@ -365,11 +365,11 @@
  
        gtk_menu_attach_to_widget (GTK_MENU (priv->popup_menu),
  		      		 GTK_WIDGET (link_button),
@@ -201,8 +143,3 @@ diff -U 10 -r -Z -B ./org/gtk/gtklinkbutton.c ./mod/gtk/gtklinkbutton.c
        gtk_widget_show (menu_item);
        gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menu_item);
  
-       if (event && gdk_event_triggers_context_menu (event))
-         gtk_menu_popup_at_pointer (GTK_MENU (priv->popup_menu), event);
-       else
-         {
-           gtk_menu_popup_at_widget (GTK_MENU (priv->popup_menu),
diff --git a/p__icons__file-chooser.patch b/icons__file-chooser.patch
index a59b582ddc04..ac07c34f1015 100644
--- a/p__icons__file-chooser.patch
+++ b/icons__file-chooser.patch
@@ -1,12 +1,7 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkfilesystem.c ./mod/gtk/gtkfilesystem.c
---- ./org/gtk/gtkfilesystem.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkfilesystem.c	2017-06-19 20:18:05.980166455 +0200
-@@ -770,27 +770,27 @@
- 
-   g_object_unref (icon);
- 
-   return surface;
- }
+diff -U 5 -r -Z -B ./org/gtk/gtkfilesystem.c ./mod/gtk/gtkfilesystem.c
+--- ./org/gtk/gtkfilesystem.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkfilesystem.c	2017-07-30 13:48:51.953531745 +0200
+@@ -775,17 +775,17 @@
  
  GIcon *
  _gtk_file_system_volume_get_symbolic_icon (GtkFileSystemVolume *volume)
@@ -28,20 +23,10 @@ diff -U 10 -r -Z -B ./org/gtk/gtkfilesystem.c ./mod/gtk/gtkfilesystem.c
  }
  
  GtkFileSystemVolume *
- _gtk_file_system_volume_ref (GtkFileSystemVolume *volume)
- {
-   if (IS_ROOT_VOLUME (volume))
-     return volume;
- 
-diff -U 10 -r -Z -B ./org/gtk/gtkpathbar.c ./mod/gtk/gtkpathbar.c
---- ./org/gtk/gtkpathbar.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkpathbar.c	2017-06-19 20:13:53.890153964 +0200
-@@ -1266,21 +1266,21 @@
- 
-   if (!data->button_data->button)
-     {
-       g_free (data->button_data);
-       goto out;
+diff -U 5 -r -Z -B ./org/gtk/gtkpathbar.c ./mod/gtk/gtkpathbar.c
+--- ./org/gtk/gtkpathbar.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkpathbar.c	2017-07-30 13:48:51.956865078 +0200
+@@ -1271,11 +1271,11 @@
      }
  
    if (cancelled || error)
@@ -54,17 +39,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkpathbar.c ./mod/gtk/gtkpathbar.c
    switch (data->button_data->type)
      {
        case HOME_BUTTON:
-         g_set_object (&data->path_bar->priv->home_icon, icon);
- 	break;
- 
-       case DESKTOP_BUTTON:
-         g_set_object (&data->path_bar->priv->desktop_icon, icon);
-@@ -1332,21 +1332,21 @@
-       data = g_new0 (struct SetButtonImageData, 1);
-       data->path_bar = path_bar;
-       data->button_data = button_data;
- 
-       if (button_data->cancellable)
+@@ -1337,11 +1337,11 @@
  	g_cancellable_cancel (button_data->cancellable);
  
        button_data->cancellable =
@@ -77,17 +52,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkpathbar.c ./mod/gtk/gtkpathbar.c
        break;
  
      case DESKTOP_BUTTON:
-       if (path_bar->priv->desktop_icon != NULL)
-         {
-           gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), path_bar->priv->desktop_icon, GTK_ICON_SIZE_BUTTON);
- 	  break;
- 	}
-@@ -1354,21 +1354,21 @@
-       data = g_new0 (struct SetButtonImageData, 1);
-       data->path_bar = path_bar;
-       data->button_data = button_data;
- 
-       if (button_data->cancellable)
+@@ -1359,11 +1359,11 @@
  	g_cancellable_cancel (button_data->cancellable);
  
        button_data->cancellable =
@@ -100,20 +65,10 @@ diff -U 10 -r -Z -B ./org/gtk/gtkpathbar.c ./mod/gtk/gtkpathbar.c
        break;
      default:
        break;
-     }
- }
- 
- static void
- button_data_free (ButtonData *button_data)
-diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
---- ./org/gtk/gtkplacessidebar.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkplacessidebar.c	2017-06-19 20:13:53.896820632 +0200
-@@ -240,39 +240,39 @@
-   PROP_SHOW_CONNECT_TO_SERVER,
-   PROP_SHOW_ENTER_LOCATION,
-   PROP_SHOW_TRASH,
-   PROP_LOCAL_ONLY,
-   PROP_SHOW_OTHER_LOCATIONS,
+diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
+--- ./org/gtk/gtkplacessidebar.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkplacessidebar.c	2017-07-30 13:48:51.956865078 +0200
+@@ -245,29 +245,29 @@
    PROP_POPULATE_ALL,
    NUM_PROPERTIES
  };
@@ -162,17 +117,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
  static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
  
  static gboolean eject_or_unmount_bookmark  (GtkSidebarRow *row);
- static gboolean eject_or_unmount_selection (GtkPlacesSidebar *sidebar);
- static void  check_unmount_and_eject       (GMount   *mount,
-                                             GVolume  *volume,
-                                             GDrive   *drive,
-                                             gboolean *show_unmount,
-@@ -740,21 +740,21 @@
- 
-   if (info)
-     {
-       gchar *uri;
-       gchar *tooltip;
+@@ -745,11 +745,11 @@
        const gchar *name;
        GIcon *icon;
        int pos = 0;
@@ -185,17 +130,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
  
        /* XXX: we could avoid this by using an ancillary closure
         * with the index coming from add_application_shortcuts(),
-        * but in terms of algorithmic overhead, the application
-        * shortcuts is not going to be really big
-        */
-       pos = g_slist_index (sidebar->shortcuts, file);
- 
-@@ -781,21 +781,21 @@
-     {
-       GFile *file = l->data;
- 
-       if (!should_show_file (sidebar, file))
-         continue;
+@@ -786,11 +786,11 @@
  
        if (file_is_shown (sidebar, file))
          continue;
@@ -208,17 +143,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                                 sidebar->cancellable,
                                 on_app_shortcuts_query_complete,
                                 sidebar);
-     }
- }
- 
- typedef struct {
-   GtkPlacesSidebar *sidebar;
-@@ -830,21 +830,21 @@
-       /* Don't add non-UTF-8 bookmarks */
-       bookmark_name = g_file_get_basename (root);
-       if (!g_utf8_validate (bookmark_name, -1, NULL))
-         {
-           g_free (bookmark_name);
+@@ -835,11 +835,11 @@
            goto out;
          }
      }
@@ -231,17 +156,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
  
    mount_uri = g_file_get_uri (root);
    tooltip = g_file_get_parse_name (root);
- 
-   add_place (sidebar, PLACES_BOOKMARK,
-              SECTION_BOOKMARKS,
-              bookmark_name, icon, mount_uri,
-              NULL, NULL, NULL, clos->index,
-@@ -937,21 +937,21 @@
-   gtk_container_foreach (GTK_CONTAINER (sidebar->list_box),
-                          (GtkCallback) gtk_widget_destroy,
-                          NULL);
- 
-   network_mounts = network_volumes = NULL;
+@@ -942,11 +942,11 @@
  
    /* add built-in places */
    if (should_show_recent (sidebar))
@@ -254,17 +169,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                   _("Recent"), icon, mount_uri,
                   NULL, NULL, NULL, 0,
                   _("Recent files"));
-       g_object_unref (icon);
-     }
- 
-   /* home folder */
-   home_uri = get_home_directory_uri ();
-@@ -1039,21 +1039,21 @@
-               if (sidebar->show_other_locations && !is_external_volume (volume))
-                 {
-                   g_object_unref (volume);
-                   continue;
-                 }
+@@ -1044,11 +1044,11 @@
  
                mount = g_volume_get_mount (volume);
                if (mount != NULL)
@@ -277,17 +182,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                    name = g_mount_get_name (mount);
                    tooltip = g_file_get_parse_name (root);
  
-                   add_place (sidebar, PLACES_MOUNTED_VOLUME,
-                              SECTION_MOUNTS,
-                              name, icon, mount_uri,
-                              drive, volume, mount, 0, tooltip);
-                   g_object_unref (root);
-@@ -1066,21 +1066,21 @@
-               else
-                 {
-                   /* Do show the unmounted volumes in the sidebar;
-                    * this is so the user can mount it (in case automounting
-                    * is off).
+@@ -1071,11 +1071,11 @@
                     *
                     * Also, even if automounting is enabled, this gives a visual
                     * cue that the user should remember to yank out the media if
@@ -300,17 +195,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
  
                    add_place (sidebar, PLACES_MOUNTED_VOLUME,
                               SECTION_MOUNTS,
-                              name, icon, NULL,
-                              drive, volume, NULL, 0, tooltip);
-                   g_object_unref (icon);
-                   g_free (name);
-                   g_free (tooltip);
-@@ -1094,21 +1094,21 @@
-           if (g_drive_is_media_removable (drive) && !g_drive_is_media_check_automatic (drive))
-             {
-               /* If the drive has no mountable volumes and we cannot detect media change.. we
-                * display the drive in the sidebar so the user can manually poll the drive by
-                * right clicking and selecting "Rescan..."
+@@ -1099,11 +1099,11 @@
                 *
                 * This is mainly for drives like floppies where media detection doesn't
                 * work.. but it's also for human beings who like to turn off media detection
@@ -323,17 +208,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
  
                add_place (sidebar, PLACES_BUILT_IN,
                           SECTION_MOUNTS,
-                          name, icon, NULL,
-                          drive, NULL, NULL, 0, tooltip);
-               g_object_unref (icon);
-               g_free (tooltip);
-               g_free (name);
-@@ -1142,40 +1142,40 @@
- 
-       if (sidebar->show_other_locations && !is_external_volume (volume))
-         {
-           g_object_unref (volume);
-           continue;
+@@ -1147,11 +1147,11 @@
          }
  
        mount = g_volume_get_mount (volume);
@@ -346,14 +221,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
            tooltip = g_file_get_parse_name (root);
            name = g_mount_get_name (mount);
            add_place (sidebar, PLACES_MOUNTED_VOLUME,
-                      SECTION_MOUNTS,
-                      name, icon, mount_uri,
-                      NULL, volume, mount, 0, tooltip);
-           g_object_unref (mount);
-           g_object_unref (root);
-           g_object_unref (icon);
-           g_free (name);
-           g_free (tooltip);
+@@ -1166,11 +1166,11 @@
            g_free (mount_uri);
          }
        else
@@ -366,17 +234,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                       SECTION_MOUNTS,
                       name, icon, NULL,
                       NULL, volume, NULL, 0, name);
-           g_object_unref (icon);
-           g_free (name);
-         }
-       g_object_unref (volume);
-     }
-@@ -1214,21 +1214,21 @@
-         }
-       root = g_mount_get_default_location (mount);
- 
-       if (!g_file_is_native (root))
-         {
+@@ -1219,11 +1219,11 @@
            network_mounts = g_list_prepend (network_mounts, mount);
            g_object_unref (root);
            continue;
@@ -389,17 +247,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
        tooltip = g_file_get_parse_name (root);
        add_place (sidebar, PLACES_MOUNTED_VOLUME,
                   SECTION_COMPUTER,
-                  name, icon, mount_uri,
-                  NULL, NULL, mount, 0, tooltip);
-       g_object_unref (root);
-       g_object_unref (mount);
-       g_object_unref (icon);
-@@ -1253,32 +1253,32 @@
-         continue;
- 
-       if (sidebar->local_only && !is_native)
-         continue;
- 
+@@ -1258,22 +1258,22 @@
        clos = g_slice_new (BookmarkQueryClosure);
        clos->sidebar = sidebar;
        clos->index = index;
@@ -424,17 +272,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                                           _("New bookmark"), new_bookmark_icon, NULL,
                                           NULL, NULL, NULL, 0,
                                           _("Add a new bookmark"));
-   context = gtk_widget_get_style_context (sidebar->new_bookmark_row);
-   gtk_style_context_add_class (context, "sidebar-new-bookmark-row");
-   g_object_unref (new_bookmark_icon);
- 
-   /* network */
-@@ -1301,40 +1301,40 @@
-           volume = l->data;
-           mount = g_volume_get_mount (volume);
- 
-           if (mount != NULL)
-             {
+@@ -1306,11 +1306,11 @@
                network_mounts = g_list_prepend (network_mounts, mount);
                continue;
              }
@@ -447,14 +285,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
  
                add_place (sidebar, PLACES_MOUNTED_VOLUME,
                           SECTION_MOUNTS,
-                          name, icon, NULL,
-                          NULL, volume, NULL, 0, tooltip);
-               g_object_unref (icon);
-               g_free (name);
-               g_free (tooltip);
-             }
-         }
- 
+@@ -1325,11 +1325,11 @@
        network_mounts = g_list_reverse (network_mounts);
        for (l = network_mounts; l != NULL; l = l->next)
          {
@@ -467,20 +298,10 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
            tooltip = g_file_get_parse_name (root);
            add_place (sidebar, PLACES_MOUNTED_VOLUME,
                       SECTION_MOUNTS,
-                      name, icon, mount_uri,
-                      NULL, NULL, mount, 0, tooltip);
-           g_object_unref (root);
-           g_object_unref (icon);
-           g_free (name);
-diff -U 10 -r -Z -B ./org/gtk/gtktrashmonitor.c ./mod/gtk/gtktrashmonitor.c
---- ./org/gtk/gtktrashmonitor.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtktrashmonitor.c	2017-06-19 20:13:53.896820632 +0200
-@@ -45,22 +45,22 @@
-   TRASH_STATE_CHANGED,
-   LAST_SIGNAL
- };
- 
- static guint signals[LAST_SIGNAL];
+diff -U 5 -r -Z -B ./org/gtk/gtktrashmonitor.c ./mod/gtk/gtktrashmonitor.c
+--- ./org/gtk/gtktrashmonitor.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtktrashmonitor.c	2017-07-30 13:48:51.960198412 +0200
+@@ -50,12 +50,12 @@
  
  G_DEFINE_TYPE (GtkTrashMonitor, _gtk_trash_monitor, G_TYPE_OBJECT)
  
@@ -495,20 +316,10 @@ diff -U 10 -r -Z -B ./org/gtk/gtktrashmonitor.c ./mod/gtk/gtktrashmonitor.c
  gtk_trash_monitor_dispose (GObject *object)
  {
    GtkTrashMonitor *monitor;
- 
-   monitor = GTK_TRASH_MONITOR (object);
- 
-   if (monitor->file_monitor)
-     {
-diff -U 10 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
---- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-06-19 20:13:53.896820632 +0200
-@@ -66,21 +66,21 @@
-                                 </child>
-                                 <child>
-                                   <object class="GtkMenuButton" id="browse_new_folder_button">
-                                     <property name="tooltip-text" translatable="yes">Create Folder</property>
-                                     <property name="use-underline">1</property>
+diff -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
+--- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-07-30 13:48:51.960198412 +0200
+@@ -71,11 +71,11 @@
                                      <property name="popover">new_folder_popover</property>
                                      <signal name="notify::active" handler="new_folder_popover_active"/>
                                      <child>
@@ -521,17 +332,7 @@ diff -U 10 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilecho
                                      </child>
                                    </object>
                                    <packing>
-                                     <property name="fill">0</property>
-                                     <property name="pack-type">end</property>
-                                     <property name="position">1</property>
-                                   </packing>
-                                 </child>
-@@ -286,21 +286,21 @@
-                             <property name="hexpand">1</property>
-                             <property name="vexpand">1</property>
-                             <property name="halign">center</property>
-                             <property name="valign">center</property>
-                             <style>
+@@ -291,11 +291,11 @@
                                <class name="dim-label"/>
                              </style>
                              <child>
@@ -544,20 +345,10 @@ diff -U 10 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilecho
                                    <class name="dim-label"/>
                                  </style>
                                </object>
-                               <packing>
-                                 <property name="left-attach">0</property>
-                                 <property name="top-attach">0</property>
-                               </packing>
-                             </child>
-diff -U 10 -r -Z -B ./org/gtk/ui/gtksidebarrow.ui ./mod/gtk/ui/gtksidebarrow.ui
---- ./org/gtk/ui/gtksidebarrow.ui	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/ui/gtksidebarrow.ui	2017-06-19 20:13:53.896820632 +0200
-@@ -17,22 +17,22 @@
-         </style>
-         <child>
-           <object class="GtkEventBox" id="event_box">
-             <property name="visible">1</property>
-             <child>
+diff -U 5 -r -Z -B ./org/gtk/ui/gtksidebarrow.ui ./mod/gtk/ui/gtksidebarrow.ui
+--- ./org/gtk/ui/gtksidebarrow.ui	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/ui/gtksidebarrow.ui	2017-07-30 13:48:51.960198412 +0200
+@@ -22,12 +22,12 @@
                <object class="GtkBox">
                  <property name="visible">1</property>
                  <child>
@@ -571,8 +362,3 @@ diff -U 10 -r -Z -B ./org/gtk/ui/gtksidebarrow.ui ./mod/gtk/ui/gtksidebarrow.ui
                  </child>
                  <child>
                    <object class="GtkLabel" id="label_widget">
-                     <property name="visible">1</property>
-                     <property name="hexpand">1</property>
-                     <property name="xalign">0</property>
-                     <style>
-                       <class name="sidebar-label"/>
diff --git a/other__mnemonics-delay.patch b/other__mnemonics-delay.patch
new file mode 100644
index 000000000000..ba660025ee39
--- /dev/null
+++ b/other__mnemonics-delay.patch
@@ -0,0 +1,16 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-07-30 13:27:20.190134408 +0200
+@@ -149,11 +149,11 @@
+  *
+  * GtkWindow adds the .titlebar and .default-decoration style classes to the
+  * widget that is added as a titlebar child.
+  */
+ 
+-#define MNEMONICS_DELAY 300 /* ms */
++#define MNEMONICS_DELAY 0 /* ms */
+ #define NO_CONTENT_CHILD_NAT 200
+ /* In case the content (excluding header bar and shadows) of the window
+  * would be empty, either because there is no visible child widget or only an
+  * empty container widget, we use NO_CONTENT_CHILD_NAT as natural width/height
+  * instead.
diff --git a/other__no-at-bridge.patch b/other__no-at-bridge.patch
new file mode 100644
index 000000000000..43c570a80895
--- /dev/null
+++ b/other__no-at-bridge.patch
@@ -0,0 +1,15 @@
+diff -U 5 -r -Z -B ./org/gtk/a11y/gtkaccessibility.c ./mod/gtk/a11y/gtkaccessibility.c
+--- ./org/gtk/a11y/gtkaccessibility.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/a11y/gtkaccessibility.c	2017-07-30 15:59:40.130141936 +0200
+@@ -987,10 +987,11 @@
+ 
+   _gtk_accessibility_override_atk_util ();
+   do_window_event_initialization ();
+ 
+ #ifdef GDK_WINDOWING_X11
++  if (g_getenv("NO_AT_BRIDGE") == FALSE) return;
+   atk_bridge_adaptor_init (NULL, NULL);
+ #endif
+ 
+   atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
+ }
diff --git a/p__other__statusbar.patch b/other__statusbar-size.patch
index 2f6b85c43170..c7721e445711 100644
--- a/p__other__statusbar.patch
+++ b/other__statusbar-size.patch
@@ -1,9 +1,7 @@
-diff -U 10 -r -Z -B ./org/gtk/ui/gtkstatusbar.ui ./mod/gtk/ui/gtkstatusbar.ui
---- ./org/gtk/ui/gtkstatusbar.ui	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/ui/gtkstatusbar.ui	2017-06-18 20:10:24.643624434 +0200
-@@ -1,19 +1,19 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <interface domain="gtk30">
+diff -U 5 -r -Z -B ./org/gtk/ui/gtkstatusbar.ui ./mod/gtk/ui/gtkstatusbar.ui
+--- ./org/gtk/ui/gtkstatusbar.ui	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/ui/gtkstatusbar.ui	2017-07-30 13:30:05.083475912 +0200
+@@ -3,12 +3,12 @@
    <!-- interface-requires gtk+ 3.10 -->
    <template class="GtkStatusbar" parent="GtkBox">
      <property name="spacing">2</property>
@@ -18,8 +16,3 @@ diff -U 10 -r -Z -B ./org/gtk/ui/gtkstatusbar.ui ./mod/gtk/ui/gtkstatusbar.ui
          <property name="visible">1</property>
          <property name="shadow-type">none</property>
          <child>
-           <object class="GtkBox" id="message_area">
-             <property name="visible">1</property>
-             <property name="spacing">4</property>
-             <property name="margin">4</property>
-             <child>
diff --git a/other__visible-scrollbar.patch b/other__visible-scrollbar.patch
new file mode 100644
index 000000000000..1013392b51b3
--- /dev/null
+++ b/other__visible-scrollbar.patch
@@ -0,0 +1,15 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkscrolledwindow.c ./mod/gtk/gtkscrolledwindow.c
+--- ./org/gtk/gtkscrolledwindow.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkscrolledwindow.c	2017-07-30 13:28:54.380139075 +0200
+@@ -4399,11 +4399,10 @@
+   GtkScrolledWindowPrivate *priv = scrolled_window->priv;
+   gboolean use_indicators;
+ 
+   use_indicators = priv->overlay_scrolling;
+ 
+-  if (g_strcmp0 (g_getenv ("GTK_OVERLAY_SCROLLING"), "0") == 0)
+     use_indicators = FALSE;
+ 
+   if (priv->use_indicators != use_indicators)
+     {
+       priv->use_indicators = use_indicators;
diff --git a/p__file-chooser__cwd-default.patch b/p__file-chooser__cwd-default.patch
deleted file mode 100644
index bb882277e1e8..000000000000
--- a/p__file-chooser__cwd-default.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml
---- ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml	2017-06-20 22:14:05.590256118 +0200
-@@ -112,21 +112,21 @@
-       </description>
-     </key>
-     <key name='window-size' type='(ii)'>
-       <default>(-1, -1)</default>
-       <summary>Window size</summary>
-       <description>
- 	The size (width, height) of the GtkFileChooserDialog's window, in pixels.
-       </description>
-     </key>
-     <key name='startup-mode' enum='org.gtk.Settings.FileChooser.StartupMode'>
--      <default>'recent'</default>
-+      <default>'cwd'</default>
-       <summary>Startup mode</summary>
-       <description>
- 	Either "recent" or "cwd"; controls whether the file chooser
- 	starts up showing the list of recently-used files, or the
- 	contents of the current working directory.
-       </description>
-     </key>
-     <key name='sidebar-width' type='i'>
-       <default>148</default>
-       <summary>Sidebar width</summary>
diff --git a/p__file-chooser__places-sidebar.patch b/p__file-chooser__places-sidebar.patch
deleted file mode 100644
index e5e90cfa37a3..000000000000
--- a/p__file-chooser__places-sidebar.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
---- ./org/gtk/gtkplacessidebar.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkplacessidebar.c	2017-06-18 23:15:17.254174052 +0200
-@@ -589,20 +589,21 @@
- 
-   home_dir = g_file_new_for_path (home_path);
-   emit_open_location (sidebar, home_dir, 0);
- 
-   g_object_unref (home_dir);
- }
- 
- static void
- add_special_dirs (GtkPlacesSidebar *sidebar)
- {
-+  return;
-   GList *dirs;
-   gint index;
- 
-   dirs = NULL;
-   for (index = 0; index < G_USER_N_DIRECTORIES; index++)
-     {
-       const gchar *path;
-       GFile *root;
-       GIcon *icon;
-       gchar *name;
-@@ -1242,22 +1243,20 @@
-   bookmarks = _gtk_bookmarks_manager_list_bookmarks (sidebar->bookmarks_manager);
- 
-   for (sl = bookmarks, index = 0; sl; sl = sl->next, index++)
-     {
-       gboolean is_native;
-       BookmarkQueryClosure *clos;
- 
-       root = sl->data;
-       is_native = g_file_is_native (root);
- 
--      if (_gtk_bookmarks_manager_get_is_builtin (sidebar->bookmarks_manager, root))
--        continue;
- 
-       if (sidebar->local_only && !is_native)
-         continue;
- 
-       clos = g_slice_new (BookmarkQueryClosure);
-       clos->sidebar = sidebar;
-       clos->index = index;
-       clos->is_native = is_native;
-       g_file_query_info_async (root,
-                                "standard::display-name,standard::symbolic-icon",
-@@ -3867,21 +3866,21 @@
-                     G_CALLBACK (drag_end_callback), sidebar);
-   g_signal_connect (sidebar->list_box, "drag-leave",
-                     G_CALLBACK (drag_leave_callback), sidebar);
-   sidebar->drag_row = NULL;
-   sidebar->row_placeholder = NULL;
-   sidebar->dragging_over = FALSE;
-   sidebar->drag_data_info = DND_UNKNOWN;
- 
-   gtk_container_add (GTK_CONTAINER (sidebar), sidebar->list_box);
- 
--  sidebar->hostname = g_strdup (_("Computer"));
-+  sidebar->hostname = g_strdup (_("File System"));
-   sidebar->hostnamed_cancellable = g_cancellable_new ();
-   g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-                             G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
-                             NULL,
-                             "org.freedesktop.hostname1",
-                             "/org/freedesktop/hostname1",
-                             "org.freedesktop.hostname1",
-                             sidebar->hostnamed_cancellable,
-                             hostname_proxy_new_cb,
-                             sidebar);
-diff -U 10 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
---- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-06-18 23:15:17.257507386 +0200
-@@ -9,21 +9,22 @@
-         <property name="visible">1</property>
-         <property name="orientation">vertical</property>
-         <child>
-           <object class="GtkPaned" id="browse_widgets_hpaned">
-             <property name="visible">1</property>
-             <child>
-               <object class="GtkPlacesSidebar" id="places_sidebar">
-                 <property name="visible">1</property>
-                 <property name="hscrollbar-policy">never</property>
-                 <property name="local-only">1</property>
--                <property name="show-other-locations">1</property>
-+                <property name="show-other-locations">0</property>
-+                <property name="show-trash">0</property>
-                 <style>
-                   <class name="sidebar"/>
-                 </style>
-                 <signal name="open-location" handler="places_sidebar_open_location_cb" swapped="no"/>
-                 <signal name="show-error-message" handler="places_sidebar_show_error_message_cb" swapped="no"/>
-                 <signal name="show-other-locations-with-flags" handler="places_sidebar_show_other_locations_with_flags_cb" swapped="no"/>
-               </object>
-               <packing>
-                 <property name="resize">0</property>
-                 <property name="shrink">0</property>
diff --git a/p__file-chooser__typeahead.patch b/p__file-chooser__typeahead.patch
deleted file mode 100644
index e186e7e146be..000000000000
--- a/p__file-chooser__typeahead.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserdialog.c ./mod/gtk/gtkfilechooserdialog.c
---- ./org/gtk/gtkfilechooserdialog.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserdialog.c	2017-06-18 19:25:59.210159033 +0200
-@@ -487,22 +487,20 @@
-       GtkWidget *image;
-       GtkWidget *header;
- 
-       button = gtk_toggle_button_new ();
-       gtk_widget_set_focus_on_click (button, FALSE);
-       gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
-       image = gtk_image_new_from_icon_name ("edit-find-symbolic", GTK_ICON_SIZE_MENU);
-       gtk_container_add (GTK_CONTAINER (button), image);
-       gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button");
-       gtk_style_context_remove_class (gtk_widget_get_style_context (button), "text-button");
--      gtk_widget_show (image);
--      gtk_widget_show (button);
- 
-       header = gtk_dialog_get_header_bar (GTK_DIALOG (dialog));
-       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
- 
-       g_object_bind_property (button, "active",
-                               dialog->priv->widget, "search-mode",
-                               G_BINDING_BIDIRECTIONAL);
-       g_object_bind_property (dialog->priv->widget, "subtitle",
-                               header, "subtitle",
-                               G_BINDING_SYNC_CREATE);
-diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-06-18 19:27:16.950162886 +0200
-@@ -2471,21 +2471,21 @@
- } ColumnMap;
- 
- /* Sets the sort column IDs for the file list; needs to be done whenever we
-  * change the model on the treeview.
-  */
- static void
- file_list_set_sort_column_ids (GtkFileChooserWidget *impl)
- {
-   GtkFileChooserWidgetPrivate *priv = impl->priv;
- 
--  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
-+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), 0);
- 
-   gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
-   gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
-   gtk_tree_view_column_set_sort_column_id (priv->list_size_column, MODEL_COL_SIZE);
-   gtk_tree_view_column_set_sort_column_id (priv->list_location_column, MODEL_COL_LOCATION_TEXT);
- }
- 
- static gboolean
- file_list_query_tooltip_cb (GtkWidget  *widget,
-                             gint        x,
-@@ -3241,20 +3240,22 @@
- 
-     case OPERATION_MODE_OTHER_LOCATIONS:
-       operation_mode_set_other_locations (impl);
-       break;
- 
-     case OPERATION_MODE_BROWSE:
-       operation_mode_set_browse (impl);
-       break;
- 
-     case OPERATION_MODE_SEARCH:
-+      priv->operation_mode = old_mode;
-+      return;
-       operation_mode_set_search (impl);
-       break;
- 
-     case OPERATION_MODE_RECENT:
-       operation_mode_set_recent (impl);
-       break;
- 
-     default:
-       g_assert_not_reached ();
-       return;
-@@ -7512,21 +7513,21 @@
- 
- static void
- recent_idle_cleanup (gpointer data)
- {
-   RecentLoadData *load_data = data;
-   GtkFileChooserWidget *impl = load_data->impl;
-   GtkFileChooserWidgetPrivate *priv = impl->priv;
- 
-   gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
-                            GTK_TREE_MODEL (priv->recent_model));
--  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
-+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), 0);
- 
-   gtk_tree_view_column_set_sort_column_id (priv->list_name_column, -1);
-   gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1);
-   gtk_tree_view_column_set_sort_column_id (priv->list_size_column, -1);
-   gtk_tree_view_column_set_sort_column_id (priv->list_location_column, -1);
- 
-   update_columns (impl, TRUE, _("Accessed"));
- 
-   set_busy_cursor (impl, FALSE);
- 
-diff -U 10 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
---- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-06-18 19:28:50.943500877 +0200
-@@ -155,21 +155,21 @@
-                             <property name="visible">1</property>
-                             <property name="orientation">vertical</property>
-                             <child>
-                               <object class="GtkScrolledWindow" id="browse_files_swin">
-                                 <property name="visible">1</property>
-                                 <property name="hscrollbar-policy">never</property>
-                                 <child>
-                                   <object class="GtkTreeView" id="browse_files_tree_view">
-                                     <property name="visible">1</property>
-                                     <property name="has-tooltip">1</property>
--                                    <property name="enable-search">0</property>
-+                                    <property name="enable-search">1</property>
-                                     <child internal-child="accessible">
-                                       <object class="AtkObject" id="browse_files_tree_view-atkobject">
-                                         <property name="AtkObject::accessible-name" translatable="yes">Files</property>
-                                       </object>
-                                     </child>
-                                     <signal name="button-press-event" handler="list_button_press_event_cb" swapped="no"/>
-                                     <signal name="drag-data-received" handler="file_list_drag_data_received_cb" swapped="no"/>
-                                     <signal name="drag-drop" handler="file_list_drag_drop_cb" swapped="no"/>
-                                     <signal name="drag-begin" handler="file_list_drag_begin_cb" swapped="no"/>
-                                     <signal name="drag-motion" handler="file_list_drag_motion_cb" swapped="no"/>
diff --git a/p__headerbar__buttons.patch b/p__headerbar__buttons.patch
deleted file mode 100644
index aeed1c7f65bc..000000000000
--- a/p__headerbar__buttons.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
---- ./org/gtk/gtkheaderbar.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkheaderbar.c	2017-06-18 20:02:34.716934483 +0200
-@@ -316,21 +316,21 @@
- 
-   if (!shown_by_shell && gtk_window_get_application (window))
-     menu = gtk_application_get_app_menu (gtk_window_get_application (window));
-   else
-     menu = NULL;
- 
-   is_sovereign_window = (!gtk_window_get_modal (window) &&
-                           gtk_window_get_transient_for (window) == NULL &&
-                           gtk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_NORMAL);
- 
--  tokens = g_strsplit (layout_desc, ":", 2);
-+  tokens = g_strsplit ("menu", ":", 2);
-   if (tokens)
-     {
-       for (i = 0; i < 2; i++)
-         {
-           GtkWidget *box;
-           GtkWidget *separator;
-           int n_children = 0;
- 
-           if (tokens[i] == NULL)
-             break;
-@@ -377,22 +377,21 @@
-                   gtk_style_context_add_class (gtk_widget_get_style_context (button), "titlebutton");
-                   gtk_style_context_add_class (gtk_widget_get_style_context (button), "appmenu");
-                   image = gtk_image_new ();
-                   gtk_container_add (GTK_CONTAINER (button), image);
-                   gtk_widget_set_can_focus (button, FALSE);
-                   gtk_widget_show_all (button);
-                   accessible = gtk_widget_get_accessible (button);
-                   if (GTK_IS_ACCESSIBLE (accessible))
-                     atk_object_set_name (accessible, _("Application menu"));
-                   priv->titlebar_icon = image;
--                  if (!_gtk_header_bar_update_window_icon (bar, window))
--                    gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), "process-stop-symbolic", GTK_ICON_SIZE_MENU);
-+                    gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), "pan-down-symbolic", GTK_ICON_SIZE_MENU);
-                 }
-               else if (strcmp (t[j], "minimize") == 0 &&
-                        is_sovereign_window)
-                 {
-                   button = gtk_button_new ();
-                   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
-                   gtk_style_context_add_class (gtk_widget_get_style_context (button), "titlebutton");
-                   gtk_style_context_add_class (gtk_widget_get_style_context (button), "minimize");
-                   image = gtk_image_new_from_icon_name ("window-minimize-symbolic", GTK_ICON_SIZE_MENU);
-                   g_object_set (image, "use-fallback", TRUE, NULL);
diff --git a/p__headerbar__disable-csd.patch b/p__headerbar__disable-csd.patch
deleted file mode 100644
index 1773e1d3a33c..000000000000
--- a/p__headerbar__disable-csd.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-06-18 21:34:15.757207050 +0200
-@@ -4113,20 +4113,21 @@
-         return FALSE;
-     }
- #endif
- 
-   return TRUE;
- }
- 
- static void
- gtk_window_enable_csd (GtkWindow *window)
- {
-+  return;
-   GtkWindowPrivate *priv = window->priv;
-   GtkWidget *widget = GTK_WIDGET (window);
-   GdkVisual *visual;
- 
-   /* We need a visual with alpha for client shadows */
-   if (priv->use_client_shadow)
-     {
-       visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
-       if (visual != NULL)
-         gtk_widget_set_visual (widget, visual);
-@@ -6060,20 +6061,21 @@
- _gtk_window_request_csd (GtkWindow *window)
- {
-   GtkWindowPrivate *priv = window->priv;
- 
-   priv->csd_requested = TRUE;
- }
- 
- static gboolean
- gtk_window_should_use_csd (GtkWindow *window)
- {
-+  return FALSE;
-   GtkWindowPrivate *priv = window->priv;
-   const gchar *csd_env;
- 
-   if (priv->csd_requested)
-     return TRUE;
- 
-   if (!priv->decorated)
-     return FALSE;
- 
-   if (priv->type == GTK_WINDOW_POPUP)
-@@ -9086,20 +9088,21 @@
-   g_signal_connect (G_OBJECT (menuitem), "activate",
-                     G_CALLBACK (close_window_clicked), window);
-   gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
-   gtk_menu_popup_at_pointer (GTK_MENU (priv->popup_menu), (GdkEvent *) event);
- }
- 
- static void
- gtk_window_do_popup (GtkWindow      *window,
-                      GdkEventButton *event)
- {
-+  return;
-   if (!gdk_window_show_window_menu (_gtk_widget_get_window (GTK_WIDGET (window)),
-                                     (GdkEvent *) event))
-     gtk_window_do_popup_fallback (window, event);
- }
- 
- /*********************************
-  * Functions related to resizing *
-  *********************************/
- 
- static void
diff --git a/p__headerbar__title.patch b/p__headerbar__title.patch
deleted file mode 100644
index e2bfdb8a4021..000000000000
--- a/p__headerbar__title.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
---- ./org/gtk/gtkheaderbar.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtkheaderbar.c	2017-07-03 16:13:24.030051503 +0200
-@@ -560,20 +560,21 @@
-                                previous_widget ? gtk_widget_get_css_node (previous_widget) : NULL);
-   else
-     gtk_css_node_insert_before (gtk_widget_get_css_node (GTK_WIDGET (bar)),
-                                 gtk_widget_get_css_node (widget),
-                                 previous_widget ? gtk_widget_get_css_node (previous_widget) : NULL);
- }
- 
- static void
- construct_label_box (GtkHeaderBar *bar)
- {
-+  return;
-   GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
- 
-   g_assert (priv->label_box == NULL);
- 
-   priv->label_box = create_title_box (priv->title,
-                                       priv->subtitle,
-                                       &priv->title_label,
-                                       &priv->subtitle_label);
-   gtk_header_bar_reorder_css_node (bar, GTK_PACK_START, priv->label_box);
-   gtk_widget_set_parent (priv->label_box, GTK_WIDGET (bar));
-diff -U 10 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-07-03 16:13:06.296717294 +0200
-@@ -2333,20 +2333,22 @@
- 
-   priv = window->priv;
-   widget = GTK_WIDGET (window);
- 
-   new_title = g_strdup (title);
-   g_free (priv->title);
-   priv->title = new_title;
- 
-   if (new_title == NULL)
-     new_title = "";
-+  if (GTK_IS_HEADER_BAR (priv->title_box) && gtk_header_bar_get_subtitle(GTK_HEADER_BAR (priv->title_box)))
-+    new_title = g_strconcat(new_title, " — ", gtk_header_bar_get_subtitle(GTK_HEADER_BAR (priv->title_box)), NULL);
- 
-   if (_gtk_widget_get_realized (widget))
-     gdk_window_set_title (_gtk_widget_get_window (widget), new_title);
- 
-   if (update_titlebar && GTK_IS_HEADER_BAR (priv->title_box))
-     gtk_header_bar_set_title (GTK_HEADER_BAR (priv->title_box), new_title);
- 
-   g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_TITLE]);
- }
- 
diff --git a/p__other__mnemonics-delay.patch b/p__other__mnemonics-delay.patch
deleted file mode 100644
index e2dfe600e657..000000000000
--- a/p__other__mnemonics-delay.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-06-18 20:11:44.443628389 +0200
-@@ -144,21 +144,21 @@
-  * without invisible borders), .ssd (used by mutter when rendering server-side
-  * decorations). GtkWindow also represents window states with the following
-  * style classes on the main node: .tiled, .maximized, .fullscreen. Specialized
-  * types of window often add their own discriminating style classes, such as
-  * .popup or .tooltip.
-  *
-  * GtkWindow adds the .titlebar and .default-decoration style classes to the
-  * widget that is added as a titlebar child.
-  */
- 
--#define MNEMONICS_DELAY 300 /* ms */
-+#define MNEMONICS_DELAY 0 /* ms */
- #define NO_CONTENT_CHILD_NAT 200
- /* In case the content (excluding header bar and shadows) of the window
-  * would be empty, either because there is no visible child widget or only an
-  * empty container widget, we use NO_CONTENT_CHILD_NAT as natural width/height
-  * instead.
-  */
- 
- typedef struct _GtkWindowPopover GtkWindowPopover;
- 
- struct _GtkWindowPopover
diff --git a/p__other__scrollbar.patch b/p__other__scrollbar.patch
deleted file mode 100644
index f33f152feee1..000000000000
--- a/p__other__scrollbar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkscrolledwindow.c ./mod/gtk/gtkscrolledwindow.c
---- ./org/gtk/gtkscrolledwindow.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkscrolledwindow.c	2017-06-18 20:13:43.643634295 +0200
-@@ -4393,21 +4393,20 @@
- }
- 
- static void
- gtk_scrolled_window_update_use_indicators (GtkScrolledWindow *scrolled_window)
- {
-   GtkScrolledWindowPrivate *priv = scrolled_window->priv;
-   gboolean use_indicators;
- 
-   use_indicators = priv->overlay_scrolling;
- 
--  if (g_strcmp0 (g_getenv ("GTK_OVERLAY_SCROLLING"), "0") == 0)
-     use_indicators = FALSE;
- 
-   if (priv->use_indicators != use_indicators)
-     {
-       priv->use_indicators = use_indicators;
- 
-       if (gtk_widget_get_realized (GTK_WIDGET (scrolled_window)))
-         gtk_scrolled_window_sync_use_indicators (scrolled_window);
- 
-       gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
diff --git a/p__popovers__menu-button.patch b/p__popovers__menu-button.patch
deleted file mode 100644
index 42d98af7bd13..000000000000
--- a/p__popovers__menu-button.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkmenubutton.c ./mod/gtk/gtkmenubutton.c
---- ./org/gtk/gtkmenubutton.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkmenubutton.c	2017-06-18 20:15:20.686972436 +0200
-@@ -816,21 +816,21 @@
- 
-   priv = menu_button->priv;
- 
-   g_object_freeze_notify (G_OBJECT (menu_button));
- 
-   if (menu_model)
-     g_object_ref (menu_model);
- 
-   if (menu_model)
-     {
--      if (priv->use_popover)
-+      if (FALSE && priv->use_popover)
-         {
-           GtkWidget *popover;
- 
-           popover = gtk_popover_new_from_model (GTK_WIDGET (menu_button), menu_model);
-           gtk_menu_button_set_popover (menu_button, popover);
-         }
-       else
-         {
-           GtkWidget *menu;
- 
diff --git a/p__popovers__color-chooser.patch b/popovers__color-chooser.patch
index 00da37d1caae..65c2089a90d3 100644
--- a/p__popovers__color-chooser.patch
+++ b/popovers__color-chooser.patch
@@ -1,12 +1,7 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkcolorswatch.c ./mod/gtk/gtkcolorswatch.c
---- ./org/gtk/gtkcolorswatch.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtkcolorswatch.c	2017-07-09 23:49:43.733947294 +0200
-@@ -340,20 +340,30 @@
- 
- static void
- emit_customize (GtkColorSwatch *swatch)
- {
-   g_signal_emit (swatch, signals[CUSTOMIZE], 0);
+diff -U 5 -r -Z -B ./org/gtk/gtkcolorswatch.c ./mod/gtk/gtkcolorswatch.c
+--- ./org/gtk/gtkcolorswatch.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkcolorswatch.c	2017-07-30 13:40:06.546839046 +0200
+@@ -345,10 +345,20 @@
  }
  
  static void
@@ -27,8 +22,3 @@ diff -U 10 -r -Z -B ./org/gtk/gtkcolorswatch.c ./mod/gtk/gtkcolorswatch.c
        GtkWidget *box;
        GtkWidget *item;
  
-       swatch->priv->popover = gtk_popover_new (GTK_WIDGET (swatch));
-       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add (GTK_CONTAINER (swatch->priv->popover), box);
-       g_object_set (box, "margin", 10, NULL);
-       item = g_object_new (GTK_TYPE_MODEL_BUTTON,
diff --git a/p__popovers__file-chooser.patch b/popovers__file-chooser-list.patch
index 9281d5b79a64..eb574116c706 100644
--- a/p__popovers__file-chooser.patch
+++ b/popovers__file-chooser-list.patch
@@ -1,39 +1,24 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-07-10 20:28:44.210187624 +0200
-@@ -72,20 +72,21 @@
- #include "gtkshow.h"
- #include "gtkmain.h"
- #include "gtkscrollable.h"
- #include "gtkpopover.h"
- #include "gtkrevealer.h"
+diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- ./org/gtk/gtkfilechooserwidget.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-07-30 15:26:07.513375549 +0200
+@@ -77,10 +77,11 @@
  #include "gtkspinner.h"
  #include "gtkseparator.h"
  #include "gtkmodelbutton.h"
  #include "gtkgesturelongpress.h"
  #include "gtkdebug.h"
 +#include "deprecated/gtkimagemenuitem.h"
-
+ 
  #include <cairo-gobject.h>
-
+ 
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
- #endif
- #ifdef G_OS_WIN32
- #include <io.h>
- #endif
-
-@@ -2217,20 +2218,24 @@
-                                    impl);
-   gtk_widget_insert_action_group (GTK_WIDGET (impl->priv->browse_files_tree_view), "item", actions);
-   g_object_unref (actions);
- }
-
+@@ -2222,10 +2223,14 @@
  static GtkWidget *
  append_separator (GtkWidget *box)
  {
    GtkWidget *separator;
-
+ 
 +  separator = gtk_separator_menu_item_new();
 +  gtk_widget_set_visible(GTK_WIDGET(separator), TRUE);
 +  gtk_menu_shell_append(GTK_MENU_SHELL(box), separator);
@@ -43,22 +28,12 @@ diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwid
                              "visible", TRUE,
                              "margin-start", 12,
                              "margin-end", 12,
-                             "margin-top", 6,
-                             "margin-bottom", 6,
-                             NULL);
-   gtk_container_add (GTK_CONTAINER (box), separator);
-
-@@ -2238,20 +2243,28 @@
- }
-
- /* Constructs the popup menu for the file list if needed */
- static GtkWidget *
- add_button (GtkWidget   *box,
+@@ -2243,10 +2248,18 @@
              const gchar *label,
              const gchar *action)
  {
    GtkWidget *item;
-
+ 
 +  if (g_str_match_string("toggle", action, TRUE))
 +    item = gtk_check_menu_item_new_with_mnemonic(label);
 +  else
@@ -72,17 +47,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwid
                         "action-name", action,
                         "text", label,
                         NULL);
-   gtk_container_add (GTK_CONTAINER (box), item);
-
-   return item;
- }
-
-@@ -2262,35 +2275,45 @@
-   GtkWidget *box;
-
-   if (priv->browse_files_popover)
-     return;
-
+@@ -2267,10 +2280,13 @@
    priv->browse_files_popover = gtk_popover_new (priv->browse_files_tree_view);
    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 10, NULL);
@@ -91,17 +56,13 @@ diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwid
 +  priv->browse_files_popover = gtk_menu_new();
 +  gtk_menu_attach_to_widget(GTK_MENU(priv->browse_files_popover), GTK_WIDGET(priv->browse_files_tree_view), NULL);
 +  box = priv->browse_files_popover;
-
+ 
    priv->visit_file_item = add_button (box, _("_Visit File"), "item.visit");
    priv->open_folder_item = add_button (box, _("_Open With File Manager"), "item.open");
    priv->copy_file_location_item = add_button (box, _("_Copy Location"), "item.copy-location");
    priv->add_shortcut_item = add_button (box, _("_Add to Bookmarks"), "item.add-shortcut");
-   priv->rename_file_item = add_button (box, _("_Rename"), "item.rename");
-   priv->delete_file_item = add_button (box, _("_Delete"), "item.delete");
-   priv->trash_file_item = add_button (box, _("_Move to Trash"), "item.trash");
-
-   append_separator (box);
-
+@@ -2282,10 +2298,16 @@
+ 
    priv->hidden_files_item = add_button (box, _("Show _Hidden Files"), "item.toggle-show-hidden");
    priv->size_column_item = add_button (box, _("Show _Size Column"), "item.toggle-show-size");
    priv->show_time_item = add_button (box, _("Show _Time"), "item.toggle-show-time");
@@ -109,40 +70,24 @@ diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwid
 +  g_object_set(priv->visit_file_item, "image", gtk_image_new_from_icon_name("gtk-jump-to",GTK_ICON_SIZE_MENU), NULL);
 +  g_object_set(priv->open_folder_item, "image", gtk_image_new_from_icon_name("gtk-open",GTK_ICON_SIZE_MENU), NULL);
 +  g_object_set(priv->copy_file_location_item, "image", gtk_image_new_from_icon_name("gtk-copy",GTK_ICON_SIZE_MENU), NULL);
-+  g_object_set(priv->add_shortcut_item, "image", gtk_image_new_from_icon_name("bookmark-new",GTK_ICON_SIZE_MENU), NULL);
-+  g_object_set(priv->rename_file_item, "image", gtk_image_new_from_icon_name("gtk-edit",GTK_ICON_SIZE_MENU), NULL);
++  g_object_set(priv->add_shortcut_item, "image", gtk_image_new_from_icon_name("gtk-add",GTK_ICON_SIZE_MENU), NULL);
 +  g_object_set(priv->delete_file_item, "image", gtk_image_new_from_icon_name("gtk-delete",GTK_ICON_SIZE_MENU), NULL);
 +  g_object_set(priv->trash_file_item, "image", gtk_image_new_from_icon_name("user-trash-full",GTK_ICON_SIZE_MENU), NULL);
  }
-
+ 
  /* Updates the popover for the file list, creating it if necessary */
  static void
  file_list_update_popover (GtkFileChooserWidget *impl)
- {
-   GtkFileChooserWidgetPrivate *priv = impl->priv;
-   GActionGroup *actions;
-   GAction *action;
-
-@@ -2333,20 +2356,22 @@
- {
-   GtkFileChooserWidgetPrivate *priv = impl->priv;
-   GdkRectangle rect;
-   GtkTreeSelection *selection;
-   GtkTreeModel *model;
+@@ -2338,10 +2360,12 @@
    GList *list;
    GtkTreePath *path;
-
-
+ 
+ 
    file_list_update_popover (impl);
 +  gtk_menu_popup_at_pointer(GTK_MENU(priv->browse_files_popover), NULL);
 +  return;
-
+ 
    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view));
    list = gtk_tree_selection_get_selected_rows (selection, &model);
    if (list)
      {
-       path = list->data;
-       gtk_tree_view_get_cell_area (GTK_TREE_VIEW (priv->browse_files_tree_view), path, NULL, &rect);
-       gtk_tree_view_convert_bin_window_to_widget_coords (GTK_TREE_VIEW (priv->browse_files_tree_view),
-                                                      rect.x, rect.y, &rect.x, &rect.y);
-
diff --git a/popovers__menu-button.patch b/popovers__menu-button.patch
new file mode 100644
index 000000000000..abfbc6045e4c
--- /dev/null
+++ b/popovers__menu-button.patch
@@ -0,0 +1,16 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkmenubutton.c ./mod/gtk/gtkmenubutton.c
+--- ./org/gtk/gtkmenubutton.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkmenubutton.c	2017-07-30 13:35:02.580157319 +0200
+@@ -821,11 +821,11 @@
+   if (menu_model)
+     g_object_ref (menu_model);
+ 
+   if (menu_model)
+     {
+-      if (priv->use_popover)
++      if (FALSE && priv->use_popover)
+         {
+           GtkWidget *popover;
+ 
+           popover = gtk_popover_new_from_model (GTK_WIDGET (menu_button), menu_model);
+           gtk_menu_button_set_popover (menu_button, popover);
diff --git a/p__popovers__places-sidebar.patch b/popovers__places-sidebar.patch
index f3763265733f..7a956e1f46fa 100644
--- a/p__popovers__places-sidebar.patch
+++ b/popovers__places-sidebar.patch
@@ -1,38 +1,23 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
---- ./org/gtk/gtkplacessidebar.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtkplacessidebar.c	2017-07-10 21:59:25.193790547 +0200
-@@ -52,20 +52,21 @@
- #include "gtkbutton.h"
- #include "gtklistbox.h"
- #include "gtkselection.h"
- #include "gtkdragdest.h"
- #include "gtkdnd.h"
+diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
+--- ./org/gtk/gtkplacessidebar.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkplacessidebar.c	2017-07-30 18:32:50.010014344 +0200
+@@ -57,10 +57,11 @@
  #include "gtkseparator.h"
  #include "gtkentry.h"
  #include "gtkgesturelongpress.h"
  #include "gtkbox.h"
  #include "gtkmodelbutton.h"
 +#include "deprecated/gtkimagemenuitem.h"
-
+ 
  /**
   * SECTION:gtkplacessidebar
   * @Short_description: Sidebar that displays frequently-used places in the file system
   * @Title: GtkPlacesSidebar
-  * @See_also: #GtkFileChooser
-  *
-  * #GtkPlacesSidebar is a widget that displays a list of frequently-used places in the
-  * file system:  the user’s home directory, the user’s bookmarks, and volumes and drives.
-  * This widget is used as a sidebar in #GtkFileChooser and may be used by file managers
-@@ -2137,46 +2138,46 @@
-
-   gtk_widget_set_visible (data->separator_item, show_mount || show_unmount || show_eject);
-   gtk_widget_set_visible (data->mount_item, show_mount);
-   gtk_widget_set_visible (data->unmount_item, show_unmount);
-   gtk_widget_set_visible (data->eject_item, show_eject);
+@@ -2142,36 +2143,36 @@
    gtk_widget_set_visible (data->rescan_item, show_rescan);
    gtk_widget_set_visible (data->start_item, show_start);
    gtk_widget_set_visible (data->stop_item, show_stop);
-
+ 
    /* Adjust start/stop items to reflect the type of the drive */
 -  g_object_set (data->start_item, "text", _("_Start"), NULL);
 -  g_object_set (data->stop_item, "text", _("_Stop"), NULL);
@@ -49,21 +34,21 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
 +          g_object_set (data->start_item, "label", _("_Power On"), "use_underline", TRUE, NULL);
 +          g_object_set (data->stop_item, "label", _("_Safely Remove Drive"), "use_underline", TRUE, NULL);
            break;
-
+ 
          case G_DRIVE_START_STOP_TYPE_NETWORK:
 -          g_object_set (data->start_item, "text", _("_Connect Drive"), NULL);
 -          g_object_set (data->stop_item, "text", _("_Disconnect Drive"), NULL);
 +          g_object_set (data->start_item, "label", _("_Connect Drive"), "use_underline", TRUE, NULL);
 +          g_object_set (data->stop_item, "label", _("_Disconnect Drive"), "use_underline", TRUE, NULL);
            break;
-
+ 
          case G_DRIVE_START_STOP_TYPE_MULTIDISK:
 -          g_object_set (data->start_item, "text", _("_Start Multi-disk Device"), NULL);
 -          g_object_set (data->stop_item, "text", _("_Stop Multi-disk Device"), NULL);
 +          g_object_set (data->start_item, "label", _("_Start Multi-disk Device"), "use_underline", TRUE, NULL);
 +          g_object_set (data->stop_item, "label", _("_Stop Multi-disk Device"), "use_underline", TRUE, NULL);
            break;
-
+ 
          case G_DRIVE_START_STOP_TYPE_PASSWORD:
            /* stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used */
 -          g_object_set (data->start_item, "text", _("_Unlock Device"), NULL);
@@ -71,26 +56,16 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
 +          g_object_set (data->start_item, "label", _("_Unlock Device"), "use_underline", TRUE, NULL);
 +          g_object_set (data->stop_item, "label", _("_Lock Device"), "use_underline", TRUE, NULL);
            break;
-
+ 
          default:
          case G_DRIVE_START_STOP_TYPE_UNKNOWN:
            /* uses defaults set above */
-           break;
-         }
-     }
-
-   if (drive)
-@@ -3330,55 +3331,81 @@
-                                    sidebar);
-   gtk_widget_insert_action_group (GTK_WIDGET (sidebar), "row", actions);
-   g_object_unref (actions);
- }
-
+@@ -3335,10 +3336,17 @@
  static GtkWidget *
  append_separator (GtkWidget *box)
  {
    GtkWidget *separator;
-
+ 
 +  if (GTK_IS_MENU(box))
 +  {
 +    separator = gtk_separator_menu_item_new();
@@ -103,19 +78,12 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                              "visible", TRUE,
                              "margin-top", 6,
                              "margin-bottom", 6,
-                             NULL);
-   gtk_container_add (GTK_CONTAINER (box), separator);
-
-   return separator;
- }
-
- static GtkWidget *
- add_button (GtkWidget   *box,
+@@ -3353,10 +3361,18 @@
              const gchar *label,
              const gchar *action)
  {
    GtkWidget *item;
-
+ 
 +  if (GTK_IS_MENU(box))
 +  {
 +    item = gtk_image_menu_item_new_with_mnemonic(label);
@@ -129,18 +97,12 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                         "action-name", action,
                         "text", label,
                         NULL);
-   gtk_container_add (GTK_CONTAINER (box), item);
-
-   return item;
- }
-
- static GtkWidget *
- add_open_button (GtkWidget          *box,
+@@ -3370,10 +3386,21 @@
                   const gchar        *label,
                   GtkPlacesOpenFlags  flags)
  {
    GtkWidget *item;
-
+ 
 +  if (GTK_IS_MENU(box))
 +  {
 +    item = gtk_image_menu_item_new_with_mnemonic(label);
@@ -157,17 +119,7 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                         "action-name", flags == GTK_PLACES_OPEN_NORMAL ? "row.open" : "row.open-other",
                         "action-target", g_variant_new_int32 (flags),
                         "text", label,
-                        NULL);
-   gtk_container_add (GTK_CONTAINER (box), item);
-
-   return item;
- }
-@@ -3401,20 +3428,27 @@
-
-   sidebar->popover = gtk_popover_new (GTK_WIDGET (sidebar));
-   /* Clean sidebar pointer when its destroyed, most of the times due to its
-    * relative_to associated row being destroyed */
-   g_signal_connect (sidebar->popover, "destroy", G_CALLBACK (on_row_popover_destroy), sidebar);
+@@ -3406,10 +3433,17 @@
    setup_popover_shadowing (sidebar->popover);
    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 10, NULL);
@@ -180,22 +132,12 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
 +    gtk_menu_attach_to_widget(GTK_MENU(sidebar->popover), GTK_WIDGET(sidebar), NULL);
 +    box = sidebar->popover;
 +  }
-
+ 
    add_open_button (box, _("_Open"), GTK_PLACES_OPEN_NORMAL);
-
+ 
    if (sidebar->open_flags & GTK_PLACES_OPEN_NEW_TAB)
      add_open_button (box, _("Open in New _Tab"), GTK_PLACES_OPEN_NEW_TAB);
-
-   if (sidebar->open_flags & GTK_PLACES_OPEN_NEW_WINDOW)
-     add_open_button (box, _("Open in New _Window"), GTK_PLACES_OPEN_NEW_WINDOW);
-
-   append_separator (box);
-@@ -3424,20 +3458,31 @@
-   data.rename_item = add_button (box, _("Rename…"), "row.rename");
-
-   data.separator_item = append_separator (box);
-
-   data.mount_item = add_button (box, _("_Mount"), "row.mount");
+@@ -3429,10 +3463,19 @@
    data.unmount_item = add_button (box, _("_Unmount"), "row.unmount");
    data.eject_item = add_button (box, _("_Eject"), "row.eject");
    data.rescan_item = add_button (box, _("_Detect Media"), "row.rescan");
@@ -207,31 +149,19 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
 +      g_list_first(gtk_container_get_children(GTK_CONTAINER(box)))->data,
 +      "image", gtk_image_new_from_icon_name("gtk-open",GTK_ICON_SIZE_MENU), NULL
 +    );
-+    g_object_set(data.rename_item, "image", gtk_image_new_from_icon_name("gtk-edit",GTK_ICON_SIZE_MENU), NULL);
 +    g_object_set(data.remove_item, "image", gtk_image_new_from_icon_name("gtk-remove",GTK_ICON_SIZE_MENU), NULL);
-+    g_object_set(data.add_shortcut_item, "image", gtk_image_new_from_icon_name("bookmark-new",GTK_ICON_SIZE_MENU), NULL);
-+    g_object_set(data.eject_item, "image", gtk_image_new_from_icon_name("media-eject",GTK_ICON_SIZE_MENU), NULL);
++    g_object_set(data.add_shortcut_item, "image", gtk_image_new_from_icon_name("gtk-add",GTK_ICON_SIZE_MENU), NULL);
 +  }
-
+ 
    /* Update everything! */
    check_popover_sensitivity (row, &data);
-
+ 
    if (sidebar->populate_all)
-     {
-       gchar *uri;
-       GVolume *volume;
-       GFile *file;
-
-@@ -3467,20 +3512,27 @@
- show_row_popover (GtkSidebarRow *row)
- {
-   GtkPlacesSidebar *sidebar;
-
-   g_object_get (row, "sidebar", &sidebar, NULL);
-
+@@ -3472,10 +3515,17 @@
+ 
    if (sidebar->popover)
      gtk_widget_destroy (sidebar->popover);
-
+ 
    create_row_popover (sidebar, row);
 +  if (GTK_IS_MENU(sidebar->popover))
 +  {
@@ -240,13 +170,8 @@ diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
 +    g_object_unref (sidebar);
 +    return;
 +  }
-
+ 
    gtk_popover_set_relative_to (GTK_POPOVER (sidebar->popover), GTK_WIDGET (row));
-
+ 
    sidebar->context_row = row;
    gtk_popover_popup (GTK_POPOVER (sidebar->popover));
-
-   g_object_unref (sidebar);
- }
-
- static void
diff --git a/p__print-dialog__appearance.patch b/print-dialog__appearance.patch
index b5fa5518536e..e613d187733d 100644
--- a/p__print-dialog__appearance.patch
+++ b/print-dialog__appearance.patch
@@ -1,12 +1,7 @@
-diff -U 10 -r -Z -B ./org/gtk/ui/gtkprintunixdialog.ui ./mod/gtk/ui/gtkprintunixdialog.ui
---- ./org/gtk/ui/gtkprintunixdialog.ui	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/ui/gtkprintunixdialog.ui	2017-06-18 20:06:30.823612849 +0200
-@@ -51,31 +51,33 @@
-     <property name="can-focus">False</property>
-     <property name="type-hint">dialog</property>
-     <signal name="notify::page-setup" handler="redraw_page_layout_preview" swapped="no"/>
-     <signal name="response" handler="error_dialogs" swapped="no"/>
-     <child internal-child="vbox">
+diff -U 5 -r -Z -B ./org/gtk/ui/gtkprintunixdialog.ui ./mod/gtk/ui/gtkprintunixdialog.ui
+--- ./org/gtk/ui/gtkprintunixdialog.ui	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/ui/gtkprintunixdialog.ui	2017-07-30 13:31:55.500148048 +0200
+@@ -56,21 +56,23 @@
        <object class="GtkBox" id="dialog-vbox1">
          <property name="orientation">vertical</property>
          <property name="spacing">2</property>
@@ -32,8 +27,3 @@ diff -U 10 -r -Z -B ./org/gtk/ui/gtkprintunixdialog.ui ./mod/gtk/ui/gtkprintunix
                      <property name="visible">1</property>
                      <property name="border-width">12</property>
                      <property name="orientation">vertical</property>
-                     <property name="spacing">18</property>
-                     <child>
-                       <object class="GtkBox" id="box2">
-                         <property name="visible">1</property>
-                         <property name="orientation">vertical</property>
diff --git a/p__print-dialog__previewer.patch b/print-dialog__default-previewer.patch
index fc9bd39e1fa3..0a5c65a94877 100644
--- a/p__print-dialog__previewer.patch
+++ b/print-dialog__default-previewer.patch
@@ -1,12 +1,7 @@
-diff -U 10 -r -Z -B ./org/gtk/gtksettings.c ./mod/gtk/gtksettings.c
---- ./org/gtk/gtksettings.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtksettings.c	2017-06-18 20:04:49.313607819 +0200
-@@ -54,21 +54,21 @@
- 
- #ifdef GDK_WINDOWING_WIN32
- #include "win32/gdkwin32.h"
- #endif
- 
+diff -U 5 -r -Z -B ./org/gtk/gtksettings.c ./mod/gtk/gtksettings.c
+--- ./org/gtk/gtksettings.c	2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtksettings.c	2017-07-30 13:33:42.580153355 +0200
+@@ -59,11 +59,11 @@
  #include "deprecated/gtkrc.h"
  
  #ifdef GDK_WINDOWING_QUARTZ
@@ -19,8 +14,3 @@ diff -U 10 -r -Z -B ./org/gtk/gtksettings.c ./mod/gtk/gtksettings.c
  /**
   * SECTION:gtksettings
   * @Short_description: Sharing settings between applications
-  * @Title: Settings
-  *
-  * GtkSettings provide a mechanism to share global settings between
-  * applications.
-  *
diff --git a/settings.ini b/settings.ini
deleted file mode 100644
index 921d1ddeec01..000000000000
--- a/settings.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
diff --git a/smaller-adwaita.css b/smaller-adwaita.css
index 01f02a31e1c5..ae34e4a6797a 100644
--- a/smaller-adwaita.css
+++ b/smaller-adwaita.css
@@ -51,7 +51,6 @@ tooltip * {
 .titlebar:not(headerbar),
 headerbar {
 	background-image: none;
-	border-radius: 0;
 }
 placessidebar row {
 	min-height: 29px;
@@ -60,4 +59,4 @@ placessidebar row button.sidebar-button {
 	min-height: 20px;
 	min-width: 20px;
 	padding: 0;
-}
\ No newline at end of file
+}
diff --git a/unused__headerbar__appmenu-menubar.patch b/unused__headerbar__appmenu-menubar.patch
deleted file mode 100644
index 494bfce7eef3..000000000000
--- a/unused__headerbar__appmenu-menubar.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkapplicationwindow.c ./mod/gtk/gtkapplicationwindow.c
---- ./org/gtk/gtkapplicationwindow.c	2017-06-20 21:16:19.000000000 +0200
-+++ ./mod/gtk/gtkapplicationwindow.c	2017-07-01 23:27:55.954269814 +0200
-@@ -303,21 +303,21 @@
- gtk_application_window_update_shell_shows_app_menu (GtkApplicationWindow *window,
-                                                     GtkSettings          *settings)
- {
-   gboolean shown_by_shell;
-   gboolean shown_by_titlebar;
- 
-   g_object_get (settings, "gtk-shell-shows-app-menu", &shown_by_shell, NULL);
- 
-   shown_by_titlebar = _gtk_window_titlebar_shows_app_menu (GTK_WINDOW (window));
- 
--  if (shown_by_shell || shown_by_titlebar)
-+  if (FALSE && (shown_by_shell || shown_by_titlebar))
-     {
-       /* the shell shows it, so don't show it locally */
-       if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) != 0)
-         g_menu_remove (window->priv->app_menu_section, 0);
-     }
-   else
-     {
-       /* the shell does not show it, so make sure we show it */
-       if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) == 0)
-         {
-@@ -338,20 +338,21 @@
-                   name = g_strdup (app_name);
-                 }
-               else
-                 {
-                   /* get the name from .desktop file */
-                   name = gtk_application_window_get_app_desktop_name ();
-                   if (name == NULL)
-                     name = g_strdup (_("Application"));
-                 }
- 
-+              name = g_strconcat("_", _("Application menu"), NULL);
-               g_menu_append_submenu (window->priv->app_menu_section, name, app_menu);
-               g_free (name);
-             }
-         }
-     }
- }
- 
- static void
- gtk_application_window_update_shell_shows_menubar (GtkApplicationWindow *window,
-                                                    GtkSettings          *settings)