a11y: Apply widget scaling factor

Use the "real" widget bounds for the AtkComponent rectangle. Fixes: #1505
2020-10-17 17:18:09 +01:00
79 changed files with 13474 additions and 20907 deletions
@@ -1,117 +1,3 @@
-Overview of Changes in GTK+ 3.24.25
-===================================
-
-* Settings:
- - Make cursor aspect ratio setting work
-
-* Broadway:
- - Fix touchscreen event handling
- - Support Android / Chrome on-screen keyboard
-
-* Windows:
- - Fix issues with Intel graphics drivers
- - Avoid UAC for gtk-update-icon-cache
-
-* Wayland:
- - Avoid crashes with tablet input
- - Add api to support clients with subsurfaces better
-
-* Inspector:
- - Make the inspector available in non-debug builds
-
-* Theme:
- - Make scrollbars larger
- - Disable shadows on maximized, fullscreen and tiled windows
-
-* Printing:
- - Support Avahi-discovered printers better
-
-* Input:
- - Show preedit for compose sequences
- - Support long compose sequences
- - Support compose sequences producing multiple characters
-
-* Translation updates
- Belarusian
- British English
- Catalan
- Friulian
- Galician
- Japanese
- Persian
- Serbian
-
-
-Overview of Changes in GTK+ 3.24.24
-===================================
-
-* GtkColorChooser:
- - Update the default color palette
-
-* GtkFontChooser:
- - Fix family-only mode to return regular style
-
-* GtkTreeView:
- - Don't set focus-on-click for header buttons
-
-* Accessibility:
- - Implement scrollSubstringTo
- - Add a11y support to GtkPlug/GtkSocket
-
-* Printing:
- - Allow the lpr backend to print pdf and ps files
-
-* Theme:
- - Update gesture graphics
- - Update HighContrast css
-
-* Wayland:
- - Support the primary-selection-unstable-v1 protocol
-
-* X11:
- - Fix a crash with parent-relative backgrounds
-
-* Broadway:
- - Set modifier state of scroll events
-
-* Build:
- - Fix pc file generation on NixOS
-
-* OS X:
- - Restore command-key bindings
-
-* Windows:
- - Fix meson build with epoxy subproject
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- British English
- Catalan
- Croatian
- Czech
- French
- Galician
- German
- Greek
- Hebrew
- Hungarian
- Indonesian
- Italian
- Kazakh
- Latvian
- Lithuanian
- Persian
- Polish
- Portuguese
- Slovak
- Slovenian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
 Overview of Changes in GTK+ 3.24.23
 ===================================

@@ -175,27 +175,6 @@ instance the makefile.msc files might not produce identically named
 DLLs and import libraries as the "autoconfiscated" makefiles and
 libtool do. If this bothers you, you will have to fix the makefiles.

-If desiring to build binaries for ARM64 (aarch64), one needs to use the
-Visual Studio 2017 or 2019 solution files, or use Meson with a
-cross-compilation file, with a Windows 10 SDK that supports ARM64
-builds.  At this point, building the introspection files is not supported
-for ARM64 builds, and you will need a Python interpreter and
-glib-compile-resources binaries that run on the build machine.  For Visual Studio
-2017 ARM64 builds, do also check the Directory.Build.props file in $(srcroot)/win32/vs15
-indicates a Windows 10 SDK version that supports ARM64 builds exists on the build machine.
-
-For building ARM64 binaries with the Visual Studio projects, prior to the build,
-you may need to update gtk3-gen-srcs.props to pass in the variables GLIB_MKENUMS,
-GLIB_GENMARSHAL, GDBUS_CODEGEN and/or GLIB_COMPILE_RESOURCES in the nmake command line
-indicated by <GenerateRequiredSourcesBase>  so that they point to the glib-mkenums,
-glib-genmarshal, gdbus-codegen and glib-compile-resources that will run on the build
-machine.  You may also need to update gtk3-version-paths.props to update PythonDir to
-the installation of the Python interpreter that will run on the build machine.  To carry
-out the actual build using the solution files, use the "Configuration Manager" to add the
-ARM64 build configs by copying the settings from the x64 configs, and then build the solution.
-The build instructions for such builds otherwise follow the standard Win32 (x86) and
-x64 builds, but you need to ensure that you have ARM64 builds of the various dependencies.
-
 3) Using Meson (for Visual Studio and MinGW builds)
 ---

@@ -44,9 +44,6 @@
 /* Define to 1 if you have the `flockfile' function. */
 #mesondefine HAVE_FLOCKFILE

-/* Define to 1 if you have the `fmin' function. */
-#mesondefine HAVE_FMIN
-
 /* Define to 1 if you have the <ftw.h> header file. */
 #mesondefine HAVE_FTW_H

@@ -52,11 +52,6 @@
 /* Define to 1 if you have the `flockfile' function. */
 #undef HAVE_FLOCKFILE

-/* Define to 1 if you have the `fmin' function. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-# define HAVE_FMIN 1
-#endif
-
 /* Define to 1 if you have the <ftw.h> header file. */
 /* #undef HAVE_FTW_H */

@@ -10,8 +10,8 @@

 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [25])
-m4_define([gtk_interface_age], [21])
+m4_define([gtk_micro_version], [23])
+m4_define([gtk_interface_age], [19])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -843,7 +843,7 @@ AC_TYPE_UID_T
 # Check for round(), rint(), isnan() and isinf()
 # Check for log2(), exp2(), nearbyint() and trunc()
 AC_CHECK_LIB(m,round,,)
-AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc fmin)
+AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc)
 AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])

 AC_MSG_CHECKING(whether to build dynamic modules)
@@ -1279,8 +1279,6 @@ GdkWaylandWindowExported
 gdk_wayland_window_export_handle
 gdk_wayland_window_unexport_handle
 gdk_wayland_window_set_transient_for_exported
-gdk_wayland_window_add_frame_callback_surface
-gdk_wayland_window_remove_frame_callback_surface

 <SUBSECTION Standard>
 GDK_TYPE_WAYLAND_DEVICE
@@ -134,9 +134,9 @@ additional environment variables.
  <title><envar>GTK_DEBUG</envar></title>

  <para>
-  This variable can be set to a list of debug options, which cause GTK to
-  print out different types of debugging information. Some of these options
-  are only available when GTK has been configured with <option>--enable-debug=yes</option>.
+  Unless GTK+ has been configured with <option>--enable-debug=no</option>,
+  this variable can be set to a list of debug options, which cause GTK+
+  to print out different types of debugging information.
  <variablelist>
    <varlistentry>
      <term>actions</term>
@@ -1,27 +1,3 @@
-/* check if we are on Android and using Chrome */
-var isAndroidChrome = false;
-{
-    var ua = navigator.userAgent.toLowerCase();
-    if (ua.indexOf("android") > -1 && ua.indexOf("chrom") > -1) {
-	isAndroidChrome = true;
-    }
-}
-/* check for the passive option for Event listener */
-let passiveSupported = false;
-try {
-  const options = {
-    get passive() { // This function will be called when the browser
-                    //   attempts to access the passive property.
-      passiveSupported = true;
-      return false;
-    }
-  };
-
-  window.addEventListener("test", null, options);
-  window.removeEventListener("test", null, options);
-} catch(err) {
-  passiveSupported = false;
-}
 /* Helper functions for debugging */
 var logDiv = null;
 function log(str) {
@@ -34,25 +10,6 @@ function log(str) {
    logDiv.appendChild(document.createTextNode(str));
    logDiv.appendChild(document.createElement('br'));
 }
-/* Helper functions for touch identifier to make it unique on Android */
-var globalTouchIdentifier = Math.round(Date.now() / 1000);
-function touchIdentifierStart(tId)
-{
-    if (isAndroidChrome) {
-	if (tId == 0) {
-	    return ++globalTouchIdentifier;
-	}
-	return globalTouchIdentifier + tId;
-    }
-    return tId;
-}
-function touchIdentifier(tId)
-{
-    if (isAndroidChrome) {
-	return globalTouchIdentifier + tId;
-    }
-    return tId;
-}

 function getStackTrace()
 {
@@ -134,7 +91,6 @@ grab.window = null;
 grab.ownerEvents = false;
 grab.implicit = false;
 var keyDownList = [];
-var inputList = [];
 var lastSerial = 0;
 var lastX = 0;
 var lastY = 0;
@@ -267,7 +223,6 @@ function cmdSetTransientFor(id, parentId)
 {
    var surface = surfaces[id];

-    if (surface === undefined) return;
    if (surface.transientParent == parentId)
 	return;

@@ -298,9 +253,8 @@ function moveToHelper(surface, position) {

    for (var cid in surfaces) {
 	var child = surfaces[cid];
-	if (child.transientParent == surface.id) {
+	if (child.transientParent == surface.id)
 	    moveToHelper(child, stackingOrder.indexOf(surface) + 1);
-	}
    }
 }

@@ -315,13 +269,6 @@ function cmdDeleteSurface(id)
 	stackingOrder.splice(i, 1);
    var canvas = surface.canvas;
    canvas.parentNode.removeChild(canvas);
-    if (id == windowWithMouse) {
-	windowWithMouse = 0;
-    }
-    if (id == realWindowWithMouse) {
-	realWindowWithMouse = 0;
-	firstTouchDownId = null;
-    }
    delete surfaces[id];
 }

@@ -360,7 +307,6 @@ function cmdRaiseSurface(id)
 {
    var surface = surfaces[id];

-    if (surface === undefined) return;
    moveToHelper(surface);
    restackWindows();
 }
@@ -369,7 +315,6 @@ function cmdLowerSurface(id)
 {
    var surface = surfaces[id];

-    if (surface === undefined) return;
    moveToHelper(surface, 0);
    restackWindows();
 }
@@ -575,7 +520,6 @@ function cmdPutBuffer(id, w, h, compressed)
    var data = inflate.decompress();

    var imageData = decodeBuffer (context, surface.imageData, w, h, data, debugDecoding);
-    context.imageSmoothingEnabled = false;
    context.putImageData(imageData, 0, 0);

    if (debugDecoding)
@@ -832,15 +776,8 @@ function getEffectiveEventTarget (id) {
 function updateKeyboardStatus() {
    if (fakeInput != null && showKeyboardChanged) {
        showKeyboardChanged = false;
-        if (showKeyboard) {
-	    if (isAndroidChrome) {
-		fakeInput.blur();
-		fakeInput.value = ' '.repeat(80); // TODO: Should be exchange with broadway server
-		                                  // to bring real value here.
-	    }
+        if (showKeyboard)
            fakeInput.focus();
-	    //if (isAndroidChrome) fakeInput.click();
-	}
        else
            fakeInput.blur();
    }
@@ -2392,19 +2329,6 @@ function pushKeyEvent(fev) {
    keyDownList.push(fev);
 }

-function copyInputEvent(ev) {
-    var members = ['inputType', 'data'], i, obj = {};
-    for (i = 0; i < members.length; i++) {
-	if (typeof ev[members[i]] !== "undefined")
-	    obj[members[i]] = ev[members[i]];
-    }
-    return obj;
-}
-
-function pushInputEvent(fev) {
-    inputList.push(fev);
-}
-
 function getKeyEvent(keyCode, pop) {
    var i, fev = null;
    for (i = keyDownList.length-1; i >= 0; i--) {
@@ -2442,9 +2366,8 @@ function handleKeyDown(e) {
 	// If it is a key or key combination that might trigger
 	// browser behaviors or it has no corresponding keyPress
 	// event, then send it immediately
-	if (!ignoreKeyEvent(ev)) {
+	if (!ignoreKeyEvent(ev))
 	    sendInput("k", [keysym, lastState]);
-	}
 	suppress = true;
    }

@@ -2488,9 +2411,8 @@ function handleKeyPress(e) {
    }

    // Send the translated keysym
-    if (keysym > 0) {
+    if (keysym > 0)
 	sendInput ("k", [keysym, lastState]);
-    }

    // Stop keypress events just in case
    return cancelEvent(ev);
@@ -2505,45 +2427,11 @@ function handleKeyUp(e) {
 	keysym = fev.keysym;
    else {
 	//log("Key event (keyCode = " + ev.keyCode + ") not found on keyDownList");
-	if (isAndroidChrome && (ev.keyCode == 229)) {
-	    var i, fev = null, len = inputList.length, str;
-	    for (i = 0; i < len; i++) {
-		fev = inputList[i];
-		switch(fev.inputType) {
-		case "deleteContentBackward":
-		    sendInput ("k", [65288, lastState]);
-		    sendInput ("K", [65288, lastState]);
-		    break;
-		case "insertText":
-		    if (fev.data !== undefined) {
-			for (let sym of fev.data) {
-			    sendInput ("k", [sym.codePointAt(0), lastState]);
-			    sendInput ("K", [sym.codePointAt(0), lastState]);
-			}
-		    }
-		    break;
-		default:
-		    break;
-		}
-	    }
-	    inputList.splice(0, len);
-	}
 	keysym = 0;
    }

-    if (keysym > 0) {
+    if (keysym > 0)
 	sendInput ("K", [keysym, lastState]);
-    }
-    return cancelEvent(ev);
-}
-
-function handleInput (e)  {
-    var fev = null, ev = (e ? e : window.event), keysym = null, suppress = false;
-
-    fev = copyInputEvent(ev);
-    pushInputEvent(fev);
-
-    // Stop keypress events just in case
    return cancelEvent(ev);
 }

@@ -2562,11 +2450,6 @@ function onKeyUp (ev) {
    return handleKeyUp(ev);
 }

-function onInput (ev) {
-    updateForEvent(ev);
-    return handleInput(ev);
-}
-
 function cancelEvent(ev)
 {
    ev = ev ? ev : window.event;
@@ -2598,14 +2481,13 @@ function onMouseWheel(ev)
 }

 function onTouchStart(ev) {
-    ev.preventDefault();
+    event.preventDefault();

    updateKeyboardStatus();
    updateForEvent(ev);

    for (var i = 0; i < ev.changedTouches.length; i++) {
        var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifierStart(touch.identifier);

        var origId = getSurfaceId(touch);
        var id = getEffectiveEventTarget (origId);
@@ -2613,7 +2495,7 @@ function onTouchStart(ev) {
        var isEmulated = 0;

        if (firstTouchDownId == null) {
-            firstTouchDownId = touchId;
+            firstTouchDownId = touch.identifier;
            isEmulated = 1;

            if (realWindowWithMouse != origId || id != windowWithMouse) {
@@ -2628,54 +2510,52 @@ function onTouchStart(ev) {
            }
        }

-        sendInput ("t", [0, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput ("t", [0, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
    }
 }

 function onTouchMove(ev) {
-    ev.preventDefault();
+    event.preventDefault();

    updateKeyboardStatus();
    updateForEvent(ev);

    for (var i = 0; i < ev.changedTouches.length; i++) {
        var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifier(touch.identifier);

        var origId = getSurfaceId(touch);
        var id = getEffectiveEventTarget (origId);
        var pos = getPositionsFromEvent(touch, id);

        var isEmulated = 0;
-        if (firstTouchDownId == touchId) {
+        if (firstTouchDownId == touch.identifier) {
            isEmulated = 1;
        }

-        sendInput ("t", [1, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput ("t", [1, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
    }
 }

 function onTouchEnd(ev) {
-    ev.preventDefault();
+    event.preventDefault();

    updateKeyboardStatus();
    updateForEvent(ev);

    for (var i = 0; i < ev.changedTouches.length; i++) {
        var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifier(touch.identifier);

        var origId = getSurfaceId(touch);
        var id = getEffectiveEventTarget (origId);
        var pos = getPositionsFromEvent(touch, id);

        var isEmulated = 0;
-        if (firstTouchDownId == touchId) {
+        if (firstTouchDownId == touch.identifier) {
            isEmulated = 1;
            firstTouchDownId = null;
        }

-        sendInput ("t", [2, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput ("t", [2, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
    }
 }

@@ -2692,11 +2572,11 @@ function setupDocument(document)
    document.onkeyup = onKeyUp;

    if (document.addEventListener) {
-	document.addEventListener('DOMMouseScroll', onMouseWheel, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('mousewheel', onMouseWheel, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchstart', onTouchStart, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchmove', onTouchMove, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchend', onTouchEnd, passiveSupported ? { passive: false, capture: false } : false);
+      document.addEventListener('DOMMouseScroll', onMouseWheel, false);
+      document.addEventListener('mousewheel', onMouseWheel, false);
+      document.addEventListener('touchstart', onTouchStart, false);
+      document.addEventListener('touchmove', onTouchMove, false);
+      document.addEventListener('touchend', onTouchEnd, false);
    } else if (document.attachEvent) {
      element.attachEvent("onmousewheel", onMouseWheel);
    }
@@ -2750,14 +2630,12 @@ function connect()
    };

    var iOS = /(iPad|iPhone|iPod)/g.test( navigator.userAgent );
-    if (iOS || isAndroidChrome) {
+    if (iOS) {
        fakeInput = document.createElement("input");
        fakeInput.type = "text";
        fakeInput.style.position = "absolute";
        fakeInput.style.left = "-1000px";
        fakeInput.style.top = "-1000px";
        document.body.appendChild(fakeInput);
-	if (isAndroidChrome)
-	    fakeInput.addEventListener('input', onInput, passiveSupported ? { passive: false, capture: false } : false);
    }
 }
@@ -224,7 +224,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->scroll.y = message->pointer.win_y;
 	event->scroll.x_root = message->pointer.root_x;
 	event->scroll.y_root = message->pointer.root_y;
-        event->scroll.state = message->pointer.state;
 	event->scroll.direction = message->scroll.dir == 0 ? GDK_SCROLL_UP : GDK_SCROLL_DOWN;
 	gdk_event_set_device (event, device_manager->core_pointer);
 	gdk_event_set_seat (event, gdk_device_get_seat (device_manager->core_pointer));
@@ -288,7 +288,6 @@ gdk_pixbuf_get_from_surface  (cairo_surface_t *surface,
  if (cairo_surface_status (surface) || dest == NULL)
    {
      cairo_surface_destroy (surface);
-      g_clear_object (&dest);
      return NULL;
    }

@@ -2506,9 +2506,6 @@ touch_handle_down (void              *data,

  _gdk_wayland_display_update_serial (display, serial);

-  if (!wl_surface)
-    return;
-
  touch = gdk_wayland_seat_add_touch (seat, id, wl_surface);
  touch->x = wl_fixed_to_double (x);
  touch->y = wl_fixed_to_double (y);
@@ -2544,9 +2541,6 @@ touch_handle_up (void            *data,
  _gdk_wayland_display_update_serial (display, serial);

  touch = gdk_wayland_seat_get_touch (seat, id);
-  if (!touch)
-    return;
-
  event = _create_touch_event (seat, touch, GDK_TOUCH_END, time);

  GDK_NOTE (EVENTS,
@@ -2573,9 +2567,6 @@ touch_handle_motion (void            *data,
  GdkEvent *event;

  touch = gdk_wayland_seat_get_touch (seat, id);
-  if (!touch)
-    return;
-
  touch->x = wl_fixed_to_double (x);
  touch->y = wl_fixed_to_double (y);

@@ -3689,21 +3680,19 @@ tablet_tool_handle_proximity_in (void                      *data,
                                 struct zwp_tablet_tool_v2 *wp_tablet_tool,
                                 uint32_t                   serial,
                                 struct zwp_tablet_v2      *wp_tablet,
-                                 struct wl_surface         *wl_surface)
+                                 struct wl_surface         *surface)
 {
  GdkWaylandTabletToolData *tool = data;
  GdkWaylandTabletData *tablet = zwp_tablet_v2_get_user_data (wp_tablet);
  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tablet->seat);
  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (seat->display);
-  GdkWindow *window;
+  GdkWindow *window = wl_surface_get_user_data (surface);
  GdkEvent *event;

-  if (!wl_surface)
-    return;
-
-  window = wl_surface_get_user_data (wl_surface);
+  if (!surface)
+      return;
  if (!GDK_IS_WINDOW (window))
-    return;
+      return;

  tool->current_tablet = tablet;
  tablet->current_tool = tool;
@@ -3742,9 +3731,6 @@ tablet_tool_handle_proximity_out (void                      *data,
  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tool->seat);
 #endif

-  if (!tablet)
-    return;
-
  GDK_NOTE (EVENTS,
            g_message ("proximity out, seat %p, tool %d", seat,
                       gdk_device_tool_get_tool_type (tool->tool)));
@@ -3801,7 +3787,7 @@ tablet_tool_handle_down (void                      *data,
  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tool->seat);
  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (seat->display);

-  if (!tablet || !tablet->pointer_info.focus)
+  if (!tablet->pointer_info.focus)
    return;

  _gdk_wayland_display_update_serial (display_wayland, serial);
@@ -3818,7 +3804,7 @@ tablet_tool_handle_up (void                      *data,
  GdkWaylandTabletToolData *tool = data;
  GdkWaylandTabletData *tablet = tool->current_tablet;

-  if (!tablet || !tablet->pointer_info.focus)
+  if (!tablet->pointer_info.focus)
    return;

  tablet_create_button_event_frame (tablet, GDK_BUTTON_RELEASE, GDK_BUTTON_PRIMARY);
@@ -3837,9 +3823,6 @@ tablet_tool_handle_motion (void                      *data,
  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (seat->display);
  GdkEvent *event;

-  if (!tablet)
-    return;
-
  tablet->pointer_info.surface_x = wl_fixed_to_double (sx);
  tablet->pointer_info.surface_y = wl_fixed_to_double (sy);

@@ -3872,12 +3855,7 @@ tablet_tool_handle_pressure (void                      *data,
 {
  GdkWaylandTabletToolData *tool = data;
  GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint axis_index;
-
-  if (!tablet)
-    return;
-
-  axis_index = tablet->axis_indices[GDK_AXIS_PRESSURE];
+  gint axis_index = tablet->axis_indices[GDK_AXIS_PRESSURE];

  _gdk_device_translate_axis (tablet->current_device, axis_index,
                              pressure, &tablet->axes[axis_index]);
@@ -3894,12 +3872,7 @@ tablet_tool_handle_distance (void                      *data,
 {
  GdkWaylandTabletToolData *tool = data;
  GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint axis_index;
-
-  if (!tablet)
-    return;
-
-  axis_index = tablet->axis_indices[GDK_AXIS_DISTANCE];
+  gint axis_index = tablet->axis_indices[GDK_AXIS_DISTANCE];

  _gdk_device_translate_axis (tablet->current_device, axis_index,
                              distance, &tablet->axes[axis_index]);
@@ -3917,14 +3890,8 @@ tablet_tool_handle_tilt (void                      *data,
 {
  GdkWaylandTabletToolData *tool = data;
  GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint xtilt_axis_index;
-  gint ytilt_axis_index;
-
-  if (!tablet)
-    return;
-
-  xtilt_axis_index = tablet->axis_indices[GDK_AXIS_XTILT];
-  ytilt_axis_index = tablet->axis_indices[GDK_AXIS_YTILT];
+  gint xtilt_axis_index = tablet->axis_indices[GDK_AXIS_XTILT];
+  gint ytilt_axis_index = tablet->axis_indices[GDK_AXIS_YTILT];

  _gdk_device_translate_axis (tablet->current_device, xtilt_axis_index,
                              wl_fixed_to_double (xtilt),
@@ -3951,7 +3918,7 @@ tablet_tool_handle_button (void                      *data,
  GdkEventType evtype;
  guint n_button;

-  if (!tablet || !tablet->pointer_info.focus)
+  if (!tablet->pointer_info.focus)
    return;

  tablet->pointer_info.press_serial = serial;
@@ -3982,12 +3949,7 @@ tablet_tool_handle_rotation (void                      *data,
 {
  GdkWaylandTabletToolData *tool = data;
  GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint axis_index;
-
-  if (!tablet)
-    return;
-
-  axis_index = tablet->axis_indices[GDK_AXIS_ROTATION];
+  gint axis_index = tablet->axis_indices[GDK_AXIS_ROTATION];

  _gdk_device_translate_axis (tablet->current_device, axis_index,
                              wl_fixed_to_double (degrees),
@@ -4006,12 +3968,7 @@ tablet_tool_handle_slider (void                      *data,
 {
  GdkWaylandTabletToolData *tool = data;
  GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint axis_index;
-
-  if (!tablet)
-    return;
-
-  axis_index = tablet->axis_indices[GDK_AXIS_SLIDER];
+  gint axis_index = tablet->axis_indices[GDK_AXIS_SLIDER];

  _gdk_device_translate_axis (tablet->current_device, axis_index,
                              position, &tablet->axes[axis_index]);
@@ -4029,12 +3986,9 @@ tablet_tool_handle_wheel (void                      *data,
 {
  GdkWaylandTabletToolData *tool = data;
  GdkWaylandTabletData *tablet = tool->current_tablet;
-  GdkWaylandSeat *seat;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tablet->seat);
  GdkEvent *event;

-  if (!tablet)
-    return;
-
  GDK_NOTE (EVENTS,
            g_message ("tablet tool %d wheel %d/%d",
                       gdk_device_tool_get_tool_type (tool->tool), degrees, clicks));
@@ -4042,8 +3996,6 @@ tablet_tool_handle_wheel (void                      *data,
  if (clicks == 0)
    return;

-  seat = GDK_WAYLAND_SEAT (tablet->seat);
-
  /* Send smooth event */
  event = create_scroll_event (seat, &tablet->pointer_info,
                               tablet->master, tablet->current_device, FALSE);
@@ -4069,9 +4021,6 @@ tablet_tool_handle_frame (void                      *data,
  GdkWaylandTabletData *tablet = tool->current_tablet;
  GdkEvent *frame_event;

-  if (!tablet)
-    return;
-
  GDK_NOTE (EVENTS,
            g_message ("tablet frame, time %d", time));

@@ -4695,9 +4644,6 @@ pointer_surface_update_scale (GdkDevice *device)
      return;
    }

-  if (!pointer->pointer_surface_outputs)
-    return;
-
  scale = 1;
  for (l = pointer->pointer_surface_outputs; l != NULL; l = l->next)
    {
@@ -4707,8 +4653,6 @@ pointer_surface_update_scale (GdkDevice *device)
      scale = MAX (scale, output_scale);
    }

-  if (pointer->current_output_scale == scale)
-    return;
  pointer->current_output_scale = scale;

  if (pointer->cursor)
@@ -84,7 +84,7 @@

 #define MIN_SYSTEM_BELL_DELAY_MS 20

-#define GTK_SHELL1_VERSION       4
+#define GTK_SHELL1_VERSION       3

 static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);

@@ -765,7 +765,6 @@ init_settings (GdkScreen *screen)
                  char *a = g_variant_print (v, FALSE);
                  g_debug ("Using portal setting for %s %s: %s\n", schema, key, a);
                  g_free (a);
-                  entry->valid = TRUE;
                  apply_portal_setting (entry, v, screen);
                }
              else
@@ -87,14 +87,6 @@ void gdk_wayland_window_announce_csd                        (GdkWindow *window);
 GDK_AVAILABLE_IN_3_24
 void gdk_wayland_window_announce_ssd                        (GdkWindow *window);

-GDK_AVAILABLE_IN_3_24
-void gdk_wayland_window_add_frame_callback_surface (GdkWindow         *window,
-                                                    struct wl_surface *surface);
-
-GDK_AVAILABLE_IN_3_24
-void gdk_wayland_window_remove_frame_callback_surface (GdkWindow         *window,
-                                                       struct wl_surface *surface);
-
 G_END_DECLS

 #endif /* __GDK_WAYLAND_WINDOW_H__ */
@@ -236,9 +236,6 @@ struct _GdkWindowImplWayland

  struct zxdg_imported_v1 *imported_transient_for;
  GHashTable *shortcuts_inhibitors;
-
-  struct wl_callback *surface_callback;
-  GHashTable *frame_callback_surfaces;
 };

 struct _GdkWindowImplWaylandClass
@@ -575,25 +572,9 @@ frame_callback (void               *data,
  GdkFrameClock *clock = gdk_window_get_frame_clock (window);
  GdkFrameTimings *timings;

-  if (callback == impl->surface_callback)
-    {
-      impl->surface_callback = NULL;
-    }
-  else
-    {
-      GHashTableIter iter;
-      gpointer surface_callback;
+  GDK_NOTE (EVENTS,
+            g_message ("frame %p", window));

-      g_hash_table_iter_init (&iter, impl->frame_callback_surfaces);
-      while (g_hash_table_iter_next (&iter, NULL, &surface_callback))
-        {
-          if (callback == surface_callback)
-            {
-              g_hash_table_iter_replace (&iter, NULL);
-              break;
-            }
-        }
-    }
  wl_callback_destroy (callback);

  if (GDK_WINDOW_DESTROYED (window))
@@ -602,9 +583,6 @@ frame_callback (void               *data,
  if (!impl->awaiting_frame)
    return;

-  GDK_NOTE (EVENTS,
-            g_message ("frame %p", window));
-
  impl->awaiting_frame = FALSE;
  _gdk_frame_clock_thaw (clock);

@@ -682,8 +660,6 @@ on_frame_clock_after_paint (GdkFrameClock *clock,
 {
  GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
  struct wl_callback *callback;
-  GHashTableIter iter;
-  gpointer surface, surface_callback;

  if (!impl->pending_commit)
    return;
@@ -691,6 +667,8 @@ on_frame_clock_after_paint (GdkFrameClock *clock,
  if (window->update_freeze_count > 0)
    return;

+  callback = wl_surface_frame (impl->display_server.wl_surface);
+  wl_callback_add_listener (callback, &frame_listener, window);
  _gdk_frame_clock_freeze (clock);

  /* Before we commit a new buffer, make sure we've backfilled
@@ -699,24 +677,6 @@ on_frame_clock_after_paint (GdkFrameClock *clock,
  if (impl->pending_buffer_attached)
    read_back_cairo_surface (window);

-  if (impl->surface_callback == NULL)
-    {
-      callback = wl_surface_frame (impl->display_server.wl_surface);
-      wl_callback_add_listener (callback, &frame_listener, window);
-      impl->surface_callback = callback;
-    }
-
-  g_hash_table_iter_init (&iter, impl->frame_callback_surfaces);
-  while (g_hash_table_iter_next (&iter, &surface, &surface_callback))
-    {
-      if (surface_callback)
-        continue;
-
-      callback = wl_surface_frame (surface);
-      wl_callback_add_listener (callback, &frame_listener, window);
-      g_hash_table_iter_replace (&iter, callback);
-    }
-
  /* From this commit forward, we can't write to the buffer,
   * it's "live".  In the future, if we need to stage more changes
   * we have to allocate a new staging buffer and draw to it instead.
@@ -796,8 +756,6 @@ _gdk_wayland_display_create_window_impl (GdkDisplay    *display,
  impl->wrapper = GDK_WINDOW (window);
  impl->shortcuts_inhibitors = g_hash_table_new (NULL, NULL);
  impl->using_csd = TRUE;
-  impl->surface_callback = NULL;
-  impl->frame_callback_surfaces = g_hash_table_new (NULL, NULL);

  if (window->width > 65535)
    {
@@ -1109,7 +1067,6 @@ gdk_window_impl_wayland_finalize (GObject *object)
  g_clear_pointer (&impl->staged_updates_region, cairo_region_destroy);

  g_clear_pointer (&impl->shortcuts_inhibitors, g_hash_table_unref);
-  g_clear_pointer (&impl->frame_callback_surfaces, g_hash_table_unref);

  G_OBJECT_CLASS (_gdk_window_impl_wayland_parent_class)->finalize (object);
 }
@@ -1392,9 +1349,6 @@ gdk_wayland_window_sync_margin (GdkWindow *window)
    return;

  gdk_wayland_window_get_window_geometry (window, &geometry);
-
-  g_return_if_fail (geometry.width > 0 && geometry.height > 0);
-
  gdk_window_set_geometry_hints (window,
                                 &impl->geometry_hints,
                                 impl->geometry_mask);
@@ -3378,11 +3332,7 @@ gdk_wayland_window_hide_surface (GdkWindow *window)

      if (impl->display_server.gtk_surface)
        {
-          if (display_wayland->gtk_shell_version >=
-              GTK_SURFACE1_RELEASE_SINCE_VERSION)
-            gtk_surface1_release (impl->display_server.gtk_surface);
-          else
-            gtk_surface1_destroy (impl->display_server.gtk_surface);
+          gtk_surface1_destroy (impl->display_server.gtk_surface);
          impl->display_server.gtk_surface = NULL;
          impl->application.was_set = FALSE;
        }
@@ -3395,7 +3345,6 @@ gdk_wayland_window_hide_surface (GdkWindow *window)

      wl_surface_destroy (impl->display_server.wl_surface);
      impl->display_server.wl_surface = NULL;
-      impl->surface_callback = NULL;

      g_slist_free (impl->display_server.outputs);
      impl->display_server.outputs = NULL;
@@ -5441,71 +5390,3 @@ gdk_wayland_window_restore_shortcuts (GdkWindow *window,
  g_hash_table_remove (impl->shortcuts_inhibitors, seat);
 }

-/**
- * gdk_wayland_window_add_frame_callback_surface:
- * @window: the #GdkWindow requesting callbacks
- * @surface: the wl_surface to add
- *
- * Add @surface to a list of surfaces for which frame callback
- * listeners will get set up, additionally to the one of @window.
- *
- * This is useful when clients use subsurfaces independently of GDK.
- * For example if a client creates a subsurface that covers @window
- * entirely. If this subsurface is opaque, Wayland compositors may not
- * emit callbacks for the surface of @window any more.
- * Adding the covering subsurface via this function ensures the
- * @window will continue to update.
- *
- * A single callback is sufficient to trigger the next update. If more
- * than one are triggered, the later ones will get ignored.
- *
- * Before @surface gets destroyed it must get removed again using
- * gdk_wayland_window_remove_frame_callback_surface().
- *
- * Note that the client is responsible to commit the @surface.
- * One way to archive this is to always commit after the
- * #GdkSurface::after-paint signal was triggered.
- *
- * Since: 3.24.25
- */
-void
-gdk_wayland_window_add_frame_callback_surface (GdkWindow         *window,
-                                               struct wl_surface *surface)
-{
-  GdkWindowImplWayland *impl;
-
-  g_return_if_fail (GDK_IS_WAYLAND_WINDOW (window));
-  g_return_if_fail (GDK_IS_WINDOW_IMPL_WAYLAND (window->impl));
-  g_return_if_fail (surface != NULL);
-
-  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-
-  g_hash_table_insert (impl->frame_callback_surfaces, surface, NULL);
-}
-
-/**
- * gdk_wayland_window_remove_frame_callback_surface:
- * @window: the #GdkWindow requesting callbacks
- * @surface: the surface to remove
- *
- * Remove @surface from the list of surfaces again that got added via
- * gdk_wayland_window_add_frame_callback_surface().
- *
- * This function must be called before @surface gets destroyed.
- *
- * Since: 3.24.25
- */
-void
-gdk_wayland_window_remove_frame_callback_surface (GdkWindow         *window,
-                                                  struct wl_surface *surface)
-{
-  GdkWindowImplWayland *impl;
-
-  g_return_if_fail (GDK_IS_WAYLAND_WINDOW (window));
-  g_return_if_fail (GDK_IS_WINDOW_IMPL_WAYLAND (window->impl));
-  g_return_if_fail (surface != NULL);
-
-  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-
-  g_hash_table_remove (impl->frame_callback_surfaces, surface);
-}
@@ -1,6 +1,6 @@
 <protocol name="gtk">

-  <interface name="gtk_shell1" version="4">
+  <interface name="gtk_shell1" version="3">
    <description summary="gtk specific extensions">
      gtk_shell is a protocol extension providing additional features for
      clients implementing it.
@@ -35,7 +35,7 @@
    </request>
  </interface>

-  <interface name="gtk_surface1" version="4">
+  <interface name="gtk_surface1" version="3">
    <request name="set_dbus_properties">
      <arg name="application_id" type="string" allow-null="true"/>
      <arg name="app_menu_path" type="string" allow-null="true"/>
@@ -82,9 +82,6 @@
    <request name="request_focus" since="3">
      <arg name="startup_id" type="string" allow-null="true"/>
    </request>
-
-    <!-- Version 4 additions -->
-    <request name="release" type="destructor" since="4"/>
  </interface>

 </protocol>
@@ -102,9 +102,6 @@ struct _GdkWin32Display
  guint hasWglARBPixelFormat : 1;
  guint hasWglARBmultisample : 1;

-  /* compensate around Intel OpenGL driver issues on blitting, see issue #3487 */
-  guint needIntelGLWorkaround : 1; 
-
 #ifdef GDK_WIN32_ENABLE_EGL
  guint hasEglKHRCreateContext : 1;
  guint hasEglSurfacelessContext : 1;
@@ -123,34 +123,21 @@ gdk_win32_gl_context_init (GdkWin32GLContext *self)
 }

 static void
-gdk_gl_blit_region (GdkWindow      *window,
-                    cairo_region_t *region,
-                    gboolean        use_intel_workaround)
+gdk_gl_blit_region (GdkWindow *window, cairo_region_t *region)
 {
-  int n_rects, i, j;
+  int n_rects, i;
  int scale = gdk_window_get_scale_factor (window);
  int wh = gdk_window_get_height (window);
  cairo_rectangle_int_t rect;
-  int retries = 0;
-
-  if (use_intel_workaround)
-    retries = 1;

  n_rects = cairo_region_num_rectangles (region);
-
-  for (i = 0; i <= retries; i ++)
+  for (i = 0; i < n_rects; i++)
    {
-      for (j = 0; j < n_rects; j++)
-        {
-          cairo_region_get_rectangle (region, j, &rect);
-          glScissor (rect.x * scale, (wh - rect.y - rect.height) * scale, rect.width * scale, rect.height * scale);
-          glBlitFramebuffer (rect.x * scale, (wh - rect.y - rect.height) * scale, (rect.x + rect.width) * scale, (wh - rect.y) * scale,
-                             rect.x * scale, (wh - rect.y - rect.height) * scale, (rect.x + rect.width) * scale, (wh - rect.y) * scale,
-                             GL_COLOR_BUFFER_BIT, GL_NEAREST);
-        }
-
-      if (retries > 0 && i < retries)
-        glFlush ();
+      cairo_region_get_rectangle (region, i, &rect);
+      glScissor (rect.x * scale, (wh - rect.y - rect.height) * scale, rect.width * scale, rect.height * scale);
+      glBlitFramebuffer (rect.x * scale, (wh - rect.y - rect.height) * scale, (rect.x + rect.width) * scale, (wh - rect.y) * scale,
+                         rect.x * scale, (wh - rect.y - rect.height) * scale, (rect.x + rect.width) * scale, (wh - rect.y) * scale,
+                         GL_COLOR_BUFFER_BIT, GL_NEAREST);
    }
 }

@@ -219,7 +206,7 @@ _gdk_win32_gl_context_end_frame (GdkGLContext *context,
        {
          glDrawBuffer(GL_FRONT);
          glReadBuffer(GL_BACK);
-          gdk_gl_blit_region (window, painted, display->needIntelGLWorkaround);
+          gdk_gl_blit_region (window, painted);
          glDrawBuffer(GL_BACK);
          glFlush();

@@ -237,7 +224,7 @@ _gdk_win32_gl_context_end_frame (GdkGLContext *context,
      gboolean force_egl_redraw_all = _get_is_egl_force_redraw (window);

      if (context_win32->do_blit_swap && !force_egl_redraw_all)
-        gdk_gl_blit_region (window, painted, FALSE);
+        gdk_gl_blit_region (window, painted);
      else if (force_egl_redraw_all)
        {
          GdkRectangle rect = {0, 0, gdk_window_get_width (window), gdk_window_get_height (window)};
@@ -629,13 +616,10 @@ _gdk_win32_display_init_gl (GdkDisplay *display,
        epoxy_has_wgl_extension (dummy.hdc, "WGL_ARB_pixel_format");
      display_win32->hasWglARBmultisample =
        epoxy_has_wgl_extension (dummy.hdc, "WGL_ARB_multisample");
-      display_win32->needIntelGLWorkaround =
-        (g_ascii_strcasecmp (glGetString (GL_VENDOR), "intel") == 0);

      GDK_NOTE (OPENGL,
                g_print ("WGL API version %d.%d found\n"
                         " - Vendor: %s\n"
-                         " - Intel OpenGL workaround: %s\n"
                         " - Checked extensions:\n"
                         "\t* WGL_ARB_pixel_format: %s\n"
                         "\t* WGL_ARB_create_context: %s\n"
@@ -645,7 +629,6 @@ _gdk_win32_display_init_gl (GdkDisplay *display,
                         display_win32->gl_version / 10,
                         display_win32->gl_version % 10,
                         glGetString (GL_VENDOR),
-                         display_win32->needIntelGLWorkaround ? "yes" : "no",
                         display_win32->hasWglARBPixelFormat ? "yes" : "no",
                         display_win32->hasWglARBCreateContext ? "yes" : "no",
                         display_win32->hasWglEXTSwapControl ? "yes" : "no",
@@ -3025,29 +3025,12 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  if (pattern == parent_relative_pattern)
    {
-      Window xroot, xparent, *xchildren;
-      guint nxchildren, xparent_depth;
-      XWindowAttributes xattrs;
-
-      if (!XQueryTree (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window),
-            &xroot, &xparent, &xchildren, &nxchildren))
-        {
-          XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
-              GDK_WINDOW_XID (window), None);
-          return;
-        }
-
-      if (xchildren)
-        XFree (xchildren);
-
-      if (xparent) {
-        XGetWindowAttributes (GDK_WINDOW_XDISPLAY (window), xparent, &xattrs);
-        xparent_depth = xattrs.depth;
-      }
+      GdkWindow *parent;

      /* X throws BadMatch if the parent has a different depth when
       * using ParentRelative */
-      if (xparent && window->depth == xparent_depth &&
+      parent = gdk_window_get_parent (window);
+      if (parent != NULL && window->depth == parent->depth &&
          cairo_pattern_status (pattern) == CAIRO_STATUS_SUCCESS)
        {
          XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
@@ -510,6 +510,7 @@ gtk_private_h_sources =		\
 	gtkiconviewprivate.h	\
 	gtkimagedefinitionprivate.h	\
 	gtkimageprivate.h	\
+	gtkimcontextsimpleprivate.h	\
 	gtkimmoduleprivate.h	\
 	gtkimcontextsimpleseqs.h \
 	gtkintl.h		\
@@ -1709,10 +1710,27 @@ GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
 GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
 GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o

-$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py
-	$(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir)
+$(GTK_UPDATE_ICON_CACHE_MANIFEST):
+	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
+	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
+	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
+	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
+	 echo '     name="gtk-update-icon-cache.exe"' ; \
+	 echo '     type="win32"/>' ; \
+	 echo '  <!-- Identify the application security requirements. -->' ; \
+	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
+	 echo '    <security>' ; \
+	 echo '      <requestedPrivileges>' ; \
+	 echo '        <requestedExecutionLevel' ; \
+	 echo '          level="asInvoker"' ; \
+	 echo '          uiAccess="false"/>' ; \
+	 echo '        </requestedPrivileges>' ; \
+	 echo '       </security>' ; \
+	 echo '  </trustInfo>' ; \
+	 echo '</assembly>' ) >$@

-$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+$(GTK_UPDATE_ICON_CACHE_RC):
+	(echo -e '#include <winuser.h>\nCREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@

 $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
 	$(WINDRES) --input $< --output $@ --output-format=coff
@@ -1775,7 +1793,6 @@ EXTRA_DIST +=                   \
 	meson.build \
 	gen-gtk-gresources-xml.py \
 	gen-rc.py \
-	generate-uac-manifest.py \
 	gentypefuncs.py \
 	a11y/meson.build \
 	deprecated/meson.build \
@@ -311,10 +311,18 @@ gtk_notebook_page_accessible_get_extents (AtkComponent *component,
  label = get_label_from_notebook_page (GTK_NOTEBOOK_PAGE_ACCESSIBLE (component));
  if (!label)
    {
-      *x = -1;
-      *y = -1;
-      *width = -1;
-      *height = -1;
+      AtkObject *child;
+
+      *width = 0;
+      *height = 0;
+
+      child = atk_object_ref_accessible_child (ATK_OBJECT (component), 0);
+      if (!child)
+        return;
+
+      atk_component_get_extents (ATK_COMPONENT (child), x, y, NULL, NULL,
+                                 coord_type);
+      g_object_unref (child);
    }
  else
    {
@@ -82,10 +82,12 @@ size_allocate_cb (GtkWidget     *widget,
  accessible = gtk_widget_get_accessible (widget);
  if (ATK_IS_COMPONENT (accessible))
    {
-      rect.x = allocation->x;
-      rect.y = allocation->y;
-      rect.width = allocation->width;
-      rect.height = allocation->height;
+      int scale = gtk_widget_get_scale_factor (widget);
+
+      rect.x = allocation->x * scale;
+      rect.y = allocation->y * scale;
+      rect.width = allocation->width * scale;
+      rect.height = allocation->height * scale;
      g_signal_emit_by_name (accessible, "bounds-changed", &rect);
    }
 }
@@ -126,11 +126,3 @@ isnan (double x)
  return _isnan (x);
 }
 #endif
-
-#ifndef HAVE_FMIN
-static inline double
-fmin (double x, double y)
-{
-  return x < y ? x : y;
-}
-#endif
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-This script generates a Windows manifest file and optionally a resource file to
-determine whether a specified program requires UAC elevation
-"""
-
-import os
-import argparse
-
-DOMAIN_NAME='gnome'
-
-def main():
-    parser = argparse.ArgumentParser(
-        description=__doc__)
-    parser.add_argument('-p', '--package', required=True,
-                        help='package name of the executable')
-    parser.add_argument('-n', '--name', required=True,
-                        help='name of executable')
-    parser.add_argument('--pkg-version', required=True, dest='version',
-                        help='version of package')
-    parser.add_argument('--require-admin', action='store_true', dest='admin',
-                        default=False,
-                        help='require admin access to application')
-    parser.add_argument('--input-resource-file', dest='resource',
-                        default=None,
-                        help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included winuser.h in it')
-    parser.add_argument('--output-dir', dest='outdir',
-                        default=None,
-                        help='directory to output resulting files')
-    args = parser.parse_args()
-
-    if args.resource is not None:
-        if not os.path.isfile(args.resource):
-            raise FileNotFoundError("Specified resource file '%s' does not exist" % args.resource)
-
-    generate_manifest(args.package, args.name, args.version, args.admin, args.outdir)
-    write_rc_file(args.name, args.resource, args.outdir)
-
-def generate_manifest(package, name, version, admin, outdir):
-    if version.count('.') == 0:
-        manifest_package_version = version + '.0.0.0'
-    elif version.count('.') == 1:
-        manifest_package_version = version + '.0.0'
-    elif version.count('.') == 2:
-        manifest_package_version = version + '.0'
-    elif version.count('.') == 3:
-        manifest_package_version = version
-    else:
-        parts = version.split('.')
-        manifest_package_version = ''
-        for x in (0, 1, 2, 3):
-            if x == 0:
-                manifest_package_version += parts[x]
-            else:
-                manifest_package_version += '.' + parts[x]
-
-    if outdir is not None:
-        output_file_base_name = os.path.join(outdir, name)
-    else:
-        output_file_base_name = name
-
-    outfile = open(output_file_base_name + '.exe.manifest', 'w+')
-    outfile.write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n')
-    outfile.write('<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\n')
-    outfile.write('  <assemblyIdentity version="%s"\n' % manifest_package_version)
-    outfile.write('    processorArchitecture="*"\n')
-    outfile.write('    name="%s.%s.%s.exe"\n' % (DOMAIN_NAME, package, name))
-    outfile.write('    type="win32" />\n')
-    outfile.write('  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">\n')
-    outfile.write('    <security>\n')
-    outfile.write('      <requestedPrivileges>\n')
-    outfile.write('        <requestedExecutionLevel\n')
-
-    if admin:
-        outfile.write('          level="requireAdministrator"\n')
-    else:
-        outfile.write('          level="asInvoker"\n')
-
-    outfile.write('          uiAccess="false" />\n')
-    outfile.write('      </requestedPrivileges>\n')
-    outfile.write('    </security>\n')
-    outfile.write('  </trustInfo>\n')
-    outfile.write('</assembly>\n')
-    outfile.close()
-
-def write_rc_file(name, resource, outdir):
-    if outdir is not None:
-        output_file_base_name = os.path.join(outdir, name)
-    else:
-        output_file_base_name = name
-
-    if resource is None:
-        outfile = open(output_file_base_name + '.rc', 'w+')
-        outfile.write('#include <winuser.h>')
-    else:
-        if resource != output_file_base_name + '.rc':
-            outfile = open(output_file_base_name + '.rc', 'w+')
-        else:
-            outfile = open(output_file_base_name + '.final.rc', 'w+')
-        srcfile = open(resource, 'r')
-        outfile.write(srcfile.read())
-        srcfile.close()
-
-    outfile.write('\n')
-    outfile.write('CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "%s.exe.manifest"' % name)
-    outfile.close()
-
-if __name__ == '__main__':
-    main()
@@ -329,31 +329,8 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl,

  if (dbus->ss_proxy)
    {
-      GVariant *active_var;
-      gboolean active;
-
      g_signal_connect (dbus->ss_proxy, "g-signal",
                        G_CALLBACK (screensaver_signal_session), impl->application);
-
-      active_var = g_dbus_proxy_call_sync (dbus->ss_proxy,
-                                           "GetActive",
-                                           NULL,
-                                           G_DBUS_CALL_FLAGS_NONE,
-                                           G_MAXINT,
-                                           NULL,
-                                           &error);
-      if (!active_var)
-        {
-          g_debug ("Error calling GetActive on GNOME screensaver: %s",
-                   error->message);
-          g_clear_error (&error);
-        }
-      else
-        {
-          g_variant_get (active_var, "(b)", &active);
-          g_variant_unref (active_var);
-          gtk_application_set_screensaver_active (dbus->impl.application, active);
-        }
    }

  g_debug ("Registering client '%s' '%s'", dbus->application_id, client_id);
@@ -29,47 +29,26 @@ typedef struct _GtkComposeTableCompact GtkComposeTableCompact;
 struct _GtkComposeTable
 {
  guint16 *data;
-  char *char_data;
-  int max_seq_len;
-  int n_seqs;
-  int n_chars;
+  gint max_seq_len;
+  gint n_seqs;
  guint32 id;
 };

 struct _GtkComposeTableCompact
 {
  const guint16 *data;
-  int max_seq_len;
-  int n_index_size;
-  int n_index_stride;
+  gint max_seq_len;
+  gint n_index_size;
+  gint n_index_stride;
 };

-GtkComposeTable * gtk_compose_table_new_with_file  (const char      *compose_file);
-GSList          * gtk_compose_table_list_add_array (GSList          *compose_tables,
-                                                    const guint16   *data,
-                                                    int              max_seq_len,
-                                                    int              n_seqs);
-GSList          * gtk_compose_table_list_add_file  (GSList          *compose_tables,
-                                                    const char      *compose_file);
-
-gboolean          gtk_compose_table_check          (const GtkComposeTable *table,
-                                                    const guint16         *compose_buffer,
-                                                    int                    n_compose,
-                                                    gboolean              *compose_finish,
-                                                    gboolean              *compose_match,
-                                                    GString               *output);
-
-gboolean          gtk_compose_table_compact_check  (const GtkComposeTableCompact  *table,
-                                                    const guint16                 *compose_buffer,
-                                                    int                            n_compose,
-                                                    gboolean                      *compose_finish,
-                                                    gboolean                      *compose_match,
-                                                    gunichar                      *output_char);
-
-gboolean          gtk_check_algorithmically        (const guint16                 *compose_buffer,
-                                                    int                            n_compose,
-                                                    gunichar                      *output);
-
+GtkComposeTable * gtk_compose_table_new_with_file (const gchar   *compose_file);
+GSList *gtk_compose_table_list_add_array          (GSList        *compose_tables,
+                                                   const guint16 *data,
+                                                   gint           max_seq_len,
+                                                   gint           n_seqs);
+GSList *gtk_compose_table_list_add_file           (GSList        *compose_tables,
+                                                   const gchar   *compose_file);

 G_END_DECLS

@@ -353,13 +353,6 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                        GTK_TYPE_WIDGET,
                                                        GTK_PARAM_READWRITE));

-  /**
-   * GtkExpander:label-fill:
-   *
-   * Whether the label widget should fill all available horizontal space.
-   *
-   * Note that this property is ignored since 3.20.
-   */
  g_object_class_install_property (gobject_class,
                                   PROP_LABEL_FILL,
                                   g_param_spec_boolean ("label-fill",
@@ -1643,8 +1636,6 @@ gtk_expander_get_label_widget (GtkExpander *expander)
 * Sets whether the label widget should fill all available
 * horizontal space allocated to @expander.
 *
- * Note that this function has no effect since 3.20.
- *
 * Since: 2.22
 */
 void
@@ -942,73 +942,42 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
  for (i = 0; i < n_families; i++)
    {
      GtkTreeIter     iter;
+      PangoFontFace **faces;
+      int             j, n_faces;
      const gchar    *fam_name = pango_font_family_get_name (families[i]);

-      if ((priv->level & GTK_FONT_CHOOSER_LEVEL_STYLE) == 0)
+      pango_font_family_list_faces (families[i], &faces, &n_faces);
+
+      for (j = 0; j < n_faces; j++)
        {
          GtkDelayedFontDescription *desc;
-          PangoFontFace *face;
+          const gchar *face_name;
+          char *title;

-#if PANGO_VERSION_CHECK(1,46,0)
-          face = pango_font_family_get_face (families[i], NULL);
-#else
-          {
-            PangoFontFace **faces;
-            int j, n_faces;
-            pango_font_family_list_faces (families[i], &faces, &n_faces);
-            face = faces[0];
-            for (j = 0; j < n_faces; j++)
-              {
-                if (strcmp (pango_font_face_get_face_name (faces[j]), "Regular") == 0)
-                  {
-                    face = faces[j];
-                    break;
-                  }
-              }
-            g_free (faces);
-          }
-#endif
-          desc = gtk_delayed_font_description_new (face);
+          face_name = pango_font_face_get_face_name (faces[j]);
+
+          if ((priv->level & GTK_FONT_CHOOSER_LEVEL_STYLE) != 0)
+            title = g_strconcat (fam_name, " ", face_name, NULL);
+          else
+            title = g_strdup (fam_name);
+
+          desc = gtk_delayed_font_description_new (faces[j]);

          gtk_list_store_insert_with_values (list_store, &iter, -1,
                                             FAMILY_COLUMN, families[i],
-                                             FACE_COLUMN, face,
+                                             FACE_COLUMN, faces[j],
                                             FONT_DESC_COLUMN, desc,
-                                             PREVIEW_TITLE_COLUMN, fam_name,
+                                             PREVIEW_TITLE_COLUMN, title,
                                             -1);

+          g_free (title);
          gtk_delayed_font_description_unref (desc);
+
+          if ((priv->level & GTK_FONT_CHOOSER_LEVEL_STYLE) == 0)
+            break;
        }
-      else
-        {
-          PangoFontFace **faces;
-          int j, n_faces;

-          pango_font_family_list_faces (families[i], &faces, &n_faces);
-
-          for (j = 0; j < n_faces; j++)
-            {
-              GtkDelayedFontDescription *desc;
-              const gchar *face_name;
-              char *title;
-
-              face_name = pango_font_face_get_face_name (faces[j]);
-              title = g_strconcat (fam_name, " ", face_name, NULL);
-              desc = gtk_delayed_font_description_new (faces[j]);
-
-              gtk_list_store_insert_with_values (list_store, &iter, -1,
-                                                 FAMILY_COLUMN, families[i],
-                                                 FACE_COLUMN, faces[j],
-                                                 FONT_DESC_COLUMN, desc,
-                                                 PREVIEW_TITLE_COLUMN, title,
-                                                 -1);
-
-              g_free (title);
-              gtk_delayed_font_description_unref (desc);
-            }
-
-          g_free (faces);
-        }
+      g_free (faces);
    }

  g_free (families);
@@ -126,16 +126,17 @@ _gtk_gesture_swipe_clear_backlog (GtkGestureSwipe *gesture,
 }

 static void
-gtk_gesture_swipe_append_event (GtkGestureSwipe  *swipe,
-                                GdkEventSequence *sequence)
+gtk_gesture_swipe_update (GtkGesture       *gesture,
+                          GdkEventSequence *sequence)
 {
+  GtkGestureSwipe *swipe = GTK_GESTURE_SWIPE (gesture);
  GtkGestureSwipePrivate *priv;
  EventData new;
  gdouble x, y;

  priv = gtk_gesture_swipe_get_instance_private (swipe);
-  _gtk_gesture_get_last_update_time (GTK_GESTURE (swipe), sequence, &new.evtime);
-  gtk_gesture_get_point (GTK_GESTURE (swipe), sequence, &x, &y);
+  _gtk_gesture_get_last_update_time (gesture, sequence, &new.evtime);
+  gtk_gesture_get_point (gesture, sequence, &x, &y);

  new.point.x = x;
  new.point.y = y;
@@ -144,15 +145,6 @@ gtk_gesture_swipe_append_event (GtkGestureSwipe  *swipe,
  g_array_append_val (priv->events, new);
 }

-static void
-gtk_gesture_swipe_update (GtkGesture       *gesture,
-                          GdkEventSequence *sequence)
-{
-  GtkGestureSwipe *swipe = GTK_GESTURE_SWIPE (gesture);
-
-  gtk_gesture_swipe_append_event (swipe, sequence);
-}
-
 static void
 _gtk_gesture_swipe_calculate_velocity (GtkGestureSwipe *gesture,
                                       gdouble         *velocity_x,
@@ -206,8 +198,6 @@ gtk_gesture_swipe_end (GtkGesture       *gesture,
  if (gtk_gesture_is_active (gesture))
    return;

-  gtk_gesture_swipe_append_event (swipe, sequence);
-
  priv = gtk_gesture_swipe_get_instance_private (swipe);
  _gtk_gesture_swipe_calculate_velocity (swipe, &velocity_x, &velocity_y);
  g_signal_emit (gesture, signals[SWIPE], 0, velocity_x, velocity_y);
@@ -0,0 +1,42 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2000 Red Hat Software
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_IM_CONTEXT_SIMPLE_PRIVATE_H__
+#define __GTK_IM_CONTEXT_SIMPLE_PRIVATE_H__
+
+#include <glib.h>
+
+#include "gdk/gdkkeysyms.h"
+
+G_BEGIN_DECLS
+
+extern const GtkComposeTableCompact gtk_compose_table_compact;
+
+gboolean gtk_check_algorithmically (const guint16                *compose_buffer,
+                                    gint                          n_compose,
+                                    gunichar                     *output);
+gboolean gtk_check_compact_table   (const GtkComposeTableCompact *table,
+                                    guint16                      *compose_buffer,
+                                    gint                          n_compose,
+                                    gboolean                     *compose_finish,
+                                    gboolean                     *compose_match,
+                                    gunichar                     *output_char);
+
+G_END_DECLS
+
+
+#endif /* __GTK_IM_CONTEXT_SIMPLE_PRIVATE_H__ */
@@ -146,8 +146,7 @@ gtk_kinetic_scrolling_init_overshoot (GtkKineticScrolling *data,
 gboolean
 gtk_kinetic_scrolling_tick (GtkKineticScrolling *data,
                            gdouble              time_delta,
-                            gdouble             *position,
-                            gdouble             *velocity)
+                            gdouble             *position)
 {
  switch(data->phase)
    {
@@ -214,8 +213,6 @@ gtk_kinetic_scrolling_tick (GtkKineticScrolling *data,

  if (position)
    *position = data->position;
-  if (velocity)
-    *velocity = data->velocity;

  return data->phase != GTK_KINETIC_SCROLLING_PHASE_FINISHED;
 }
@@ -36,8 +36,7 @@ void                     gtk_kinetic_scrolling_free (GtkKineticScrolling  *kinet

 gboolean                 gtk_kinetic_scrolling_tick (GtkKineticScrolling  *data,
                                                     gdouble               time_delta,
-                                                     gdouble              *position,
-                                                     gdouble              *velocity);
+                                                     gdouble              *position);

 G_END_DECLS

@@ -167,6 +167,7 @@ typedef struct {

 DisplayDebugFlags debug_flags[N_DEBUG_DISPLAYS];

+#ifdef G_ENABLE_DEBUG
 static const GDebugKey gtk_debug_keys[] = {
  { "misc", GTK_DEBUG_MISC },
  { "plugsocket", GTK_DEBUG_PLUGSOCKET },
@@ -191,6 +192,7 @@ static const GDebugKey gtk_debug_keys[] = {
  { "resize", GTK_DEBUG_RESIZE },
  { "layout", GTK_DEBUG_LAYOUT }
 };
+#endif /* G_ENABLE_DEBUG */

 /**
 * gtk_get_major_version:
@@ -658,15 +660,12 @@ do_pre_parse_initialization (int    *argc,
  env_string = g_getenv ("GTK_DEBUG");
  if (env_string != NULL)
    {
+#ifdef G_ENABLE_DEBUG
      debug_flags[0].flags = g_parse_debug_string (env_string,
                                                   gtk_debug_keys,
                                                   G_N_ELEMENTS (gtk_debug_keys));
-#ifndef G_ENABLE_DEBUG
-      /* No need to print the warning for "interactive" since it's kept anyway. */
-      if (debug_flags[0].flags != GTK_DEBUG_INTERACTIVE)
-        g_warning ("GTK_DEBUG set but ignored because gtk isn't built with G_ENABLE_DEBUG");
-      /* Only keep "interactive" if not with G_ENABLE_DEBUG. */
-      debug_flags[0].flags &= GTK_DEBUG_INTERACTIVE;
+#else
+      g_warning ("GTK_DEBUG set but ignored because gtk isn't built with G_ENABLE_DEBUG");
 #endif  /* G_ENABLE_DEBUG */
      env_string = NULL;
    }
@@ -605,7 +605,7 @@ run_response_cb (GtkNativeDialog *self,
 * modal dialog (it prevents the user from interacting with other
 * windows in the same window group while the dialog is run), callbacks
 * such as timeouts, IO channel watches, DND drops, etc, will
- * be triggered during a gtk_native_dialog_run() call.
+ * be triggered during a gtk_nautilus_dialog_run() call.
 *
 * Returns: response ID
 *
@@ -48,7 +48,7 @@
 #include "gtkprogresstrackerprivate.h"
 #include "gtksettingsprivate.h"

-#include "fallback-c89.c"
+#include <math.h>

 /**
 * SECTION:gtkscrolledwindow
@@ -179,9 +179,6 @@
 #define DECELERATION_FRICTION 4
 #define OVERSHOOT_FRICTION 20
 #define SCROLL_CAPTURE_THRESHOLD_MS 150
-#define VELOCITY_ACCUMULATION_FLOOR 0.33
-#define VELOCITY_ACCUMULATION_CEIL 1.0
-#define VELOCITY_ACCUMULATION_MAX 6.0

 /* Animated scrolling */
 #define ANIMATION_DURATION 200
@@ -255,9 +252,6 @@ struct _GtkScrolledWindowPrivate
  /* Kinetic scrolling */
  GtkGesture *long_press_gesture;
  GtkGesture *swipe_gesture;
-  GtkKineticScrolling *hscrolling;
-  GtkKineticScrolling *vscrolling;
-  gint64 last_deceleration_time;

  GArray *scroll_history;
  GdkDevice *scroll_device;
@@ -285,6 +279,15 @@ struct _GtkScrolledWindowPrivate
  gdouble                unclamped_vadj_value;
 };

+typedef struct
+{
+  GtkScrolledWindow     *scrolled_window;
+  gint64                 last_deceleration_time;
+
+  GtkKineticScrolling   *hscrolling;
+  GtkKineticScrolling   *vscrolling;
+} KineticScrollData;
+
 enum {
  PROP_0,
  PROP_HADJUSTMENT,
@@ -2834,9 +2837,6 @@ gtk_scrolled_window_destroy (GtkWidget *widget)
      priv->deceleration_id = 0;
    }

-  g_clear_pointer (&priv->hscrolling, gtk_kinetic_scrolling_free);
-  g_clear_pointer (&priv->vscrolling, gtk_kinetic_scrolling_free);
-
  if (priv->scroll_events_overshoot_id)
    {
      g_source_remove (priv->scroll_events_overshoot_id);
@@ -3687,40 +3687,41 @@ scrolled_window_deceleration_cb (GtkWidget         *widget,
                                 GdkFrameClock     *frame_clock,
                                 gpointer           user_data)
 {
-  GtkScrolledWindow *scrolled_window = user_data;
+  KineticScrollData *data = user_data;
+  GtkScrolledWindow *scrolled_window = data->scrolled_window;
  GtkScrolledWindowPrivate *priv = scrolled_window->priv;
  GtkAdjustment *hadjustment, *vadjustment;
  gint64 current_time;
  gdouble position, elapsed;

  current_time = gdk_frame_clock_get_frame_time (frame_clock);
-  elapsed = (current_time - priv->last_deceleration_time) / (double)G_TIME_SPAN_SECOND;
-  priv->last_deceleration_time = current_time;
+  elapsed = (current_time - data->last_deceleration_time) / 1000000.0;
+  data->last_deceleration_time = current_time;

  hadjustment = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar));
  vadjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));

  gtk_scrolled_window_invalidate_overshoot (scrolled_window);

-  if (priv->hscrolling &&
-      gtk_kinetic_scrolling_tick (priv->hscrolling, elapsed, &position, NULL))
+  if (data->hscrolling &&
+      gtk_kinetic_scrolling_tick (data->hscrolling, elapsed, &position))
    {
      priv->unclamped_hadj_value = position;
      gtk_adjustment_set_value (hadjustment, position);
    }
-  else if (priv->hscrolling)
-    g_clear_pointer (&priv->hscrolling, gtk_kinetic_scrolling_free);
+  else if (data->hscrolling)
+    g_clear_pointer (&data->hscrolling, gtk_kinetic_scrolling_free);

-  if (priv->vscrolling &&
-      gtk_kinetic_scrolling_tick (priv->vscrolling, elapsed, &position, NULL))
+  if (data->vscrolling &&
+      gtk_kinetic_scrolling_tick (data->vscrolling, elapsed, &position))
    {
      priv->unclamped_vadj_value = position;
      gtk_adjustment_set_value (vadjustment, position);
    }
-  else if (priv->vscrolling)
-    g_clear_pointer (&priv->vscrolling, gtk_kinetic_scrolling_free);
+  else if (data->vscrolling)
+    g_clear_pointer (&data->vscrolling, gtk_kinetic_scrolling_free);

-  if (!priv->hscrolling && !priv->vscrolling)
+  if (!data->hscrolling && !data->vscrolling)
    {
      gtk_scrolled_window_cancel_deceleration (scrolled_window);
      return G_SOURCE_REMOVE;
@@ -3745,30 +3746,14 @@ gtk_scrolled_window_cancel_deceleration (GtkScrolledWindow *scrolled_window)
 }

 static void
-kinetic_scroll_stop_notify (GtkScrolledWindow *scrolled_window)
+kinetic_scroll_data_free (KineticScrollData *data)
 {
-  GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
-  priv->deceleration_id = 0;
-}
+  if (data->hscrolling)
+    gtk_kinetic_scrolling_free (data->hscrolling);
+  if (data->vscrolling)
+    gtk_kinetic_scrolling_free (data->vscrolling);

-static void
-gtk_scrolled_window_accumulate_velocity (GtkKineticScrolling **scrolling, double elapsed, double *velocity)
-{
-    double last_velocity;
-
-    if (!*scrolling)
-      return;
-
-    gtk_kinetic_scrolling_tick (*scrolling, elapsed, NULL, &last_velocity);
-    if (((*velocity >= 0) == (last_velocity >= 0)) &&
-        (fabs (*velocity) >= fabs (last_velocity) * VELOCITY_ACCUMULATION_FLOOR))
-      {
-        double min_velocity = last_velocity * VELOCITY_ACCUMULATION_FLOOR;
-        double max_velocity = last_velocity * VELOCITY_ACCUMULATION_CEIL;
-        double accumulation_multiplier = (*velocity - min_velocity) / (max_velocity - min_velocity);
-        *velocity += last_velocity * fmin (accumulation_multiplier, VELOCITY_ACCUMULATION_MAX);
-      }
-    g_clear_pointer (scrolling, gtk_kinetic_scrolling_free);
+  g_free (data);
 }

 static void
@@ -3776,29 +3761,26 @@ gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window)
 {
  GtkScrolledWindowPrivate *priv = scrolled_window->priv;
  GdkFrameClock *frame_clock;
-  gint64 current_time;
-  double elapsed;
+  KineticScrollData *data;

  g_return_if_fail (priv->deceleration_id == 0);

  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (scrolled_window));

-  current_time = gdk_frame_clock_get_frame_time (frame_clock);
-  elapsed = (current_time - priv->last_deceleration_time) / (double)G_TIME_SPAN_SECOND;
-  priv->last_deceleration_time = current_time;
+  data = g_new0 (KineticScrollData, 1);
+  data->scrolled_window = scrolled_window;
+  data->last_deceleration_time = gdk_frame_clock_get_frame_time (frame_clock);

  if (may_hscroll (scrolled_window))
    {
      gdouble lower,upper;
      GtkAdjustment *hadjustment;

-      gtk_scrolled_window_accumulate_velocity (&priv->hscrolling, elapsed, &priv->x_velocity);
-
      hadjustment = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar));
      lower = gtk_adjustment_get_lower (hadjustment);
      upper = gtk_adjustment_get_upper (hadjustment);
      upper -= gtk_adjustment_get_page_size (hadjustment);
-      priv->hscrolling =
+      data->hscrolling =
        gtk_kinetic_scrolling_new (lower,
                                   upper,
                                   MAX_OVERSHOOT_DISTANCE,
@@ -3807,21 +3789,17 @@ gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window)
                                   priv->unclamped_hadj_value,
                                   priv->x_velocity);
    }
-  else
-    g_clear_pointer (&priv->hscrolling, gtk_kinetic_scrolling_free);

  if (may_vscroll (scrolled_window))
    {
      gdouble lower,upper;
      GtkAdjustment *vadjustment;

-      gtk_scrolled_window_accumulate_velocity (&priv->vscrolling, elapsed, &priv->y_velocity);
-
      vadjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));
      lower = gtk_adjustment_get_lower(vadjustment);
      upper = gtk_adjustment_get_upper(vadjustment);
      upper -= gtk_adjustment_get_page_size(vadjustment);
-      priv->vscrolling =
+      data->vscrolling =
        gtk_kinetic_scrolling_new (lower,
                                   upper,
                                   MAX_OVERSHOOT_DISTANCE,
@@ -3830,13 +3808,11 @@ gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window)
                                   priv->unclamped_vadj_value,
                                   priv->y_velocity);
    }
-  else
-    g_clear_pointer (&priv->vscrolling, gtk_kinetic_scrolling_free);

  scrolled_window->priv->deceleration_id =
    gtk_widget_add_tick_callback (GTK_WIDGET (scrolled_window),
-                                  scrolled_window_deceleration_cb, scrolled_window,
-                                  (GDestroyNotify) kinetic_scroll_stop_notify);
+                                  scrolled_window_deceleration_cb, data,
+                                  (GDestroyNotify) kinetic_scroll_data_free);
 }

 static gboolean
@@ -2448,7 +2448,6 @@ gtk_settings_set_property_value_internal (GtkSettings            *settings,
  GQuark name_quark;

  if (!G_VALUE_HOLDS_LONG (&new_value->value) &&
-      !G_VALUE_HOLDS_FLOAT (&new_value->value) &&
      !G_VALUE_HOLDS_DOUBLE (&new_value->value) &&
      !G_VALUE_HOLDS_STRING (&new_value->value) &&
      !G_VALUE_HOLDS (&new_value->value, G_TYPE_GSTRING))
@@ -3444,20 +3443,14 @@ gtk_settings_load_from_key_file (GtkSettings       *settings,
            break;
          }

-        case G_TYPE_FLOAT:
        case G_TYPE_DOUBLE:
          {
            gdouble d_val;

-            g_value_init (&svalue.value, value_type);
+            g_value_init (&svalue.value, G_TYPE_DOUBLE);
            d_val = g_key_file_get_double (keyfile, "Settings", key, &error);
            if (!error)
-              {
-                if (value_type == G_TYPE_FLOAT)
-                  g_value_set_float (&svalue.value, (float) d_val);
-                else
-                  g_value_set_double (&svalue.value, d_val);
-              }
+              g_value_set_double (&svalue.value, d_val);
            break;
          }

@@ -2916,14 +2916,6 @@ gtk_render_insertion_cursor (GtkStyleContext *context,
                "gtk-cursor-aspect-ratio", &aspect_ratio,
                NULL);

-  /* Fall back to style property if the GtkSetting property is unchanged */
-  if (aspect_ratio == 0.04f)
-    {
-      gtk_style_context_get_style (context,
-                                   "cursor-aspect-ratio", &aspect_ratio,
-                                   NULL);
-    }
-
  keymap_direction = gdk_keymap_get_direction (gdk_keymap_get_for_display (gdk_screen_get_display (priv->screen)));

  pango_layout_get_cursor_pos (layout, index, &strong_pos, &weak_pos);
@@ -3011,14 +3003,6 @@ gtk_draw_insertion_cursor (GtkWidget          *widget,
                "gtk-cursor-aspect-ratio", &aspect_ratio,
                NULL);

-  /* Fall back to style property if the GtkSetting property is unchanged */
-  if (aspect_ratio == 0.04f)
-    {
-      gtk_style_context_get_style (context,
-                                   "cursor-aspect-ratio", &aspect_ratio,
-                                   NULL);
-    }
-
  draw_insertion_cursor (context, cr,
                         location->x, location->y, location->height,
                         aspect_ratio,
@@ -10258,17 +10258,9 @@ text_window_invalidate_cursors (GtkTextWindow *win)

  draw_arrow = (strong.x != weak.x || strong.y != weak.y);

-  g_object_get (gtk_widget_get_settings (win->widget),
-                "gtk-cursor-aspect-ratio", &cursor_aspect_ratio,
-                NULL);
-
-  /* Fall back to style property if the GtkSetting property is unchanged */
-  if (cursor_aspect_ratio == 0.04f)
-    {
-      gtk_widget_style_get (win->widget,
-                            "cursor-aspect-ratio", &cursor_aspect_ratio,
-                            NULL);
-    }
+  gtk_widget_style_get (win->widget,
+                        "cursor-aspect-ratio", &cursor_aspect_ratio,
+                        NULL);
  
  stem_width = strong.height * cursor_aspect_ratio + 1;
  arrow_width = stem_width + 1;
@@ -1065,32 +1065,9 @@ gtk_builder_tool = executable(
  install: true
 )

-extra_update_icon_cache_objs = []
-if win32_enabled
-  gen_uac_manifest = find_program('generate-uac-manifest.py')
-
-  uac_exe_pkg = 'gtk3'
-  uac_exe_name = 'gtk-update-icon-cache'
-
-  # Well, we have to forgo the xxx.exe.manifest in the output listing, since
-  # compile_resources doesn't like to consume targets with multiple outputs,
-  # and the xxx.exe.manifest and xxx.rc are tied together
-  uac_rc = custom_target(
-    'gtk/@0@.rc'.format(uac_exe_name),
-    output: ['@0@.rc'.format(uac_exe_name)],
-    command: [gen_uac_manifest,
-              '-p=@0@'.format(uac_exe_pkg),
-              '-n=@0@'.format(uac_exe_name),
-              '--pkg-version=@0@'.format(meson.project_version()),
-              '--output-dir=@OUTDIR@'],
-  )
-  extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc)
-endif
-
 gtk_update_icon_cache = executable(
  'gtk-update-icon-cache',
  'updateiconcache.c',
-  extra_update_icon_cache_objs,
  c_args: gtk_cargs,
  dependencies: libgtk_dep,
  install: true
@@ -1,6 +1,7 @@
 // When color definition differs for dark and light variant
 // it gets @if ed depending on $variant

+
 $base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 100%), 2%));
 $text_color: if($variant == 'light', black, white);
 $bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
@@ -916,14 +916,16 @@ button {
    $_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%);

    &:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
-      @include button(normal, $backimage: $_border_bg);
+      @include button(normal);

+      background-image: $button_fill, $_border_bg;
      border-color: transparent;
    }

    &:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
-      @include button(hover, $backimage: $_border_bg);
+      @include button(hover);

+      background-image: $button_fill, $_border_bg;
      border-color: transparent;
    }

@@ -1945,9 +1947,6 @@ filechooser .path-bar.linked > button {
 /**************
 * Tree Views *
 **************/
-
-$_treeview_borders_color: if($variant=='light',mix($borders_color, $base_color,80%),mix($fg_color, $base_color, 20%));
-
 treeview.view {
  @at-root * {
    -GtkTreeView-horizontal-separator: 4;
@@ -2131,7 +2130,7 @@ treeview.view {
  padding: 0 6px;
  background-image: none;
  border-style: none solid solid none;
-  border-color: $_treeview_borders_color;
+  border-color: $bg_color;
  border-radius: 0;
  text-shadow: none;

@@ -2664,11 +2663,11 @@ scrollbar {

  // slider
  slider {
-    min-width: 10px;
-    min-height: 10px;
+    min-width: 6px;
+    min-height: 6px;
    margin: -1px;
    border: 4px solid transparent;
-    border-radius: 10px;
+    border-radius: 8px;
    background-clip: padding-box;
    background-color: $scrollbar_slider_color;

@@ -2683,12 +2682,12 @@ scrollbar {

  &.fine-tune {
    slider {
-      min-width: 6px;
-      min-height: 6px;
+      min-width: 4px;
+      min-height: 4px;
    }

-    &.horizontal slider { border-width: 6px 4px; }
-    &.vertical slider { border-width: 4px 6px; }
+    &.horizontal slider { border-width: 5px 4px; }
+    &.vertical slider { border-width: 4px 5px; }
  }

  &.overlay-indicator {
@@ -4574,18 +4573,12 @@ decoration {
  }

  .maximized &,
-  .fullscreen & { border-radius: 0; box-shadow: none; }
-
+  .fullscreen &,
  .tiled &,
  .tiled-top &,
  .tiled-right &,
  .tiled-bottom &,
-  .tiled-left & {
-    border-radius: 0;
-    box-shadow: 0 0 0 1px $_wm_border_backdrop;
-
-    &:backdrop { box-shadow: 0 0 0 1px $_wm_border_backdrop; }
-   }
+  .tiled-left & { border-radius: 0; }

  .popup & { box-shadow: none; }

@@ -166,7 +166,7 @@
  }
 }

-@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none, $backimage: null) {
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none) {
 //
 // Button drawing function
 //
@@ -175,13 +175,13 @@
 // $tc:   optional text color for colored* types
 // $edge: set to none to not draw the bottom edge or specify a color to not
 //        use the default one
-// $backimage: additional background-image behind the default one
-//             (for the button.circular hack)
 //
 // possible $t values:
 // normal, hover, active, insensitive, insensitive-active,
 // backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
 // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
+//
+// This mixin sets the $button_fill global variable which containts the button background-image
 //
  $_hilight_color: _button_hilight_color($c);
  $_button_edge: if($edge == none, none, _widget_edge($edge));
@@ -196,9 +196,9 @@
    outline-color: transparentize($tc, 0.7);
    border-color: if($c != $bg_color, _border_color($c), $borders_color);
    border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
-    background-image: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
-                                              linear-gradient(to top, darken($c,1%) 2px, $c)),
-                      $backimage;
+    $button_fill: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
+                                          linear-gradient(to top, darken($c,1%) 2px, $c)) !global;
+    background-image: $button_fill;
    @include _button_text_shadow($tc, $c);
    @include _shadows(inset 0 1px $_hilight_color, $_button_edge, $_button_shadow);
  }
@@ -212,17 +212,16 @@
    border-color: if($c != $bg_color, _border_color($c), $borders_color);
    border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
    @if $variant == 'light' {
-      background-image: linear-gradient(to top, $c, lighten($c, 1%) 1px),
-                        $backimage;
+      $button_fill: linear-gradient(to top, $c, lighten($c, 1%) 1px) !global;
      @include _button_text_shadow($tc, lighten($c, 6%));
      @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)), $_button_edge, $_button_shadow);
    }
    @else {
-      background-image: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px),
-                        $backimage;
+      $button_fill: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px) !global;
      @include _button_text_shadow($tc,lighten($c, 6%));
      @include _shadows(inset 0 1px _button_hilight_color(darken($c, 2%)), $_button_edge, $_button_shadow);
    }
+    background-image: $button_fill;
  }

  @if $t==normal-alt {
@@ -253,15 +252,16 @@
    outline-color: transparentize($tc, 0.7);
    border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
    @if $variant == 'light' {
-      background-image: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%);
+      $button_fill: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%) !global;
      @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)),
                        $_button_edge, $_button_shadow);
    }
    @else {
-      background-image: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%);
+      $button_fill: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%) !global;
      @include _shadows(inset 0 1px $_hilight_color,
                        $_button_edge, $_button_shadow);
    }
+    background-image: $button_fill;
  }

  @else if $t==active {
@@ -271,7 +271,8 @@
    color: $tc;
    outline-color: transparentize($tc, 0.7);
    border-color: if($c != $bg_color, _border_color($c), $borders_color);
-    background-image: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%)));
+    $button_fill: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%))) !global;
+    background-image: $button_fill;
    @include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge);

    text-shadow: none;
@@ -286,7 +287,8 @@

    color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color);
    border-color: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    text-shadow: none;
    -gtk-icon-shadow: none;
    // white with 0 alpha to avoid an ugly transition, since no color means
@@ -303,7 +305,8 @@

    color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color);
    border-color: $_bc;
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    // white with 0 alpha to avoid an ugly transition, since no color means
    // black with 0 alpha
    @include _shadows(inset 0 1px transparentize(white, 1), $_button_edge);
@@ -318,7 +321,8 @@

    color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
    border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    text-shadow: none;
    -gtk-icon-shadow: none;
    @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
@@ -333,7 +337,8 @@

    color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
    border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
  }

@@ -347,7 +352,8 @@

    color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
    border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    text-shadow: none;
    -gtk-icon-shadow: none;
    // white with 0 alpha to avoid an ugly transition, since no color means
@@ -365,7 +371,8 @@

    color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
    border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
  }

@@ -378,7 +385,8 @@
    color: $osd_fg_color;
    border-color: $osd_borders_color;
    background-color: transparent;
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    background-clip: padding-box;
    box-shadow: inset 0 1px transparentize(white, 0.9);
    text-shadow: 0 1px black;
@@ -395,7 +403,8 @@
    color: white;
    border-color: $osd_borders_color;
    background-color: transparent;
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    background-clip: padding-box;
    box-shadow: inset 0 1px transparentize(white, 0.9);
    text-shadow: 0 1px black;
@@ -412,7 +421,8 @@
    color: white;
    border-color: $osd_borders_color;
    background-color: transparent;
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    background-clip: padding-box;
    box-shadow: none;
    text-shadow: none;
@@ -427,7 +437,8 @@
    color: $osd_insensitive_fg_color;
    border-color: $osd_borders_color;
    background-color: transparent;
-    background-image: image($osd_insensitive_bg_color);
+    $button_fill: image($osd_insensitive_bg_color) !global;
+    background-image: $button_fill;
    background-clip: padding-box;
    box-shadow: none;
    text-shadow: none;
@@ -443,7 +454,8 @@
    color: $osd_fg_color;
    border-color: $osd_borders_color;
    background-color: transparent;
-    background-image: image($_bg);
+    $button_fill: image($_bg) !global;
+    background-image: $button_fill;
    background-clip: padding-box;
    box-shadow: none;
    text-shadow: none;
@@ -456,7 +468,8 @@
  //
    border-color: transparent;
    background-color: transparent;
-    background-image: none;
+    $button_fill: none !global;
+    background-image: $button_fill;

    @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);

@@ -162,7 +162,7 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun

 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus + entry { border-left-color: #030c17; }

-.linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + entry, .linked:not(.vertical) > entry.error:focus + button, .linked:not(.vertical) > entry.error:focus + combobox > box > button.combo, .linked:not(.vertical) > entry.error:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry.error:focus + entry { border-left-color: #1a0000; }
+.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + button, .linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + entry { border-left-color: #1a0000; }

 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + button, .linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + entry { border-left-color: #4e9a06; }

@@ -174,13 +174,13 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun

 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { border-top-color: #030c17; }

-.linked.vertical > spinbutton:not(.vertical) + spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry.error:focus:not(:only-child), .linked.vertical > entry + spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry.error:focus:not(:only-child) { border-top-color: #1a0000; }
+.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus.error:not(:only-child) { border-top-color: #1a0000; }

 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + entry:drop(active):not(:only-child) { border-top-color: #4e9a06; }

 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #030c17; }

-.linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + button, .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #1a0000; }
+.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, .linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: #1a0000; }

 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, .linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: #4e9a06; }

@@ -220,17 +220,17 @@ button.titlebutton:hover, button.sidebar-button:hover, notebook > header > tabs

 button.titlebutton:hover:active, button.sidebar-button:hover:active, notebook > header > tabs > arrow:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }

-notebook > header > tabs > arrow:hover, button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, #373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: highlight; }
+notebook > header > tabs > arrow:hover, button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232, #373737 1px); -gtk-icon-effect: highlight; }

 notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }

-notebook > header > tabs > arrow:backdrop, button.flat:backdrop, button:backdrop { color: #919190; border-color: #202020; background-image: image(#353535); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
+notebook > header > tabs > arrow:backdrop, button:backdrop.flat, button:backdrop { color: #919190; border-color: #202020; background-image: image(#353535); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }

-notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.flat:backdrop:active, button.flat:backdrop:checked, button:backdrop:active, button:backdrop:checked { color: #919190; border-color: #202020; background-image: image(#2a2a2a); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button:backdrop.flat:active, button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { color: #919190; border-color: #202020; background-image: image(#2a2a2a); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-notebook > header > tabs > arrow:backdrop:disabled, button.flat:backdrop:disabled, button:backdrop:disabled { color: #5b5b5b; border-color: #202020; background-image: image(#323232); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled { color: #5b5b5b; border-color: #202020; background-image: image(#323232); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.flat:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #5b5b5b; border-color: #202020; background-image: image(#2a2a2a); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #5b5b5b; border-color: #202020; background-image: image(#2a2a2a); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

 button.titlebutton:backdrop, button.sidebar-button:backdrop, notebook > header > tabs > arrow:backdrop, button.titlebutton:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -288,7 +288,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);

 button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #15539e; }

-button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; background-image: linear-gradient(to top, #155099, #1655a2 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #155099, #1655a2 1px); }

 button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -320,7 +320,7 @@ button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3

 button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #b2161d; }

-button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #851015; border-bottom-color: #570b0e; background-image: linear-gradient(to top, #ae151c, #b7161d 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.638275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #851015; border-bottom-color: #570b0e; text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.638275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #ae151c, #b7161d 1px); }

 button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #851015; background-image: image(#8a1116); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -370,9 +370,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 4

 button.circular label { padding: 0; }

-button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, #353535), linear-gradient(to top, #070707 25%, #1b1b1b 50%); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
+button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, #353535); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232 2px, #353535), linear-gradient(to top, #070707 25%, #1b1b1b 50%); border-color: transparent; }

-button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, #373737 1px), linear-gradient(to top, #070707 25%, #1b1b1b 50%); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
+button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232, #373737 1px); background-image: linear-gradient(to top, #323232, #373737 1px), linear-gradient(to top, #070707 25%, #1b1b1b 50%); border-color: transparent; }

 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image { animation: needs_attention 150ms ease-in; background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#1f76e1), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.834353)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 2px; }

@@ -382,7 +382,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need

 .inline-toolbar toolbutton > button { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, #353535); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }

-.inline-toolbar toolbutton > button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, #373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+.inline-toolbar toolbutton > button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232, #373737 1px); }

 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -437,7 +437,7 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 /* tone down as per new designs, see issue #1473, #1748 */
 list row button.image-button:not(.flat) { border: 1px solid rgba(27, 27, 27, 0.5); }

-list row button.image-button:not(.flat):hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, #373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+list row button.image-button:not(.flat):hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232, #373737 1px); }

 list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -594,15 +594,15 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }

 .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; background-image: linear-gradient(to top, #155099, #1655a2 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #155099, #1655a2 1px); }

 .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, .selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode headerbar button.toggle:active, headerbar.selection-mode button:active, headerbar.selection-mode button:checked, headerbar.selection-mode button.toggle:checked, headerbar.selection-mode button.toggle:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

-.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button.flat:backdrop, .selection-mode headerbar button:backdrop, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button:backdrop { color: #d0ddec; border-color: #0f3b71; background-image: image(#15539e); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button:backdrop.flat, .selection-mode headerbar button:backdrop, headerbar.selection-mode button:backdrop.flat, headerbar.selection-mode button:backdrop { color: #d0ddec; border-color: #0f3b71; background-image: image(#15539e); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #030c17; }

-.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar button.flat:backdrop:active, .selection-mode headerbar button.flat:backdrop:checked, .selection-mode headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode button.flat:backdrop:active, headerbar.selection-mode button.flat:backdrop:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d0dae5; border-color: #0f3b71; background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar button:backdrop.flat:active, .selection-mode headerbar button:backdrop.flat:checked, .selection-mode headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode button:backdrop.flat:active, headerbar.selection-mode button:backdrop.flat:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d0dae5; border-color: #0f3b71; background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }

-.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode headerbar button.flat:backdrop:disabled, .selection-mode headerbar button:backdrop:disabled, headerbar.selection-mode button.flat:backdrop:disabled, headerbar.selection-mode button:backdrop:disabled { color: #6a8bb5; border-color: #0f3b71; background-image: image(#194d8d); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode headerbar button:backdrop.flat:disabled, .selection-mode headerbar button:backdrop:disabled, headerbar.selection-mode button:backdrop.flat:disabled, headerbar.selection-mode button:backdrop:disabled { color: #6a8bb5; border-color: #0f3b71; background-image: image(#194d8d); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }

 .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode headerbar button:backdrop:disabled:active, .selection-mode headerbar button:backdrop:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, headerbar.selection-mode button:backdrop:disabled:checked { color: #6885aa; border-color: #0f3b71; background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }

@@ -614,7 +614,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }

 .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode button.suggested-action { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, #353535); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #030c17; }

-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, #373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232, #373737 1px); border-color: #030c17; }

 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #030c17; }

@@ -704,9 +704,9 @@ treeview.view:backdrop { border-left-color: #636362; border-top: #353535; }

 treeview.view:drop(active) { border-style: solid none; border-width: 1px; border-color: #030c17; }

-treeview.view.after:drop(active) { border-top-style: none; }
+treeview.view:drop(active).after { border-top-style: none; }

-treeview.view.before:drop(active) { border-bottom-style: none; }
+treeview.view:drop(active).before { border-bottom-style: none; }

 treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); color: silver; }

@@ -746,7 +746,7 @@ treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.vie

 treeview.view acceleditor > label { background-color: #15539e; }

-treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #545453; border-radius: 0; text-shadow: none; }
+treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #353535; border-radius: 0; text-shadow: none; }

 treeview.view header button:disabled { border-color: #353535; background-image: none; }

@@ -911,21 +911,21 @@ notebook > header tab { min-height: 30px; min-width: 30px; padding: 3px 12px; ou

 notebook > header tab:hover { color: #eeeeec; background-color: #2b2b2b; }

-notebook > header tab.reorderable-page:hover { border-color: rgba(27, 27, 27, 0.3); background-color: rgba(53, 53, 53, 0.2); }
+notebook > header tab:hover.reorderable-page { border-color: rgba(27, 27, 27, 0.3); background-color: rgba(53, 53, 53, 0.2); }

 notebook > header tab:backdrop { color: #6c6c6c; }

-notebook > header tab.reorderable-page:backdrop { border-color: transparent; background-color: transparent; }
+notebook > header tab:backdrop.reorderable-page { border-color: transparent; background-color: transparent; }

 notebook > header tab:checked { color: #eeeeec; }

-notebook > header tab.reorderable-page:checked { border-color: rgba(27, 27, 27, 0.5); background-color: rgba(53, 53, 53, 0.5); }
+notebook > header tab:checked.reorderable-page { border-color: rgba(27, 27, 27, 0.5); background-color: rgba(53, 53, 53, 0.5); }

-notebook > header tab.reorderable-page:checked:hover { background-color: rgba(53, 53, 53, 0.7); }
+notebook > header tab:checked.reorderable-page:hover { background-color: rgba(53, 53, 53, 0.7); }

 notebook > header tab:backdrop:checked { color: #919190; }

-notebook > header tab.reorderable-page:backdrop:checked { border-color: #202020; background-color: #353535; }
+notebook > header tab:backdrop:checked.reorderable-page { border-color: #202020; background-color: #353535; }

 notebook > header tab button.flat { padding: 0; margin-top: 4px; margin-bottom: 4px; min-width: 20px; min-height: 20px; }

@@ -984,7 +984,7 @@ scrollbar.right { border-left: 1px solid #1b1b1b; }

 scrollbar:backdrop { background-color: #2d2d2d; border-color: #202020; transition: 200ms ease-out; }

-scrollbar slider { min-width: 10px; min-height: 10px; margin: -1px; border: 4px solid transparent; border-radius: 10px; background-clip: padding-box; background-color: #a4a4a3; }
+scrollbar slider { min-width: 6px; min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; background-clip: padding-box; background-color: #a4a4a3; }

 scrollbar slider:hover { background-color: #c9c9c7; }

@@ -994,11 +994,11 @@ scrollbar slider:backdrop { background-color: #5a5a59; }

 scrollbar slider:disabled { background-color: transparent; }

-scrollbar.fine-tune slider { min-width: 6px; min-height: 6px; }
+scrollbar.fine-tune slider { min-width: 4px; min-height: 4px; }

-scrollbar.fine-tune.horizontal slider { border-width: 6px 4px; }
+scrollbar.fine-tune.horizontal slider { border-width: 5px 4px; }

-scrollbar.fine-tune.vertical slider { border-width: 4px 6px; }
+scrollbar.fine-tune.vertical slider { border-width: 4px 5px; }

 scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; background-color: transparent; }

@@ -1006,13 +1006,13 @@ scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; mi

 scrollbar.overlay-indicator:not(.dragging):not(.hovering) button { min-width: 5px; min-height: 5px; background-color: #eeeeec; background-clip: padding-box; border-radius: 100%; border: 1px solid black; -gtk-icon-source: none; }

-scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) slider { margin: 0 2px; min-width: 40px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { margin: 0 2px; min-width: 40px; }

-scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) button { margin: 1px 2px; min-width: 5px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal button { margin: 1px 2px; min-width: 5px; }

-scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) slider { margin: 2px 0; min-height: 40px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { margin: 2px 0; min-height: 40px; }

-scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) button { margin: 2px 1px; min-height: 5px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical button { margin: 2px 1px; min-height: 5px; }

 scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { opacity: 0.8; }

@@ -1059,7 +1059,7 @@ switch slider { margin: -1px; min-width: 24px; min-height: 24px; border: 1px sol

 switch image { color: transparent; }

-switch:hover slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #111111; background-image: linear-gradient(to bottom, #444444 20%, #3a3a3a 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+switch:hover slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #111111; box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, #444444 20%, #3a3a3a 90%); }

 switch:checked > slider { border: 1px solid #030c17; }

@@ -1233,7 +1233,7 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b

 scale slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); background-image: linear-gradient(to bottom, #2d2d2d 20%, #262626 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); border: 1px solid black; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }

-scale slider:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #070707; background-image: linear-gradient(to bottom, #353535 20%, #2b2b2b 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+scale slider:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #070707; box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, #353535 20%, #2b2b2b 90%); }

 scale slider:active { border-color: #030c17; }

@@ -1285,99 +1285,99 @@ scale.vertical.fine-tune indicator { min-width: 3px; }

 scale.horizontal.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.color { min-height: 0; min-width: 0; }

@@ -1548,7 +1548,7 @@ row.activatable:backdrop:hover { background-color: transparent; }

 row.activatable:selected:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }

-row.activatable.has-open-popup:selected, row.activatable:selected:hover { background-color: #2b62a6; }
+row.activatable:selected.has-open-popup, row.activatable:selected:hover { background-color: #2b62a6; }

 row.activatable:selected:backdrop { background-color: #15539e; }

@@ -1619,9 +1619,9 @@ filechooserbutton:drop(active) { box-shadow: none; border-color: transparent; }
 /*********** Sidebar * */
 .sidebar { border-style: none; background-color: #313131; }

-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:not(separator):dir(ltr), .sidebar.left:not(separator) { border-right: 1px solid #1b1b1b; border-left-style: none; }
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:not(separator):dir(ltr), .sidebar:not(separator).left { border-right: 1px solid #1b1b1b; border-left-style: none; }

-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), .sidebar.right:not(separator) { border-left: 1px solid #1b1b1b; border-right-style: none; }
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), .sidebar:not(separator).right { border-left: 1px solid #1b1b1b; border-right-style: none; }

 .sidebar:backdrop { background-color: #323232; border-color: #202020; transition: 200ms ease-out; }

@@ -1728,7 +1728,7 @@ infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, info

 infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, #353535); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }

-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, #373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232, #373737 1px); }

 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -1790,9 +1790,9 @@ colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); }

 colorswatch:drop(active) { box-shadow: none; }

-colorswatch.light:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #1b1b1b, inset 0 0 0 1px #4e9a06; }
+colorswatch:drop(active).light overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #1b1b1b, inset 0 0 0 1px #4e9a06; }

-colorswatch.dark:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #1b1b1b, inset 0 0 0 1px #4e9a06; }
+colorswatch:drop(active).dark overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #1b1b1b, inset 0 0 0 1px #4e9a06; }

 colorswatch overlay { border: 1px solid #1b1b1b; }

@@ -1806,7 +1806,7 @@ colorswatch#add-color-button:only-child { border-radius: 5px; }

 colorswatch#add-color-button overlay { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, #353535); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }

-colorswatch#add-color-button overlay:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, #373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+colorswatch#add-color-button overlay:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232, #373737 1px); }

 colorswatch#add-color-button overlay:backdrop { color: #919190; border-color: #202020; background-image: image(#353535); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

@@ -1838,11 +1838,7 @@ decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9p

 decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 27, 27, 0.9); transition: 200ms ease-out; }

-.maximized decoration, .fullscreen decoration { border-radius: 0; box-shadow: none; }
-
-.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); }
-
-.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); }
+.maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; }

 .popup decoration { box-shadow: none; }

@@ -162,7 +162,7 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun

 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus + entry { border-left-color: #3584e4; }

-.linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + entry, .linked:not(.vertical) > entry.error:focus + button, .linked:not(.vertical) > entry.error:focus + combobox > box > button.combo, .linked:not(.vertical) > entry.error:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry.error:focus + entry { border-left-color: #cc0000; }
+.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + button, .linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + entry { border-left-color: #cc0000; }

 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + button, .linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + entry { border-left-color: #4e9a06; }

@@ -174,13 +174,13 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun

 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { border-top-color: #3584e4; }

-.linked.vertical > spinbutton:not(.vertical) + spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry.error:focus:not(:only-child), .linked.vertical > entry + spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry.error:focus:not(:only-child) { border-top-color: #cc0000; }
+.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus.error:not(:only-child) { border-top-color: #cc0000; }

 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + entry:drop(active):not(:only-child) { border-top-color: #4e9a06; }

 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #3584e4; }

-.linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + button, .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #cc0000; }
+.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, .linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: #cc0000; }

 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, .linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: #4e9a06; }

@@ -220,17 +220,17 @@ button.titlebutton:hover, button.sidebar-button:hover, notebook > header > tabs

 button.titlebutton:hover:active, button.sidebar-button:hover:active, notebook > header > tabs > arrow:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }

-notebook > header > tabs > arrow:hover, button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: highlight; }
+notebook > header > tabs > arrow:hover, button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); -gtk-icon-effect: highlight; }

 notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, button:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }

-notebook > header > tabs > arrow:backdrop, button.flat:backdrop, button:backdrop { color: #929595; border-color: #d5d0cc; background-image: image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
+notebook > header > tabs > arrow:backdrop, button:backdrop.flat, button:backdrop { color: #929595; border-color: #d5d0cc; background-image: image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }

-notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.flat:backdrop:active, button.flat:backdrop:checked, button:backdrop:active, button:backdrop:checked { color: #929595; border-color: #d5d0cc; background-image: image(#e4e4e0); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button:backdrop.flat:active, button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { color: #929595; border-color: #d5d0cc; background-image: image(#e4e4e0); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-notebook > header > tabs > arrow:backdrop:disabled, button.flat:backdrop:disabled, button:backdrop:disabled { color: #d4cfca; border-color: #d5d0cc; background-image: image(#faf9f8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled { color: #d4cfca; border-color: #d5d0cc; background-image: image(#faf9f8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.flat:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #d4cfca; border-color: #d5d0cc; background-image: image(#e4e4e0); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #d4cfca; border-color: #d5d0cc; background-image: image(#e4e4e0); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

 button.titlebutton:backdrop, button.sidebar-button:backdrop, notebook > header > tabs > arrow:backdrop, button.titlebutton:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -290,7 +290,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);

 button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #3584e4; }

-button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; background-image: linear-gradient(to top, #3584e4, #3987e5 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #3584e4, #3987e5 1px); }

 button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; background-image: image(#1961b9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -322,7 +322,7 @@ button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3

 button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #e01b24; }

-button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #b2161d; border-bottom-color: #851015; background-image: linear-gradient(to top, #e01b24, #e41c26 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.558275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.558275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #b2161d; border-bottom-color: #851015; text-shadow: 0 -1px rgba(0, 0, 0, 0.558275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.558275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #e01b24, #e41c26 1px); }

 button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #b2161d; background-image: image(#a0131a); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -372,9 +372,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 4

 button.circular label { padding: 0; }

-button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4), linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
+button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4), linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); border-color: transparent; }

-button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px), linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
+button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px), linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); border-color: transparent; }

 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image { animation: needs_attention 150ms ease-in; background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#3584e4), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.769231)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 4px; }

@@ -384,7 +384,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need

 .inline-toolbar toolbutton > button { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }

-.inline-toolbar toolbutton > button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+.inline-toolbar toolbutton > button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); }

 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -445,7 +445,7 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 /* tone down as per new designs, see issue #1473, #1748 */
 list row button.image-button:not(.flat) { border: 1px solid rgba(205, 199, 194, 0.5); }

-list row button.image-button:not(.flat):hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+list row button.image-button:not(.flat):hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); }

 list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -602,15 +602,15 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }

 .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; background-image: linear-gradient(to top, #3584e4, #3987e5 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #3584e4, #3987e5 1px); }

 .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, .selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode headerbar button.toggle:active, headerbar.selection-mode button:active, headerbar.selection-mode button:checked, headerbar.selection-mode button.toggle:checked, headerbar.selection-mode button.toggle:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; background-image: image(#1961b9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

-.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button.flat:backdrop, .selection-mode headerbar button:backdrop, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button:backdrop { color: #d7e6fa; border-color: #3584e4; background-image: image(#3584e4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button:backdrop.flat, .selection-mode headerbar button:backdrop, headerbar.selection-mode button:backdrop.flat, headerbar.selection-mode button:backdrop { color: #d7e6fa; border-color: #3584e4; background-image: image(#3584e4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #185fb4; }

-.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar button.flat:backdrop:active, .selection-mode headerbar button.flat:backdrop:checked, .selection-mode headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode button.flat:backdrop:active, headerbar.selection-mode button.flat:backdrop:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d5e6f9; border-color: #2f80e3; background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar button:backdrop.flat:active, .selection-mode headerbar button:backdrop.flat:checked, .selection-mode headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode button:backdrop.flat:active, headerbar.selection-mode button:backdrop.flat:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d5e6f9; border-color: #2f80e3; background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }

-.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode headerbar button.flat:backdrop:disabled, .selection-mode headerbar button:backdrop:disabled, headerbar.selection-mode button.flat:backdrop:disabled, headerbar.selection-mode button:backdrop:disabled { color: #8fbbf0; border-color: #5396e8; background-image: image(#5396e8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode headerbar button:backdrop.flat:disabled, .selection-mode headerbar button:backdrop:disabled, headerbar.selection-mode button:backdrop.flat:disabled, headerbar.selection-mode button:backdrop:disabled { color: #8fbbf0; border-color: #5396e8; background-image: image(#5396e8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }

 .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode headerbar button:backdrop:disabled:active, .selection-mode headerbar button:backdrop:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, headerbar.selection-mode button:backdrop:disabled:checked { color: #78aced; border-color: #2f80e3; background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }

@@ -622,7 +622,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }

 .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode button.suggested-action { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #185fb4; }

-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); border-color: #185fb4; }

 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #185fb4; }

@@ -712,9 +712,9 @@ treeview.view:backdrop { border-left-color: #c4c5c5; border-top: #f6f5f4; }

 treeview.view:drop(active) { border-style: solid none; border-width: 1px; border-color: #185fb4; }

-treeview.view.after:drop(active) { border-top-style: none; }
+treeview.view:drop(active).after { border-top-style: none; }

-treeview.view.before:drop(active) { border-bottom-style: none; }
+treeview.view:drop(active).before { border-bottom-style: none; }

 treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); color: #4d4d4d; }

@@ -754,7 +754,7 @@ treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.vie

 treeview.view acceleditor > label { background-color: #3584e4; }

-treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #d7d2ce; border-radius: 0; text-shadow: none; }
+treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #f6f5f4; border-radius: 0; text-shadow: none; }

 treeview.view header button:disabled { border-color: #f6f5f4; background-image: none; }

@@ -919,21 +919,21 @@ notebook > header tab { min-height: 30px; min-width: 30px; padding: 3px 12px; ou

 notebook > header tab:hover { color: #2e3436; background-color: #edebe9; }

-notebook > header tab.reorderable-page:hover { border-color: rgba(205, 199, 194, 0.3); background-color: rgba(246, 245, 244, 0.2); }
+notebook > header tab:hover.reorderable-page { border-color: rgba(205, 199, 194, 0.3); background-color: rgba(246, 245, 244, 0.2); }

 notebook > header tab:backdrop { color: #babbbb; }

-notebook > header tab.reorderable-page:backdrop { border-color: transparent; background-color: transparent; }
+notebook > header tab:backdrop.reorderable-page { border-color: transparent; background-color: transparent; }

 notebook > header tab:checked { color: #2e3436; }

-notebook > header tab.reorderable-page:checked { border-color: rgba(205, 199, 194, 0.5); background-color: rgba(246, 245, 244, 0.5); }
+notebook > header tab:checked.reorderable-page { border-color: rgba(205, 199, 194, 0.5); background-color: rgba(246, 245, 244, 0.5); }

-notebook > header tab.reorderable-page:checked:hover { background-color: rgba(246, 245, 244, 0.7); }
+notebook > header tab:checked.reorderable-page:hover { background-color: rgba(246, 245, 244, 0.7); }

 notebook > header tab:backdrop:checked { color: #929595; }

-notebook > header tab.reorderable-page:backdrop:checked { border-color: #d5d0cc; background-color: #f6f5f4; }
+notebook > header tab:backdrop:checked.reorderable-page { border-color: #d5d0cc; background-color: #f6f5f4; }

 notebook > header tab button.flat { padding: 0; margin-top: 4px; margin-bottom: 4px; min-width: 20px; min-height: 20px; }

@@ -992,7 +992,7 @@ scrollbar.right { border-left: 1px solid #cdc7c2; }

 scrollbar:backdrop { background-color: #efedec; border-color: #d5d0cc; transition: 200ms ease-out; }

-scrollbar slider { min-width: 10px; min-height: 10px; margin: -1px; border: 4px solid transparent; border-radius: 10px; background-clip: padding-box; background-color: #7e8182; }
+scrollbar slider { min-width: 6px; min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; background-clip: padding-box; background-color: #7e8182; }

 scrollbar slider:hover { background-color: #565b5c; }

@@ -1002,11 +1002,11 @@ scrollbar slider:backdrop { background-color: #cecfce; }

 scrollbar slider:disabled { background-color: transparent; }

-scrollbar.fine-tune slider { min-width: 6px; min-height: 6px; }
+scrollbar.fine-tune slider { min-width: 4px; min-height: 4px; }

-scrollbar.fine-tune.horizontal slider { border-width: 6px 4px; }
+scrollbar.fine-tune.horizontal slider { border-width: 5px 4px; }

-scrollbar.fine-tune.vertical slider { border-width: 4px 6px; }
+scrollbar.fine-tune.vertical slider { border-width: 4px 5px; }

 scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; background-color: transparent; }

@@ -1014,13 +1014,13 @@ scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; mi

 scrollbar.overlay-indicator:not(.dragging):not(.hovering) button { min-width: 5px; min-height: 5px; background-color: #2e3436; background-clip: padding-box; border-radius: 100%; border: 1px solid white; -gtk-icon-source: none; }

-scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) slider { margin: 0 2px; min-width: 40px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { margin: 0 2px; min-width: 40px; }

-scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) button { margin: 1px 2px; min-width: 5px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal button { margin: 1px 2px; min-width: 5px; }

-scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) slider { margin: 2px 0; min-height: 40px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { margin: 2px 0; min-height: 40px; }

-scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) button { margin: 2px 1px; min-height: 5px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical button { margin: 2px 1px; min-height: 5px; }

 scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { opacity: 0.8; }

@@ -1067,7 +1067,7 @@ switch slider { margin: -1px; min-width: 24px; min-height: 24px; border: 1px sol

 switch image { color: transparent; }

-switch:hover slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; background-image: linear-gradient(to bottom, white 10%, white 90%); box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+switch:hover slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, white 10%, white 90%); }

 switch:checked > slider { border: 1px solid #15539e; }

@@ -1249,7 +1249,7 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b

 scale slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); background-image: linear-gradient(to bottom, white 20%, #f6f5f4 90%); box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); border: 1px solid #b8b0a8; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }

-scale slider:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; background-image: linear-gradient(to bottom, white 10%, white 90%); box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+scale slider:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, white 10%, white 90%); }

 scale slider:active { border-color: #185fb4; }

@@ -1301,99 +1301,99 @@ scale.vertical.fine-tune indicator { min-width: 3px; }

 scale.horizontal.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.color { min-height: 0; min-width: 0; }

@@ -1564,7 +1564,7 @@ row.activatable:backdrop:hover { background-color: transparent; }

 row.activatable:selected:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }

-row.activatable.has-open-popup:selected, row.activatable:selected:hover { background-color: #347cd3; }
+row.activatable:selected.has-open-popup, row.activatable:selected:hover { background-color: #347cd3; }

 row.activatable:selected:backdrop { background-color: #3584e4; }

@@ -1635,9 +1635,9 @@ filechooserbutton:drop(active) { box-shadow: none; border-color: transparent; }
 /*********** Sidebar * */
 .sidebar { border-style: none; background-color: #fbfafa; }

-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:not(separator):dir(ltr), .sidebar.left:not(separator) { border-right: 1px solid #cdc7c2; border-left-style: none; }
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:not(separator):dir(ltr), .sidebar:not(separator).left { border-right: 1px solid #cdc7c2; border-left-style: none; }

-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), .sidebar.right:not(separator) { border-left: 1px solid #cdc7c2; border-right-style: none; }
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), .sidebar:not(separator).right { border-left: 1px solid #cdc7c2; border-right-style: none; }

 .sidebar:backdrop { background-color: #f9f9f8; border-color: #d5d0cc; transition: 200ms ease-out; }

@@ -1744,7 +1744,7 @@ infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, info

 infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }

-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); }

 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -1806,9 +1806,9 @@ colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); }

 colorswatch:drop(active) { box-shadow: none; }

-colorswatch.light:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #3d7805, inset 0 0 0 1px #4e9a06; }
+colorswatch:drop(active).light overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #3d7805, inset 0 0 0 1px #4e9a06; }

-colorswatch.dark:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; }
+colorswatch:drop(active).dark overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; }

 colorswatch overlay { border: 1px solid rgba(0, 0, 0, 0.3); }

@@ -1822,7 +1822,7 @@ colorswatch#add-color-button:only-child { border-radius: 5px; }

 colorswatch#add-color-button overlay { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }

-colorswatch#add-color-button overlay:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+colorswatch#add-color-button overlay:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); }

 colorswatch#add-color-button overlay:backdrop { color: #929595; border-color: #d5d0cc; background-image: image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

@@ -1854,11 +1854,7 @@ decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9p

 decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); transition: 200ms ease-out; }

-.maximized decoration, .fullscreen decoration { border-radius: 0; box-shadow: none; }
-
-.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); }
-
-.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); }
+.maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; }

 .popup decoration { box-shadow: none; }

@@ -242,7 +242,7 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun

 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus + entry { border-left-color: black; }

-.linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + entry, .linked:not(.vertical) > entry.error:focus + button, .linked:not(.vertical) > entry.error:focus + combobox > box > button.combo, .linked:not(.vertical) > entry.error:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry.error:focus + entry { border-left-color: #1a0000; }
+.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + button, .linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + entry { border-left-color: #1a0000; }

 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + button, .linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + entry { border-left-color: #4e9a06; }

@@ -254,13 +254,13 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun

 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { border-top-color: black; }

-.linked.vertical > spinbutton:not(.vertical) + spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry.error:focus:not(:only-child), .linked.vertical > entry + spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry.error:focus:not(:only-child) { border-top-color: #1a0000; }
+.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus.error:not(:only-child) { border-top-color: #1a0000; }

 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + entry:drop(active):not(:only-child) { border-top-color: #4e9a06; }

 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: black; }

-.linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + button, .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #1a0000; }
+.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, .linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: #1a0000; }

 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, .linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: #4e9a06; }

@@ -300,17 +300,17 @@ button.titlebutton:hover, button.sidebar-button:hover, notebook > header > tabs

 button.titlebutton:hover:active, button.sidebar-button:hover:active, notebook > header > tabs > arrow:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }

-notebook > header > tabs > arrow:hover, button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, #323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: highlight; }
+notebook > header > tabs > arrow:hover, button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); -gtk-icon-effect: highlight; }

 notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, button:checked { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; background-image: image(#191919); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }

-notebook > header > tabs > arrow:backdrop, button.flat:backdrop, button:backdrop { color: #919190; border-color: #202020; background-image: image(#353535); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
+notebook > header > tabs > arrow:backdrop, button:backdrop.flat, button:backdrop { color: #919190; border-color: #202020; background-image: image(#353535); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }

-notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.flat:backdrop:active, button.flat:backdrop:checked, button:backdrop:active, button:backdrop:checked { color: #919190; border-color: #202020; background-image: image(#252525); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button:backdrop.flat:active, button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { color: #919190; border-color: #202020; background-image: image(#252525); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-notebook > header > tabs > arrow:backdrop:disabled, button.flat:backdrop:disabled, button:backdrop:disabled { color: #5b5b5b; border-color: #202020; background-image: image(#2f2f2f); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled { color: #5b5b5b; border-color: #202020; background-image: image(#2f2f2f); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.flat:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #5b5b5b; border-color: #202020; background-image: image(#252525); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #5b5b5b; border-color: #202020; background-image: image(#252525); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

 button.titlebutton:backdrop, button.sidebar-button:backdrop, notebook > header > tabs > arrow:backdrop, button.titlebutton:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -368,7 +368,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);

 button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #15539e; }

-button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; background-image: linear-gradient(to top, #155099, #1655a2 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #155099, #1655a2 1px); }

 button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -400,7 +400,7 @@ button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3

 button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #b2161d; }

-button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #851015; border-bottom-color: #570b0e; background-image: linear-gradient(to top, #ae151c, #b7161d 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.638275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #851015; border-bottom-color: #570b0e; text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.638275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #ae151c, #b7161d 1px); }

 button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #851015; background-image: image(#8a1116); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -450,9 +450,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 4

 button.circular label { padding: 0; }

-button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, #303030), linear-gradient(to top, #4e4e4e 25%, #686868 50%); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
+button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, #303030); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d 2px, #303030), linear-gradient(to top, #4e4e4e 25%, #686868 50%); border-color: transparent; }

-button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, #323232 1px), linear-gradient(to top, #4e4e4e 25%, #686868 50%); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
+button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); background-image: linear-gradient(to top, #2d2d2d, #323232 1px), linear-gradient(to top, #4e4e4e 25%, #686868 50%); border-color: transparent; }

 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image { animation: needs_attention 150ms ease-in; background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#185fb4), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.850353)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 2px; }

@@ -462,7 +462,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need

 .inline-toolbar toolbutton > button { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, #303030); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }

-.inline-toolbar toolbutton > button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, #323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+.inline-toolbar toolbutton > button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); }

 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; background-image: image(#191919); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -517,7 +517,7 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 /* tone down as per new designs, see issue #1473, #1748 */
 list row button.image-button:not(.flat) { border: 1px solid rgba(104, 104, 104, 0.5); }

-list row button.image-button:not(.flat):hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, #323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+list row button.image-button:not(.flat):hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); }

 list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; background-image: image(#191919); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -674,15 +674,15 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }

 .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; background-image: linear-gradient(to top, #155099, #1655a2 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #155099, #1655a2 1px); }

 .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, .selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode headerbar button.toggle:active, headerbar.selection-mode button:active, headerbar.selection-mode button:checked, headerbar.selection-mode button.toggle:checked, headerbar.selection-mode button.toggle:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

-.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button.flat:backdrop, .selection-mode headerbar button:backdrop, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button:backdrop { color: #d0ddec; border-color: #0f3b71; background-image: image(#15539e); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button:backdrop.flat, .selection-mode headerbar button:backdrop, headerbar.selection-mode button:backdrop.flat, headerbar.selection-mode button:backdrop { color: #d0ddec; border-color: #0f3b71; background-image: image(#15539e); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #030c17; }

-.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar button.flat:backdrop:active, .selection-mode headerbar button.flat:backdrop:checked, .selection-mode headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode button.flat:backdrop:active, headerbar.selection-mode button.flat:backdrop:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d0dae5; border-color: #0f3b71; background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar button:backdrop.flat:active, .selection-mode headerbar button:backdrop.flat:checked, .selection-mode headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode button:backdrop.flat:active, headerbar.selection-mode button:backdrop.flat:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d0dae5; border-color: #0f3b71; background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }

-.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode headerbar button.flat:backdrop:disabled, .selection-mode headerbar button:backdrop:disabled, headerbar.selection-mode button.flat:backdrop:disabled, headerbar.selection-mode button:backdrop:disabled { color: #6a8bb5; border-color: #0f3b71; background-image: image(#194d8d); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode headerbar button:backdrop.flat:disabled, .selection-mode headerbar button:backdrop:disabled, headerbar.selection-mode button:backdrop.flat:disabled, headerbar.selection-mode button:backdrop:disabled { color: #6a8bb5; border-color: #0f3b71; background-image: image(#194d8d); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }

 .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode headerbar button:backdrop:disabled:active, .selection-mode headerbar button:backdrop:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, headerbar.selection-mode button:backdrop:disabled:checked { color: #6885aa; border-color: #0f3b71; background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }

@@ -694,7 +694,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }

 .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode button.suggested-action { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, #303030); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #030c17; }

-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, #323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); border-color: #030c17; }

 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; background-image: image(#191919); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #030c17; }

@@ -784,9 +784,9 @@ treeview.view:backdrop { border-left-color: #636362; border-top: #353535; }

 treeview.view:drop(active) { border-style: solid none; border-width: 1px; border-color: black; }

-treeview.view.after:drop(active) { border-top-style: none; }
+treeview.view:drop(active).after { border-top-style: none; }

-treeview.view.before:drop(active) { border-bottom-style: none; }
+treeview.view:drop(active).before { border-bottom-style: none; }

 treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); color: silver; }

@@ -826,7 +826,7 @@ treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.vie

 treeview.view acceleditor > label { background-color: #0f3b71; }

-treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #555554; border-radius: 0; text-shadow: none; }
+treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #303030; border-radius: 0; text-shadow: none; }

 treeview.view header button:disabled { border-color: #303030; background-image: none; }

@@ -991,21 +991,21 @@ notebook > header tab { min-height: 30px; min-width: 30px; padding: 3px 12px; ou

 notebook > header tab:hover { color: #f3f3f1; background-color: #262626; }

-notebook > header tab.reorderable-page:hover { border-color: rgba(104, 104, 104, 0.3); background-color: rgba(48, 48, 48, 0.2); }
+notebook > header tab:hover.reorderable-page { border-color: rgba(104, 104, 104, 0.3); background-color: rgba(48, 48, 48, 0.2); }

 notebook > header tab:backdrop { color: #6c6c6c; }

-notebook > header tab.reorderable-page:backdrop { border-color: transparent; background-color: transparent; }
+notebook > header tab:backdrop.reorderable-page { border-color: transparent; background-color: transparent; }

 notebook > header tab:checked { color: #f3f3f1; }

-notebook > header tab.reorderable-page:checked { border-color: rgba(104, 104, 104, 0.5); background-color: rgba(48, 48, 48, 0.5); }
+notebook > header tab:checked.reorderable-page { border-color: rgba(104, 104, 104, 0.5); background-color: rgba(48, 48, 48, 0.5); }

-notebook > header tab.reorderable-page:checked:hover { background-color: rgba(48, 48, 48, 0.7); }
+notebook > header tab:checked.reorderable-page:hover { background-color: rgba(48, 48, 48, 0.7); }

 notebook > header tab:backdrop:checked { color: #919190; }

-notebook > header tab.reorderable-page:backdrop:checked { border-color: #202020; background-color: #353535; }
+notebook > header tab:backdrop:checked.reorderable-page { border-color: #202020; background-color: #353535; }

 notebook > header tab button.flat { padding: 0; margin-top: 4px; margin-bottom: 4px; min-width: 20px; min-height: 20px; }

@@ -1086,13 +1086,13 @@ scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; mi

 scrollbar.overlay-indicator:not(.dragging):not(.hovering) button { min-width: 5px; min-height: 5px; background-color: #f3f3f1; background-clip: padding-box; border-radius: 100%; border: 1px solid black; -gtk-icon-source: none; }

-scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) slider { margin: 0 2px; min-width: 40px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { margin: 0 2px; min-width: 40px; }

-scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) button { margin: 1px 2px; min-width: 5px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal button { margin: 1px 2px; min-width: 5px; }

-scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) slider { margin: 2px 0; min-height: 40px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { margin: 2px 0; min-height: 40px; }

-scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) button { margin: 2px 1px; min-height: 5px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical button { margin: 2px 1px; min-height: 5px; }

 scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { opacity: 0.8; }

@@ -1139,7 +1139,7 @@ switch slider { margin: -1px; min-width: 24px; min-height: 24px; border: 1px sol

 switch image { color: transparent; }

-switch:hover slider { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #0c0c0c; background-image: linear-gradient(to bottom, #3f3f3f 20%, #353535 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+switch:hover slider { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #0c0c0c; box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, #3f3f3f 20%, #353535 90%); }

 switch:checked > slider { border: 1px solid #030c17; }

@@ -1313,7 +1313,7 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b

 scale slider { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); background-image: linear-gradient(to bottom, #282828 20%, #202020 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); border: 1px solid #474747; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }

-scale slider:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #4e4e4e; background-image: linear-gradient(to bottom, #303030 20%, #262626 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+scale slider:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #4e4e4e; box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, #303030 20%, #262626 90%); }

 scale slider:active { border-color: #030c17; }

@@ -1365,99 +1365,99 @@ scale.vertical.fine-tune indicator { min-width: 3px; }

 scale.horizontal.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.color { min-height: 0; min-width: 0; }

@@ -1628,7 +1628,7 @@ row.activatable:backdrop:hover { background-color: transparent; }

 row.activatable:selected:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }

-row.activatable.has-open-popup:selected, row.activatable:selected:hover { background-color: #264e7e; }
+row.activatable:selected.has-open-popup, row.activatable:selected:hover { background-color: #264e7e; }

 row.activatable:selected:backdrop { background-color: #0f3b71; }

@@ -1699,9 +1699,9 @@ filechooserbutton:drop(active) { box-shadow: none; border-color: transparent; }
 /*********** Sidebar * */
 .sidebar { border-style: none; background-color: #2e2e2e; }

-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:not(separator):dir(ltr), .sidebar.left:not(separator) { border-right: 1px solid #686868; border-left-style: none; }
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:not(separator):dir(ltr), .sidebar:not(separator).left { border-right: 1px solid #686868; border-left-style: none; }

-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), .sidebar.right:not(separator) { border-left: 1px solid #686868; border-right-style: none; }
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), .sidebar:not(separator).right { border-left: 1px solid #686868; border-right-style: none; }

 .sidebar:backdrop { background-color: #323232; border-color: #202020; transition: 200ms ease-out; }

@@ -1808,7 +1808,7 @@ infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, info

 infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, #303030); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }

-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, #323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); }

 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; background-image: image(#191919); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -1870,9 +1870,9 @@ colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); }

 colorswatch:drop(active) { box-shadow: none; }

-colorswatch.light:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #686868, inset 0 0 0 1px #4e9a06; }
+colorswatch:drop(active).light overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #686868, inset 0 0 0 1px #4e9a06; }

-colorswatch.dark:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #686868, inset 0 0 0 1px #4e9a06; }
+colorswatch:drop(active).dark overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #686868, inset 0 0 0 1px #4e9a06; }

 colorswatch overlay { border: 1px solid #686868; }

@@ -1886,7 +1886,7 @@ colorswatch#add-color-button:only-child { border-radius: 5px; }

 colorswatch#add-color-button overlay { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, #303030); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }

-colorswatch#add-color-button overlay:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, #323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+colorswatch#add-color-button overlay:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); }

 colorswatch#add-color-button overlay:backdrop { color: #919190; border-color: #202020; background-image: image(#353535); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

@@ -242,7 +242,7 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun

 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus + entry { border-left-color: #1b6acb; }

-.linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + entry, .linked:not(.vertical) > entry.error:focus + button, .linked:not(.vertical) > entry.error:focus + combobox > box > button.combo, .linked:not(.vertical) > entry.error:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry.error:focus + entry { border-left-color: #cc0000; }
+.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + button, .linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + entry { border-left-color: #cc0000; }

 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + button, .linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + entry { border-left-color: #4e9a06; }

@@ -254,13 +254,13 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun

 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { border-top-color: #1b6acb; }

-.linked.vertical > spinbutton:not(.vertical) + spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry.error:focus:not(:only-child), .linked.vertical > entry + spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry.error:focus:not(:only-child) { border-top-color: #cc0000; }
+.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus.error:not(:only-child) { border-top-color: #cc0000; }

 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + entry:drop(active):not(:only-child) { border-top-color: #4e9a06; }

 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #1b6acb; }

-.linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + button, .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #cc0000; }
+.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, .linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: #cc0000; }

 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, .linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: #4e9a06; }

@@ -300,17 +300,17 @@ button.titlebutton:hover, button.sidebar-button:hover, notebook > header > tabs

 button.titlebutton:hover:active, button.sidebar-button:hover:active, notebook > header > tabs > arrow:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }

-notebook > header > tabs > arrow:hover, button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: highlight; }
+notebook > header > tabs > arrow:hover, button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); -gtk-icon-effect: highlight; }

 notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, button:checked { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; background-image: image(#ddd9d5); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }

-notebook > header > tabs > arrow:backdrop, button.flat:backdrop, button:backdrop { color: #929595; border-color: #d5d0cc; background-image: image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
+notebook > header > tabs > arrow:backdrop, button:backdrop.flat, button:backdrop { color: #929595; border-color: #d5d0cc; background-image: image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }

-notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.flat:backdrop:active, button.flat:backdrop:checked, button:backdrop:active, button:backdrop:checked { color: #929595; border-color: #d5d0cc; background-image: image(#e9e9e9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button:backdrop.flat:active, button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { color: #929595; border-color: #d5d0cc; background-image: image(#e9e9e9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-notebook > header > tabs > arrow:backdrop:disabled, button.flat:backdrop:disabled, button:backdrop:disabled { color: #d4cfca; border-color: #d5d0cc; background-image: image(#fefefd); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled { color: #d4cfca; border-color: #d5d0cc; background-image: image(#fefefd); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.flat:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #d4cfca; border-color: #d5d0cc; background-image: image(#e9e9e9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #d4cfca; border-color: #d5d0cc; background-image: image(#e9e9e9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

 button.titlebutton:backdrop, button.sidebar-button:backdrop, notebook > header > tabs > arrow:backdrop, button.titlebutton:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -370,7 +370,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);

 button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #3584e4; }

-button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; background-image: linear-gradient(to top, #3584e4, #3987e5 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #3584e4, #3987e5 1px); }

 button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; background-image: image(#1961b9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -402,7 +402,7 @@ button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3

 button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #e01b24; }

-button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #b2161d; border-bottom-color: #851015; background-image: linear-gradient(to top, #e01b24, #e41c26 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.558275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.558275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #b2161d; border-bottom-color: #851015; text-shadow: 0 -1px rgba(0, 0, 0, 0.558275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.558275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #e01b24, #e41c26 1px); }

 button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #b2161d; background-image: image(#a0131a); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -452,9 +452,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 4

 button.circular label { padding: 0; }

-button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc), linear-gradient(to top, #6e645a 25%, #877b6e 50%); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
+button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc), linear-gradient(to top, #6e645a 25%, #877b6e 50%); border-color: transparent; }

-button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 1px), linear-gradient(to top, #6e645a 25%, #877b6e 50%); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
+button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); background-image: linear-gradient(to top, #fdfdfc, white 1px), linear-gradient(to top, #6e645a 25%, #877b6e 50%); border-color: transparent; }

 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image { animation: needs_attention 150ms ease-in; background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#1b6acb), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.769231)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 4px; }

@@ -464,7 +464,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need

 .inline-toolbar toolbutton > button { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }

-.inline-toolbar toolbutton > button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+.inline-toolbar toolbutton > button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); }

 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; background-image: image(#ddd9d5); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -525,7 +525,7 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 /* tone down as per new designs, see issue #1473, #1748 */
 list row button.image-button:not(.flat) { border: 1px solid rgba(135, 123, 110, 0.5); }

-list row button.image-button:not(.flat):hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+list row button.image-button:not(.flat):hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); }

 list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; background-image: image(#ddd9d5); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -682,15 +682,15 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }

 .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; background-image: linear-gradient(to top, #3584e4, #3987e5 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #3584e4, #3987e5 1px); }

 .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, .selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode headerbar button.toggle:active, headerbar.selection-mode button:active, headerbar.selection-mode button:checked, headerbar.selection-mode button.toggle:checked, headerbar.selection-mode button.toggle:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; background-image: image(#1961b9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

-.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button.flat:backdrop, .selection-mode headerbar button:backdrop, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button:backdrop { color: #d7e6fa; border-color: #3584e4; background-image: image(#3584e4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button:backdrop.flat, .selection-mode headerbar button:backdrop, headerbar.selection-mode button:backdrop.flat, headerbar.selection-mode button:backdrop { color: #d7e6fa; border-color: #3584e4; background-image: image(#3584e4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #185fb4; }

-.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar button.flat:backdrop:active, .selection-mode headerbar button.flat:backdrop:checked, .selection-mode headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode button.flat:backdrop:active, headerbar.selection-mode button.flat:backdrop:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d5e6f9; border-color: #2f80e3; background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar button:backdrop.flat:active, .selection-mode headerbar button:backdrop.flat:checked, .selection-mode headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode button:backdrop.flat:active, headerbar.selection-mode button:backdrop.flat:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d5e6f9; border-color: #2f80e3; background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }

-.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode headerbar button.flat:backdrop:disabled, .selection-mode headerbar button:backdrop:disabled, headerbar.selection-mode button.flat:backdrop:disabled, headerbar.selection-mode button:backdrop:disabled { color: #8fbbf0; border-color: #5396e8; background-image: image(#5396e8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode headerbar button:backdrop.flat:disabled, .selection-mode headerbar button:backdrop:disabled, headerbar.selection-mode button:backdrop.flat:disabled, headerbar.selection-mode button:backdrop:disabled { color: #8fbbf0; border-color: #5396e8; background-image: image(#5396e8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }

 .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode headerbar button:backdrop:disabled:active, .selection-mode headerbar button:backdrop:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, headerbar.selection-mode button:backdrop:disabled:checked { color: #78aced; border-color: #2f80e3; background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }

@@ -702,7 +702,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }

 .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode button.suggested-action { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #185fb4; }

-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); border-color: #185fb4; }

 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; background-image: image(#ddd9d5); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #185fb4; }

@@ -792,9 +792,9 @@ treeview.view:backdrop { border-left-color: #c4c5c5; border-top: #f6f5f4; }

 treeview.view:drop(active) { border-style: solid none; border-width: 1px; border-color: #124787; }

-treeview.view.after:drop(active) { border-top-style: none; }
+treeview.view:drop(active).after { border-top-style: none; }

-treeview.view.before:drop(active) { border-bottom-style: none; }
+treeview.view:drop(active).before { border-bottom-style: none; }

 treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); color: #4d4d4d; }

@@ -834,7 +834,7 @@ treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.vie

 treeview.view acceleditor > label { background-color: #1b6acb; }

-treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #9f958b; border-radius: 0; text-shadow: none; }
+treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #fdfdfc; border-radius: 0; text-shadow: none; }

 treeview.view header button:disabled { border-color: #fdfdfc; background-image: none; }

@@ -999,21 +999,21 @@ notebook > header tab { min-height: 30px; min-width: 30px; padding: 3px 12px; ou

 notebook > header tab:hover { color: #272c2e; background-color: #f4f2f1; }

-notebook > header tab.reorderable-page:hover { border-color: rgba(135, 123, 110, 0.3); background-color: rgba(253, 253, 252, 0.2); }
+notebook > header tab:hover.reorderable-page { border-color: rgba(135, 123, 110, 0.3); background-color: rgba(253, 253, 252, 0.2); }

 notebook > header tab:backdrop { color: #babbbb; }

-notebook > header tab.reorderable-page:backdrop { border-color: transparent; background-color: transparent; }
+notebook > header tab:backdrop.reorderable-page { border-color: transparent; background-color: transparent; }

 notebook > header tab:checked { color: #272c2e; }

-notebook > header tab.reorderable-page:checked { border-color: rgba(135, 123, 110, 0.5); background-color: rgba(253, 253, 252, 0.5); }
+notebook > header tab:checked.reorderable-page { border-color: rgba(135, 123, 110, 0.5); background-color: rgba(253, 253, 252, 0.5); }

-notebook > header tab.reorderable-page:checked:hover { background-color: rgba(253, 253, 252, 0.7); }
+notebook > header tab:checked.reorderable-page:hover { background-color: rgba(253, 253, 252, 0.7); }

 notebook > header tab:backdrop:checked { color: #929595; }

-notebook > header tab.reorderable-page:backdrop:checked { border-color: #d5d0cc; background-color: #f6f5f4; }
+notebook > header tab:backdrop:checked.reorderable-page { border-color: #d5d0cc; background-color: #f6f5f4; }

 notebook > header tab button.flat { padding: 0; margin-top: 4px; margin-bottom: 4px; min-width: 20px; min-height: 20px; }

@@ -1094,13 +1094,13 @@ scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; mi

 scrollbar.overlay-indicator:not(.dragging):not(.hovering) button { min-width: 5px; min-height: 5px; background-color: #272c2e; background-clip: padding-box; border-radius: 100%; border: 1px solid white; -gtk-icon-source: none; }

-scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) slider { margin: 0 2px; min-width: 40px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { margin: 0 2px; min-width: 40px; }

-scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) button { margin: 1px 2px; min-width: 5px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal button { margin: 1px 2px; min-width: 5px; }

-scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) slider { margin: 2px 0; min-height: 40px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { margin: 2px 0; min-height: 40px; }

-scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) button { margin: 2px 1px; min-height: 5px; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical button { margin: 2px 1px; min-height: 5px; }

 scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { opacity: 0.8; }

@@ -1147,7 +1147,7 @@ switch slider { margin: -1px; min-width: 24px; min-height: 24px; border: 1px sol

 switch image { color: transparent; }

-switch:hover slider { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; background-image: linear-gradient(to bottom, white 10%, white 90%); box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+switch:hover slider { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, white 10%, white 90%); }

 switch:checked > slider { border: 1px solid #15539e; }

@@ -1329,7 +1329,7 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b

 scale slider { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); background-image: linear-gradient(to bottom, white 20%, #fdfdfc 90%); box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); border: 1px solid #655c53; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }

-scale slider:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; background-image: linear-gradient(to bottom, white 10%, white 90%); box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+scale slider:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, white 10%, white 90%); }

 scale slider:active { border-color: #185fb4; }

@@ -1381,99 +1381,99 @@ scale.vertical.fine-tune indicator { min-width: 3px; }

 scale.horizontal.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png")); min-height: 26px; min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.horizontal.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png")); min-height: 26px; min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png")); min-height: 22px; min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.vertical.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; border-radius: 0; background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png")); min-height: 22px; min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }

-scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }

 scale.color { min-height: 0; min-width: 0; }

@@ -1644,7 +1644,7 @@ row.activatable:backdrop:hover { background-color: transparent; }

 row.activatable:selected:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }

-row.activatable.has-open-popup:selected, row.activatable:selected:hover { background-color: #1c64bb; }
+row.activatable:selected.has-open-popup, row.activatable:selected:hover { background-color: #1c64bb; }

 row.activatable:selected:backdrop { background-color: #1b6acb; }

@@ -1715,9 +1715,9 @@ filechooserbutton:drop(active) { box-shadow: none; border-color: transparent; }
 /*********** Sidebar * */
 .sidebar { border-style: none; background-color: #fefefe; }

-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:not(separator):dir(ltr), .sidebar.left:not(separator) { border-right: 1px solid #877b6e; border-left-style: none; }
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:not(separator):dir(ltr), .sidebar:not(separator).left { border-right: 1px solid #877b6e; border-left-style: none; }

-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), .sidebar.right:not(separator) { border-left: 1px solid #877b6e; border-right-style: none; }
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), .sidebar:not(separator).right { border-left: 1px solid #877b6e; border-right-style: none; }

 .sidebar:backdrop { background-color: #f9f9f8; border-color: #d5d0cc; transition: 200ms ease-out; }

@@ -1824,7 +1824,7 @@ infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, info

 infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }

-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); }

 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; background-image: image(#ddd9d5); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }

@@ -1886,9 +1886,9 @@ colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); }

 colorswatch:drop(active) { box-shadow: none; }

-colorswatch.light:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #3d7805, inset 0 0 0 1px #4e9a06; }
+colorswatch:drop(active).light overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #3d7805, inset 0 0 0 1px #4e9a06; }

-colorswatch.dark:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; }
+colorswatch:drop(active).dark overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; }

 colorswatch overlay { border: 1px solid rgba(0, 0, 0, 0.3); }

@@ -1902,7 +1902,7 @@ colorswatch#add-color-button:only-child { border-radius: 5px; }

 colorswatch#add-color-button overlay { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }

-colorswatch#add-color-button overlay:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+colorswatch#add-color-button overlay:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); }

 colorswatch#add-color-button overlay:backdrop { color: #929595; border-color: #d5d0cc; background-image: image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

@@ -1,5 +1,5 @@
 project('gtk+-3.0', 'c',
-        version: '3.24.25',
+        version: '3.24.23',
        default_options: [
          'buildtype=debugoptimized',
          'warning_level=1'
@@ -52,7 +52,7 @@ gtk_version       = meson.project_version()
 gtk_major_version = gtk_version.split('.')[0].to_int()
 gtk_minor_version = gtk_version.split('.')[1].to_int()
 gtk_micro_version = gtk_version.split('.')[2].to_int()
-gtk_interface_age = 21
+gtk_interface_age = 19
 add_project_arguments('-DGTK_VERSION="@0@"'.format(meson.project_version()), language: 'c')

 add_project_arguments('-D_GNU_SOURCE', language: 'c')
@@ -252,7 +252,6 @@ check_functions = [
  'sincos',
  'trunc',
  'localtime_r',
-  'fmin',
 ]

 foreach func : check_functions
@@ -150,14 +150,10 @@ struct _GtkPrintBackendCups
  guint avahi_service_browser_subscription_ids[2];
  char *avahi_service_browser_paths[2];
  GCancellable *avahi_cancellable;
-  guint unsubscribe_general_subscription_id;

  gboolean      secrets_service_available;
  guint         secrets_service_watch_id;
  GCancellable *secrets_service_cancellable;
-
-  GList *temporary_queues_in_construction;
-  GList *temporary_queues_removed;
 };

 static GObjectClass *backend_parent_class;
@@ -242,11 +238,6 @@ static void                 secrets_service_vanished_cb             (GDBusConnec
                                                                     const gchar *name,
                                                                     gpointer user_data);

-static void                 create_temporary_queue                  (GtkPrintBackendCups *backend,
-                                                                     const gchar         *printer_name,
-                                                                     const gchar         *printer_uri,
-                                                                     const gchar         *device_uri);
-
 static void
 gtk_print_backend_cups_register_type (GTypeModule *module)
 {
@@ -906,9 +897,6 @@ gtk_print_backend_cups_init (GtkPrintBackendCups *backend_cups)
    gtk_cups_secrets_service_watch (secrets_service_appeared_cb,
                                    secrets_service_vanished_cb,
                                    backend_cups);
-
-  backend_cups->temporary_queues_in_construction = NULL;
-  backend_cups->temporary_queues_removed = NULL;
 }

 static void
@@ -945,12 +933,6 @@ gtk_print_backend_cups_finalize (GObject *object)
      g_bus_unwatch_name (backend_cups->secrets_service_watch_id);
    }

-  g_list_free_full (backend_cups->temporary_queues_in_construction, g_free);
-  backend_cups->temporary_queues_in_construction = NULL;
-
-  g_list_free_full (backend_cups->temporary_queues_removed, g_free);
-  backend_cups->temporary_queues_removed = NULL;
-
  backend_parent_class->finalize (object);
 }

@@ -1010,12 +992,6 @@ gtk_print_backend_cups_dispose (GObject *object)
      backend_cups->avahi_service_browser_subscription_id = 0;
    }

-  if (backend_cups->unsubscribe_general_subscription_id > 0)
-    {
-      g_source_remove (backend_cups->unsubscribe_general_subscription_id);
-      backend_cups->unsubscribe_general_subscription_id = 0;
-    }
-
  backend_parent_class->dispose (object);
 }

@@ -1885,28 +1861,8 @@ static void
 mark_printer_inactive (GtkPrinter      *printer,
                       GtkPrintBackend *backend)
 {
-  GtkPrinterCups *cups_printer = GTK_PRINTER_CUPS (printer);
-  GList          *iter;
-
-  if (cups_printer->is_temporary)
-    {
-      /* Do not recreate printers which disappeared from Avahi. */
-      iter = g_list_find_custom (GTK_PRINT_BACKEND_CUPS (backend)->temporary_queues_removed,
-                                 gtk_printer_get_name (printer), (GCompareFunc) g_strcmp0);
-      if (iter == NULL)
-        {
-          /* Recreate temporary queue since they are created for 60 seconds only. */
-          create_temporary_queue (GTK_PRINT_BACKEND_CUPS (backend),
-                                  gtk_printer_get_name (printer),
-                                  cups_printer->printer_uri,
-                                  cups_printer->temporary_queue_device_uri);
-        }
-    }
-  else
-    {
-      gtk_printer_set_is_active (printer, FALSE);
-      g_signal_emit_by_name (backend, "printer-removed", printer);
-    }
+  gtk_printer_set_is_active (printer, FALSE);
+  g_signal_emit_by_name (backend, "printer-removed", printer);
 }

 static gint
@@ -1957,8 +1913,7 @@ static const char * const printer_attrs[] =
    "multiple-document-handling-supported",
    "copies-supported",
    "number-up-supported",
-    "device-uri",
-    "printer-is-temporary"
+    "device-uri"
  };

 /* Attributes we're interested in for printers without PPD */
@@ -2055,7 +2010,6 @@ typedef struct
  gchar    *output_bin_default;
  GList    *output_bin_supported;
  gchar    *original_device_uri;
-  gboolean  is_temporary;
 } PrinterSetupInfo;

 static void
@@ -2441,13 +2395,6 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
    {
      info->original_device_uri = g_strdup (ippGetString (attr, 0, NULL));
    }
-  else if (strcmp (ippGetName (attr), "printer-is-temporary") == 0)
-    {
-      if (ippGetBoolean (attr, 0) == 1)
-        info->is_temporary = TRUE;
-      else
-        info->is_temporary = FALSE;
-    }
  else
    {
      GTK_NOTE (PRINTING,
@@ -2483,7 +2430,12 @@ cups_create_printer (GtkPrintBackendCups *cups_backend,
  cups_printer = gtk_printer_cups_new (info->printer_name, backend, NULL);
 #endif

-  if (!info->avahi_printer)
+  if (info->avahi_printer)
+    {
+      cups_printer->device_uri = g_strdup_printf ("/%s",
+                                                  info->avahi_resource_path);
+    }
+  else
    {
      cups_printer->device_uri = g_strdup_printf ("/printers/%s",
                                                  info->printer_name);
@@ -2847,8 +2799,6 @@ cups_request_printer_info_cb (GtkPrintBackendCups *cups_backend,
          GTK_PRINTER_CUPS (printer)->output_bin_default = info->output_bin_default;
          GTK_PRINTER_CUPS (printer)->output_bin_supported = info->output_bin_supported;

-          GTK_PRINTER_CUPS (printer)->is_temporary = info->is_temporary;
-
          gtk_printer_set_has_details (printer, TRUE);
          g_signal_emit_by_name (printer, "details-acquired", TRUE);

@@ -2916,10 +2866,8 @@ cups_request_printer_info (GtkPrinterCups *printer)
 typedef struct
 {
  gchar               *printer_uri;
-  gchar               *device_uri;
  gchar               *location;
-  gchar               *address;
-  gchar               *hostname;
+  gchar               *host;
  gint                 port;
  gchar               *printer_name;
  gchar               *name;
@@ -2976,88 +2924,6 @@ find_printer_by_uuid (GtkPrintBackendCups *backend,
  return result;
 }

-static void
-cups_create_local_printer_cb (GtkPrintBackendCups *print_backend,
-                              GtkCupsResult       *result,
-                              gpointer             user_data)
-{
-  ipp_attribute_t *attr;
-  gchar           *printer_name = NULL;
-  ipp_t           *response;
-  GList           *iter;
-
-  response = gtk_cups_result_get_response (result);
-
-  if (ippGetStatusCode (response) <= IPP_OK_CONFLICT)
-    {
-      if ((attr = ippFindAttribute (response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
-        {
-          printer_name = g_strdup (g_strrstr (ippGetString (attr, 0, NULL), "/") + 1);
-        }
-
-      GTK_NOTE (PRINTING,
-                g_print ("CUPS Backend: Created local printer %s\n", printer_name));
-    }
-  else
-    {
-      GTK_NOTE (PRINTING,
-                g_print ("CUPS Backend: Creating of local printer failed: %d\n", ippGetStatusCode (response)));
-    }
-
-  iter = g_list_find_custom (print_backend->temporary_queues_in_construction, printer_name, (GCompareFunc) g_strcmp0);
-  if (iter != NULL)
-    {
-      g_free (iter->data);
-      print_backend->temporary_queues_in_construction = g_list_delete_link (print_backend->temporary_queues_in_construction, iter);
-    }
-
-  g_free (printer_name);
-}
-
-/*
- *  Create CUPS temporary queue.
- */
-static void
-create_temporary_queue (GtkPrintBackendCups *backend,
-                        const gchar         *printer_name,
-                        const gchar         *printer_uri,
-                        const gchar         *device_uri)
-{
-  GtkCupsRequest *request;
-  GList          *iter;
-
-  /* There can be several queues with the same name (ipp and ipps versions of the same printer) */
-  iter = g_list_find_custom (backend->temporary_queues_in_construction, printer_name, (GCompareFunc) g_strcmp0);
-  if (iter != NULL)
-    return;
-
-  GTK_NOTE (PRINTING,
-            g_print ("CUPS Backend: Creating local printer %s\n", printer_name));
-
-  backend->temporary_queues_in_construction = g_list_prepend (backend->temporary_queues_in_construction, g_strdup (printer_name));
-
-  request = gtk_cups_request_new_with_username (NULL,
-                                                GTK_CUPS_POST,
-                                                IPP_OP_CUPS_CREATE_LOCAL_PRINTER,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                NULL);
-
-  gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_URI,
-                                   "printer-uri", NULL, printer_uri);
-  gtk_cups_request_ipp_add_string (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
-                                   "printer-name", NULL, printer_name);
-  gtk_cups_request_ipp_add_string (request, IPP_TAG_PRINTER, IPP_TAG_URI,
-                                   "device-uri", NULL, device_uri);
-
-  cups_request_execute (backend,
-                        request,
-                        (GtkPrintCupsResponseCallbackFunc) cups_create_local_printer_cb,
-                        NULL,
-                        NULL);
-}
-
 /*
 *  Create new GtkPrinter from informations included in TXT records.
 */
@@ -3067,15 +2933,6 @@ create_cups_printer_from_avahi_data (AvahiConnectionTestData *data)
  PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo);
  GtkPrinter       *printer;

-  printer = gtk_print_backend_find_printer (GTK_PRINT_BACKEND (data->backend), data->printer_name);
-  if (printer != NULL)
-    {
-      /* A printer with this name is already present in this backend. It is probably the same printer
-       * on another protocol (IPv4 vs IPv6).
-       */
-      return;
-    }
-
  info->avahi_printer = TRUE;
  info->printer_name = data->printer_name;
  info->printer_uri = data->printer_uri;
@@ -3140,9 +2997,8 @@ create_cups_printer_from_avahi_data (AvahiConnectionTestData *data)
      GTK_PRINTER_CUPS (printer)->avahi_type = g_strdup (data->type);
      GTK_PRINTER_CUPS (printer)->avahi_domain = g_strdup (data->domain);
      GTK_PRINTER_CUPS (printer)->printer_uri = g_strdup (data->printer_uri);
-      GTK_PRINTER_CUPS (printer)->temporary_queue_device_uri = g_strdup (data->device_uri);
      g_free (GTK_PRINTER_CUPS (printer)->hostname);
-      GTK_PRINTER_CUPS (printer)->hostname = g_strdup (data->hostname);
+      GTK_PRINTER_CUPS (printer)->hostname = g_strdup (data->host);
      GTK_PRINTER_CUPS (printer)->port = data->port;
      gtk_printer_set_location (printer, data->location);
      gtk_printer_set_state_message (printer, info->state_msg);
@@ -3175,11 +3031,10 @@ avahi_connection_test_cb (GObject      *source_object,
 {
  AvahiConnectionTestData *data = (AvahiConnectionTestData *) user_data;
  GSocketConnection       *connection;
-  GError                  *error = NULL;

  connection = g_socket_client_connect_to_host_finish (G_SOCKET_CLIENT (source_object),
                                                       res,
-                                                       &error);
+                                                       NULL);
  g_object_unref (source_object);

  if (connection != NULL)
@@ -3189,25 +3044,15 @@ avahi_connection_test_cb (GObject      *source_object,

      create_cups_printer_from_avahi_data (data);
    }
-  else
-    {
-      GTK_NOTE (PRINTING,
-                g_warning ("CUPS Backend: Can not connect to %s: %s\n",
-                           data->address,
-                           error->message));
-      g_error_free (error);
-    }

  g_free (data->printer_uri);
  g_free (data->location);
-  g_free (data->address);
-  g_free (data->hostname);
+  g_free (data->host);
  g_free (data->printer_name);
  g_free (data->name);
  g_free (data->resource_path);
  g_free (data->type);
  g_free (data->domain);
-  g_free (data->device_uri);
  g_free (data);
 }

@@ -3246,17 +3091,17 @@ avahi_service_resolver_cb (GObject      *source_object,
  AvahiConnectionTestData *data;
  GtkPrintBackendCups     *backend;
  const gchar             *name;
-  const gchar             *hostname;
+  const gchar             *host;
  const gchar             *type;
  const gchar             *domain;
  const gchar             *address;
+  const gchar             *protocol_string;
  GVariant                *output;
  GVariant                *txt;
  GVariant                *child;
  guint32                  flags;
  guint16                  port;
  GError                  *error = NULL;
-  GList                   *iter;
  gchar                   *tmp;
  gchar                   *printer_name;
  gchar                  **printer_name_strv;
@@ -3283,7 +3128,7 @@ avahi_service_resolver_cb (GObject      *source_object,
                     &name,
                     &type,
                     &domain,
-                     &hostname,
+                     &host,
                     &aprotocol,
                     &address,
                     &port,
@@ -3348,50 +3193,51 @@ avahi_service_resolver_cb (GObject      *source_object,

      if (data->resource_path != NULL)
        {
-          /*
-           * Create name of temporary queue from the name of the discovered service.
-           * This emulates the way how CUPS creates the name.
-           */
-          printer_name = g_strdup_printf ("%s", name);
-          g_strcanon (printer_name, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", '_');
-
-          printer_name_strv = g_strsplit_set (printer_name, "_", -1);
-          printer_name_compressed_strv = g_new0 (gchar *, g_strv_length (printer_name_strv) + 1);
-          for (i = 0, j = 0; printer_name_strv[i] != NULL; i++)
+          if (data->got_printer_type &&
+              (g_str_has_prefix (data->resource_path, "printers/") ||
+               g_str_has_prefix (data->resource_path, "classes/")))
            {
-              if (printer_name_strv[i][0] != '\0')
-                {
-                  printer_name_compressed_strv[j] = printer_name_strv[i];
-                  j++;
-                }
-            }
-
-          data->printer_name = g_strjoinv ("_", printer_name_compressed_strv);
-
-          g_strfreev (printer_name_strv);
-          g_free (printer_name_compressed_strv);
-          g_free (printer_name);
-
-          iter = g_list_find_custom (backend->temporary_queues_removed, data->printer_name, (GCompareFunc) g_strcmp0);
-          if (iter != NULL)
-            {
-              g_free (iter->data);
-              backend->temporary_queues_removed = g_list_delete_link (backend->temporary_queues_removed, iter);
-            }
-
-          if (g_strcmp0 (type, "_ipp._tcp") == 0)
-            {
-              data->printer_uri = g_strdup_printf ("ipp://localhost/printers/%s", data->printer_name);
-              data->device_uri = g_strdup_printf ("ipp://%s:%d/%s", hostname, port, data->resource_path);
+              /* This is a CUPS printer advertised via Avahi */
+              printer_name = g_strrstr (data->resource_path, "/");
+              if (printer_name != NULL && printer_name[0] != '\0')
+                data->printer_name = g_strdup (printer_name + 1);
+              else
+                data->printer_name = g_strdup (data->resource_path);
            }
          else
            {
-              data->printer_uri = g_strdup_printf ("ipps://localhost/printers/%s", data->printer_name);
-              data->device_uri = g_strdup_printf ("ipps://%s:%d/%s", hostname, port, data->resource_path);
+              printer_name = g_strdup (name);
+              g_strcanon (printer_name, PRINTER_NAME_ALLOWED_CHARACTERS, '-');
+
+              printer_name_strv = g_strsplit_set (printer_name, "-", -1);
+              printer_name_compressed_strv = g_new0 (gchar *, g_strv_length (printer_name_strv) + 1);
+              for (i = 0, j = 0; printer_name_strv[i] != NULL; i++)
+                {
+                  if (printer_name_strv[i][0] != '\0')
+                    {
+                      printer_name_compressed_strv[j] = printer_name_strv[i];
+                      j++;
+                    }
+                }
+
+              data->printer_name = g_strjoinv ("-", printer_name_compressed_strv);
+
+              g_strfreev (printer_name_strv);
+              g_free (printer_name_compressed_strv);
+              g_free (printer_name);
            }

-          data->address = g_strdup (address);
-          data->hostname = g_strdup (hostname);
+          if (g_strcmp0 (type, "_ipp._tcp") == 0)
+            protocol_string = "ipp";
+          else
+            protocol_string = "ipps";
+
+          if (aprotocol == AVAHI_PROTO_INET6)
+            data->printer_uri = g_strdup_printf ("%s://[%s]:%u/%s", protocol_string, address, port, data->resource_path);
+          else
+            data->printer_uri = g_strdup_printf ("%s://%s:%u/%s", protocol_string, address, port, data->resource_path);
+
+          data->host = g_strdup (address);
          data->port = port;

          data->name = g_strdup (name);
@@ -3505,9 +3351,6 @@ avahi_service_browser_signal_handler (GDBusConnection *connection,
                                 backend->avahi_default_printer) == 0)
                    g_clear_pointer (&backend->avahi_default_printer, g_free);

-                  backend->temporary_queues_removed = g_list_prepend (backend->temporary_queues_removed,
-                    g_strdup (gtk_printer_get_name (GTK_PRINTER (printer))));
-
                  g_signal_emit_by_name (backend, "printer-removed", printer);
                  gtk_print_backend_remove_printer (GTK_PRINT_BACKEND (backend),
                                                    GTK_PRINTER (printer));
@@ -3521,19 +3364,6 @@ avahi_service_browser_signal_handler (GDBusConnection *connection,
    }
 }

-static gboolean
-unsubscribe_general_subscription_cb (gpointer user_data)
-{
-  GtkPrintBackendCups *cups_backend = user_data;
-
-  g_dbus_connection_signal_unsubscribe (cups_backend->dbus_connection,
-                                        cups_backend->avahi_service_browser_subscription_id);
-  cups_backend->avahi_service_browser_subscription_id = 0;
-  cups_backend->unsubscribe_general_subscription_id = 0;
-
-  return G_SOURCE_REMOVE;
-}
-
 static void
 avahi_service_browser_new_cb (GObject      *source_object,
                              GAsyncResult *res,
@@ -3575,10 +3405,9 @@ avahi_service_browser_new_cb (GObject      *source_object,
          cups_backend->avahi_service_browser_paths[1] &&
          cups_backend->avahi_service_browser_subscription_id > 0)
        {
-          /* We need to unsubscribe in idle since signals in queue destined for emit
-           * are emitted in idle and check whether the subscriber is still subscribed.
-           */
-          cups_backend->unsubscribe_general_subscription_id = g_idle_add (unsubscribe_general_subscription_cb, cups_backend);
+          g_dbus_connection_signal_unsubscribe (cups_backend->dbus_connection,
+                                                cups_backend->avahi_service_browser_subscription_id);
+          cups_backend->avahi_service_browser_subscription_id = 0;
        }

      g_variant_unref (output);
@@ -3634,6 +3463,7 @@ avahi_create_browsers (GObject      *source_object,
                                         avahi_service_browser_signal_handler,
                                         cups_backend,
                                         NULL);
+
  /*
   * Create service browsers for _ipp._tcp and _ipps._tcp services.
   */
@@ -3761,12 +3591,6 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
            continue;
        }

-      /* Do not show printer for queue which was removed from Avahi. */
-      iter = g_list_find_custom (GTK_PRINT_BACKEND_CUPS (backend)->temporary_queues_removed,
-                                 info->printer_name, (GCompareFunc) g_strcmp0);
-      if (iter != NULL)
-        continue;
-
      if (info->got_printer_type)
        {
          if (info->default_printer && !cups_backend->got_default_printer)
@@ -3802,24 +3626,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
 	  printer = cups_create_printer (cups_backend, info);
 	  list_has_changed = TRUE;
 	}
-      else if (GTK_PRINTER_CUPS (printer)->avahi_browsed && info->is_temporary)
-        {
-          /*
-           * A temporary queue was created for a printer found via Avahi.
-           * We modify the placeholder GtkPrinter to point to the temporary queue
-           * instead of removing the placeholder GtkPrinter and creating new GtkPrinter.
-           */

-          g_object_ref (printer);
-
-          GTK_PRINTER_CUPS (printer)->avahi_browsed = FALSE;
-          GTK_PRINTER_CUPS (printer)->is_temporary = TRUE;
-          g_free (GTK_PRINTER_CUPS (printer)->device_uri);
-          GTK_PRINTER_CUPS (printer)->device_uri = g_strdup_printf ("/printers/%s",
-                                                                    info->printer_name);
-          gtk_printer_set_has_details (printer, FALSE);
-          cups_printer_request_details (printer);
-        }
      else
 	g_object_ref (printer);

@@ -3850,7 +3657,6 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
      GTK_PRINTER_CUPS (printer)->supports_number_up = info->supports_number_up;
      GTK_PRINTER_CUPS (printer)->number_of_covers = info->number_of_covers;
      GTK_PRINTER_CUPS (printer)->covers = g_strdupv (info->covers);
-      GTK_PRINTER_CUPS (printer)->is_temporary = info->is_temporary;
      status_changed = gtk_printer_set_job_count (printer, info->job_count);
      status_changed |= gtk_printer_set_location (printer, info->location);
      status_changed |= gtk_printer_set_description (printer,
@@ -4173,10 +3979,7 @@ cups_request_ppd (GtkPrinter *printer)
    }
  else
    {
-      if (cups_printer->is_temporary)
-        hostname = cupsServer ();
-      else
-        hostname = cups_printer->hostname;
+      hostname = cups_printer->hostname;
      port = cups_printer->port;
      resource = g_strdup_printf ("/printers/%s.ppd",
                                  gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
@@ -4549,16 +4352,8 @@ cups_printer_request_details (GtkPrinter *printer)
  GtkPrinterCups *cups_printer;

  cups_printer = GTK_PRINTER_CUPS (printer);
-
-  if (cups_printer->avahi_browsed)
-    {
-      create_temporary_queue (GTK_PRINT_BACKEND_CUPS (gtk_printer_get_backend (printer)),
-                              gtk_printer_get_name (printer),
-                              cups_printer->printer_uri,
-                              cups_printer->temporary_queue_device_uri);
-    }
-  else if (!cups_printer->reading_ppd &&
-           gtk_printer_cups_get_ppd (cups_printer) == NULL)
+  if (!cups_printer->reading_ppd &&
+      gtk_printer_cups_get_ppd (cups_printer) == NULL)
    {
      if (cups_printer->remote && !cups_printer->avahi_browsed)
        {
@@ -56,9 +56,7 @@ struct _GtkPrinterCups
  gchar *original_hostname;
  gchar *original_resource;
  gint original_port;
-  gboolean request_original_uri;     /* Request PPD from original hostname */
-  gboolean is_temporary;             /* This printer is temporary queue */
-  gchar *temporary_queue_device_uri; /* Device uri of temporary queue for this printer */
+  gboolean request_original_uri; /* Request PPD from original hostname */

  ipp_pstate_t state;
  gboolean reading_ppd;
@@ -214,7 +214,7 @@ msgstr "Codi d'operació"

 #: gdk/x11/gdkdevicemanager-xi2.c:133
 msgid "Opcode for XInput2 requests"
-msgstr "Codi d'operació per a les sol·licituds XInput2"
+msgstr "Codi d'operació per a les sol·licituds d'XInput2"

 #: gdk/x11/gdkdevicemanager-xi2.c:139
 msgid "Major"
@@ -1025,7 +1025,7 @@ msgstr ""

 #: gtk/deprecated/gtktable.c:243 gtk/gtkgrid.c:1802
 msgid "Top attachment"
-msgstr "Adjunt superior"
+msgstr "Fitxer adjunt superior"

 #: gtk/deprecated/gtktable.c:244
 msgid "The row number to attach the top of a child widget to"
@@ -1033,7 +1033,7 @@ msgstr "El número de la fila on adjuntar la part superior del giny fill"

 #: gtk/deprecated/gtktable.c:250
 msgid "Bottom attachment"
-msgstr "Adjunt inferior"
+msgstr "Fitxer adjunt inferior"

 #: gtk/deprecated/gtktable.c:251 gtk/gtkmenu.c:990
 msgid "The row number to attach the bottom of the child to"
@@ -34,16 +34,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GTK+ master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-30 02:24+0000\n"
-"PO-Revision-Date: 2020-11-01 15:00+0100\n"
-"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
+"POT-Creation-Date: 2020-09-19 07:33+0000\n"
+"PO-Revision-Date: 2020-09-19 09:36+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Lokalize 20.08.1\n"

 #: gdk/broadway/gdkbroadway-server.c:144
 #, c-format
@@ -1966,245 +1966,90 @@ msgstr "Rot %d%%, Grün %d%%, Blau %d%%"
 msgid "Color: %s"
 msgstr "Farbe: %s"

-#: gtk/gtkcolorchooserwidget.c:446
-msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "Sehr helles Blau"
-
-#: gtk/gtkcolorchooserwidget.c:447
-msgctxt "Color name"
-msgid "Light Blue"
-msgstr "Helles Blau"
-
-#: gtk/gtkcolorchooserwidget.c:448
+#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447
+#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449
+#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451
+#| msgid "_Blue:"
 msgctxt "Color name"
 msgid "Blue"
 msgstr "Blau"

-#: gtk/gtkcolorchooserwidget.c:449
-msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "Dunkles Blau"
-
-#: gtk/gtkcolorchooserwidget.c:450
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "Sehr dunkles Blau"
-
-#: gtk/gtkcolorchooserwidget.c:451
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "Sehr helles Grün"
-
-#: gtk/gtkcolorchooserwidget.c:452
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "Helles Grün"
-
-#: gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455
+#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457
+#| msgid "_Green:"
 msgctxt "Color name"
 msgid "Green"
 msgstr "Grün"

-#: gtk/gtkcolorchooserwidget.c:454
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "Dunkles Grün"
-
-#: gtk/gtkcolorchooserwidget.c:455
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "Sehr dunkles Grün"
-
-#: gtk/gtkcolorchooserwidget.c:456
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "Sehr helles Gelb"
-
-#: gtk/gtkcolorchooserwidget.c:457
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "Helles Gelb"
-
-#: gtk/gtkcolorchooserwidget.c:458
+#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459
+#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461
+#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463
 msgctxt "Color name"
 msgid "Yellow"
 msgstr "Gelb"

-#: gtk/gtkcolorchooserwidget.c:459
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "Dunkles Gelb"
-
-#: gtk/gtkcolorchooserwidget.c:460
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "Sehr dunkles Gelb"
-
-#: gtk/gtkcolorchooserwidget.c:461
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "Sehr helles Orange"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
-msgid "Light Orange"
-msgstr "Helles Orange"
-
-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465
+#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467
+#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Orange"

-#: gtk/gtkcolorchooserwidget.c:464
-msgctxt "Color name"
-msgid "Dark Orange"
-msgstr "Dunkles Orange"
-
-#: gtk/gtkcolorchooserwidget.c:465
-msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "Sehr dunkles Orange"
-
-#: gtk/gtkcolorchooserwidget.c:466
-msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "Sehr helles Rot"
-
-#: gtk/gtkcolorchooserwidget.c:467
-msgctxt "Color name"
-msgid "Light Red"
-msgstr "Helles Rot"
-
-#: gtk/gtkcolorchooserwidget.c:468
+#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471
+#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:474
+#| msgid "_Red:"
 msgctxt "Color name"
 msgid "Red"
 msgstr "Rot"

-#: gtk/gtkcolorchooserwidget.c:469
-msgctxt "Color name"
-msgid "Dark Red"
-msgstr "Dunkles Rot"
-
-#: gtk/gtkcolorchooserwidget.c:470
-msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "Sehr dunkles Rot"
-
-#: gtk/gtkcolorchooserwidget.c:471
-msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "Sehr helles Violett"
-
-#: gtk/gtkcolorchooserwidget.c:472
-msgctxt "Color name"
-msgid "Light Purple"
-msgstr "Helles Violett"
-
-#: gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476
+#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:479
 msgctxt "Color name"
 msgid "Purple"
 msgstr "Lila"

-#: gtk/gtkcolorchooserwidget.c:474
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "Dunkles Violett"
-
-#: gtk/gtkcolorchooserwidget.c:475
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "Sehr dunkles Violett"
-
-#: gtk/gtkcolorchooserwidget.c:476
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "Sehr helles Braun"
-
-#: gtk/gtkcolorchooserwidget.c:477
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "Helles Braun"
-
-#: gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481
+#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483
+#: gtk/gtkcolorchooserwidget.c:484
 msgctxt "Color name"
 msgid "Brown"
 msgstr "Braun"

-#: gtk/gtkcolorchooserwidget.c:479
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "Dunkles Braun"
-
-#: gtk/gtkcolorchooserwidget.c:480
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "Sehr dunkles Braun"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "Weiß"
-
-#: gtk/gtkcolorchooserwidget.c:482
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "Hellgrau 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "Hellgrau 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "Hellgrau 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "Hellgrau 4"
-
-#: gtk/gtkcolorchooserwidget.c:486
-msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "Dunkelgrau 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "Dunkelgrau 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "Dunkelgrau 3"
-
+#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486
+#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488
 #: gtk/gtkcolorchooserwidget.c:489
+#| msgctxt "keyboard label"
+#| msgid "Right"
 msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "Dunkelgrau 4"
+msgid "Light"
+msgstr "Hell"

-#: gtk/gtkcolorchooserwidget.c:490
+#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491
+#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493
+#: gtk/gtkcolorchooserwidget.c:494
+#| msgctxt "Color name"
+#| msgid "Dark Plum"
 msgctxt "Color name"
-msgid "Black"
-msgstr "Schwarz"
+msgid "Dark"
+msgstr "Dunkel"

 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:538
 msgid "Custom"
 msgstr "Benutzerdefiniert"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:545
 msgid "Custom color"
 msgstr "Benutzerdefinierte Farbe"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:546
 msgid "Create a custom color"
 msgstr "Benutzerdefinierte Farbe anlegen"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:565
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "Benutzerdefinierte Farbe %d: %s"
@@ -2760,52 +2605,52 @@ msgctxt "font"
 msgid "None"
 msgstr "Keine"

-#: gtk/gtkfontchooserwidget.c:1556
+#: gtk/gtkfontchooserwidget.c:1525
 msgid "Width"
 msgstr "Breite"

-#: gtk/gtkfontchooserwidget.c:1557
+#: gtk/gtkfontchooserwidget.c:1526
 msgid "Weight"
 msgstr "Gewicht"

-#: gtk/gtkfontchooserwidget.c:1558
+#: gtk/gtkfontchooserwidget.c:1527
 msgid "Italic"
 msgstr "Kursiv"

-#: gtk/gtkfontchooserwidget.c:1559
+#: gtk/gtkfontchooserwidget.c:1528
 msgid "Slant"
 msgstr "Schräg"

-#: gtk/gtkfontchooserwidget.c:1560
+#: gtk/gtkfontchooserwidget.c:1529
 msgid "Optical Size"
 msgstr "Optische Größe"

-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
+#: gtk/gtkfontchooserwidget.c:2066 gtk/inspector/prop-editor.c:1676
 msgid "Default"
 msgstr "Standard"

-#: gtk/gtkfontchooserwidget.c:2144
+#: gtk/gtkfontchooserwidget.c:2113
 msgid "Ligatures"
 msgstr "Ligaturen"

-#: gtk/gtkfontchooserwidget.c:2145
+#: gtk/gtkfontchooserwidget.c:2114
 msgid "Letter Case"
 msgstr "Groß-/Kleinschreibung"

 # https://www.bamagazine.com/Text-type-typeface-s/105.htm
-#: gtk/gtkfontchooserwidget.c:2146
+#: gtk/gtkfontchooserwidget.c:2115
 msgid "Number Case"
 msgstr "Zahlenschreibweise"

-#: gtk/gtkfontchooserwidget.c:2147
+#: gtk/gtkfontchooserwidget.c:2116
 msgid "Number Spacing"
 msgstr "Zahlenabstand"

-#: gtk/gtkfontchooserwidget.c:2148
+#: gtk/gtkfontchooserwidget.c:2117
 msgid "Number Formatting"
 msgstr "Zahlenformatierung"

-#: gtk/gtkfontchooserwidget.c:2149
+#: gtk/gtkfontchooserwidget.c:2118
 msgid "Character Variants"
 msgstr "Zeichenvarianten<"

@@ -8423,15 +8268,15 @@ msgstr "Datei"
 msgid "_Output format"
 msgstr "_Ausgabeformat"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "Drucken mit LPR"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "Seiten pro Blatt"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "Befehlszeile"

@@ -8470,12 +8315,6 @@ msgstr "Test-Ausgabe.%s"
 msgid "Print to Test Printer"
 msgstr "Mit Test-Drucker drucken"

-#~| msgctxt "Color name"
-#~| msgid "Dark Plum"
-#~ msgctxt "Color name"
-#~ msgid "Dark"
-#~ msgstr "Dunkel"
-
 #~ msgctxt "Color name"
 #~ msgid "Light Scarlet Red"
 #~ msgstr "Helles Scharlachrot"
@@ -8484,6 +8323,18 @@ msgstr "Mit Test-Drucker drucken"
 #~ msgid "Scarlet Red"
 #~ msgstr "Scharlachrot"

+#~ msgctxt "Color name"
+#~ msgid "Dark Scarlet Red"
+#~ msgstr "Dunkles Scharlachrot"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Orange"
+#~ msgstr "Helles Orange"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Orange"
+#~ msgstr "Dunkles Orange"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Butter"
 #~ msgstr "Helle Butter"
@@ -8492,6 +8343,10 @@ msgstr "Mit Test-Drucker drucken"
 #~ msgid "Butter"
 #~ msgstr "Butter"

+#~ msgctxt "Color name"
+#~ msgid "Dark Butter"
+#~ msgstr "Dunkle Butter"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Chameleon"
 #~ msgstr "Helles Chamäleon"
@@ -8504,10 +8359,22 @@ msgstr "Mit Test-Drucker drucken"
 #~ msgid "Dark Chameleon"
 #~ msgstr "Dunkles Chamäleon"

+#~ msgctxt "Color name"
+#~ msgid "Light Sky Blue"
+#~ msgstr "Helles Himmelblau"
+
 #~ msgctxt "Color name"
 #~ msgid "Sky Blue"
 #~ msgstr "Himmelblau"

+#~ msgctxt "Color name"
+#~ msgid "Dark Sky Blue"
+#~ msgstr "Dunkles Himmelblau"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Plum"
+#~ msgstr "Helle Pflaume"
+
 #~ msgctxt "Color name"
 #~ msgid "Plum"
 #~ msgstr "Pflaume"
@@ -8548,18 +8415,42 @@ msgstr "Mit Test-Drucker drucken"
 #~ msgid "Dark Aluminum 2"
 #~ msgstr "Dunkles Aluminium 2"

+#~ msgctxt "Color name"
+#~ msgid "Black"
+#~ msgstr "Schwarz"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Dark Gray"
+#~ msgstr "Sehr dunkles Grau"
+
 #~ msgctxt "Color name"
 #~ msgid "Darker Gray"
 #~ msgstr "Dunkleres Grau"

+#~ msgctxt "Color name"
+#~ msgid "Dark Gray"
+#~ msgstr "Dunkles Grau"
+
 #~ msgctxt "Color name"
 #~ msgid "Medium Gray"
 #~ msgstr "Mittleres Grau"

+#~ msgctxt "Color name"
+#~ msgid "Light Gray"
+#~ msgstr "Helles Grau"
+
 #~ msgctxt "Color name"
 #~ msgid "Lighter Gray"
 #~ msgstr "Helleres Grau"

+#~ msgctxt "Color name"
+#~ msgid "Very Light Gray"
+#~ msgstr "Sehr helles Grau"
+
+#~ msgctxt "Color name"
+#~ msgid "White"
+#~ msgstr "Weiß"
+
 #~ msgid "3.2 core GL profile is not available on EGL implementation"
 #~ msgstr "3.2 core GL-Profile ist nicht in der EGL-Implementierung verfügbar"

@@ -4,14 +4,14 @@
 # Abigail Brady <morwen@evilmagic.org>, Gareth Owen <gowen72@yahoo.com> 2004
 # Philip Withnall <philip@tecnocode.co.uk>, 2010, 2012.
 # Zander Brown <zbrown@gnome.org>, 2019-2020.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2009-2021.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2009-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-18 19:42+0000\n"
-"PO-Revision-Date: 2021-01-18 20:31+0000\n"
+"POT-Creation-Date: 2020-09-19 08:30+0000\n"
+"PO-Revision-Date: 2020-09-19 12:39+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: English - United Kingdom <en@li.org>\n"
 "Language: en_GB\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.38.0\n"
+"X-Generator: Gtranslator 3.36.0\n"

 #: gdk/broadway/gdkbroadway-server.c:144
 #, c-format
@@ -75,7 +75,7 @@ msgstr "GDK debugging flags to set"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: gdk/gdk.c:241 gdk/gdk.c:244 gtk/gtkmain.c:469 gtk/gtkmain.c:472
+#: gdk/gdk.c:241 gdk/gdk.c:244 gtk/gtkmain.c:471 gtk/gtkmain.c:474
 msgid "FLAGS"
 msgstr "FLAGS"

@@ -474,19 +474,19 @@ msgid "Unable to create a GL pixel format"
 msgstr "Unable to create a GL pixel format"

 #: gdk/quartz/gdkglcontext-quartz.c:133 gdk/wayland/gdkglcontext-wayland.c:208
-#: gdk/win32/gdkglcontext-win32.c:1089 gdk/win32/gdkglcontext-win32.c:1129
+#: gdk/win32/gdkglcontext-win32.c:1072 gdk/win32/gdkglcontext-win32.c:1112
 #: gdk/x11/gdkglcontext-x11.c:724 gdk/x11/gdkglcontext-x11.c:774
 msgid "Unable to create a GL context"
 msgstr "Unable to create a GL context"

 #: gdk/wayland/gdkglcontext-wayland.c:418
-#: gdk/wayland/gdkglcontext-wayland.c:428 gdk/win32/gdkglcontext-win32.c:927
-#: gdk/win32/gdkglcontext-win32.c:937 gdk/win32/gdkglcontext-win32.c:1054
+#: gdk/wayland/gdkglcontext-wayland.c:428 gdk/win32/gdkglcontext-win32.c:910
+#: gdk/win32/gdkglcontext-win32.c:920 gdk/win32/gdkglcontext-win32.c:1037
 #: gdk/x11/gdkglcontext-x11.c:975
 msgid "No available configurations for the given pixel format"
 msgstr "No available configurations for the given pixel format"

-#: gdk/wayland/gdkglcontext-wayland.c:468 gdk/win32/gdkglcontext-win32.c:1196
+#: gdk/wayland/gdkglcontext-wayland.c:468 gdk/win32/gdkglcontext-win32.c:1179
 #: gdk/x11/gdkglcontext-x11.c:1281
 msgid "No GL implementation is available"
 msgstr "No GL implementation is available"
@@ -1933,313 +1933,83 @@ msgstr "Red %d%%, Green %d%%, Blue %d%%"
 msgid "Color: %s"
 msgstr "Colour: %s"

-#: gtk/gtkcolorchooserwidget.c:446
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "Very Light Blue"
-
-#: gtk/gtkcolorchooserwidget.c:447
-#| msgctxt "Color name"
-#| msgid "Light Sky Blue"
-msgctxt "Color name"
-msgid "Light Blue"
-msgstr "Light Blue"
-
-#: gtk/gtkcolorchooserwidget.c:448
+#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447
+#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449
+#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451
 msgctxt "Color name"
 msgid "Blue"
 msgstr "Blue"

-#: gtk/gtkcolorchooserwidget.c:449
-#| msgctxt "Color name"
-#| msgid "Dark Sky Blue"
-msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "Dark Blue"
-
-#: gtk/gtkcolorchooserwidget.c:450
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "Very Dark Blue"
-
-#: gtk/gtkcolorchooserwidget.c:451
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "Very Light Green"
-
-#: gtk/gtkcolorchooserwidget.c:452
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "Light Green"
-
-#: gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455
+#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457
 msgctxt "Color name"
 msgid "Green"
 msgstr "Green"

-#: gtk/gtkcolorchooserwidget.c:454
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "Dark Green"
-
-#: gtk/gtkcolorchooserwidget.c:455
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "Very Dark Green"
-
-#: gtk/gtkcolorchooserwidget.c:456
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "Very Light Yellow"
-
-#: gtk/gtkcolorchooserwidget.c:457
-#| msgctxt "Color name"
-#| msgid "Yellow"
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "Light Yellow"
-
-#: gtk/gtkcolorchooserwidget.c:458
+#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459
+#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461
+#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463
 msgctxt "Color name"
 msgid "Yellow"
 msgstr "Yellow"

-#: gtk/gtkcolorchooserwidget.c:459
-#| msgctxt "Color name"
-#| msgid "Yellow"
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "Dark Yellow"
-
-#: gtk/gtkcolorchooserwidget.c:460
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "Very Dark Yellow"
-
-#: gtk/gtkcolorchooserwidget.c:461
-#| msgctxt "Color name"
-#| msgid "Light Orange"
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "Very Light Orange"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
-msgid "Light Orange"
-msgstr "Light Orange"
-
-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465
+#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467
+#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Orange"

-#: gtk/gtkcolorchooserwidget.c:464
-msgctxt "Color name"
-msgid "Dark Orange"
-msgstr "Dark Orange"
-
-#: gtk/gtkcolorchooserwidget.c:465
-#| msgctxt "Color name"
-#| msgid "Dark Orange"
-msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "Very Dark Orange"
-
-#: gtk/gtkcolorchooserwidget.c:466
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "Very Light Red"
-
-#: gtk/gtkcolorchooserwidget.c:467
-#| msgctxt "Color name"
-#| msgid "Light"
-msgctxt "Color name"
-msgid "Light Red"
-msgstr "Light Red"
-
-#: gtk/gtkcolorchooserwidget.c:468
+#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471
+#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:474
 msgctxt "Color name"
 msgid "Red"
 msgstr "Red"

-#: gtk/gtkcolorchooserwidget.c:469
-#| msgctxt "Color name"
-#| msgid "Dark Scarlet Red"
-msgctxt "Color name"
-msgid "Dark Red"
-msgstr "Dark Red"
-
-#: gtk/gtkcolorchooserwidget.c:470
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "Very Dark Red"
-
-#: gtk/gtkcolorchooserwidget.c:471
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "Very Light Purple"
-
-#: gtk/gtkcolorchooserwidget.c:472
-#| msgctxt "Color name"
-#| msgid "Light Plum"
-msgctxt "Color name"
-msgid "Light Purple"
-msgstr "Light Purple"
-
-#: gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476
+#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:479
 msgctxt "Color name"
 msgid "Purple"
 msgstr "Purple"

-#: gtk/gtkcolorchooserwidget.c:474
-#| msgctxt "Color name"
-#| msgid "Purple"
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "Dark Purple"
-
-#: gtk/gtkcolorchooserwidget.c:475
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "Very Dark Purple"
-
-#: gtk/gtkcolorchooserwidget.c:476
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "Very Light Brown"
-
-#: gtk/gtkcolorchooserwidget.c:477
-#| msgctxt "output-bin"
-#| msgid "Right Bin"
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "Light Brown"
-
-#: gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481
+#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483
+#: gtk/gtkcolorchooserwidget.c:484
 msgctxt "Color name"
 msgid "Brown"
 msgstr "Brown"

-#: gtk/gtkcolorchooserwidget.c:479
-#| msgctxt "Color name"
-#| msgid "Dark Butter"
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "Dark Brown"
-
-#: gtk/gtkcolorchooserwidget.c:480
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "Very Dark Brown"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "White"
-
-#: gtk/gtkcolorchooserwidget.c:482
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "Light Grey 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "Light Grey 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "Light Grey 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "Light Grey 4"
-
-#: gtk/gtkcolorchooserwidget.c:486
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "Dark Grey 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "Dark Grey 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "Dark Grey 3"
-
+#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486
+#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488
 #: gtk/gtkcolorchooserwidget.c:489
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
 msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "Dark Grey 4"
+msgid "Light"
+msgstr "Light"

-#: gtk/gtkcolorchooserwidget.c:490
+#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491
+#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493
+#: gtk/gtkcolorchooserwidget.c:494
 msgctxt "Color name"
-msgid "Black"
-msgstr "Black"
+msgid "Dark"
+msgstr "Dark"

 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:538
 msgid "Custom"
 msgstr "Custom"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:545
 msgid "Custom color"
 msgstr "Custom colour"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:546
 msgid "Create a custom color"
 msgstr "Create a custom colour"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:565
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "Custom colour %d: %s"
@@ -2782,51 +2552,51 @@ msgctxt "font"
 msgid "None"
 msgstr "None"

-#: gtk/gtkfontchooserwidget.c:1556
+#: gtk/gtkfontchooserwidget.c:1525
 msgid "Width"
 msgstr "Width"

-#: gtk/gtkfontchooserwidget.c:1557
+#: gtk/gtkfontchooserwidget.c:1526
 msgid "Weight"
 msgstr "Weight"

-#: gtk/gtkfontchooserwidget.c:1558
+#: gtk/gtkfontchooserwidget.c:1527
 msgid "Italic"
 msgstr "Italic"

-#: gtk/gtkfontchooserwidget.c:1559
+#: gtk/gtkfontchooserwidget.c:1528
 msgid "Slant"
 msgstr "Slant"

-#: gtk/gtkfontchooserwidget.c:1560
+#: gtk/gtkfontchooserwidget.c:1529
 msgid "Optical Size"
 msgstr "Optical Size"

-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
+#: gtk/gtkfontchooserwidget.c:2066 gtk/inspector/prop-editor.c:1676
 msgid "Default"
 msgstr "Default"

-#: gtk/gtkfontchooserwidget.c:2144
+#: gtk/gtkfontchooserwidget.c:2113
 msgid "Ligatures"
 msgstr "Ligatures"

-#: gtk/gtkfontchooserwidget.c:2145
+#: gtk/gtkfontchooserwidget.c:2114
 msgid "Letter Case"
 msgstr "Letter Case"

-#: gtk/gtkfontchooserwidget.c:2146
+#: gtk/gtkfontchooserwidget.c:2115
 msgid "Number Case"
 msgstr "Number Case"

-#: gtk/gtkfontchooserwidget.c:2147
+#: gtk/gtkfontchooserwidget.c:2116
 msgid "Number Spacing"
 msgstr "Number Spacing"

-#: gtk/gtkfontchooserwidget.c:2148
+#: gtk/gtkfontchooserwidget.c:2117
 msgid "Number Formatting"
 msgstr "Number Formatting"

-#: gtk/gtkfontchooserwidget.c:2149
+#: gtk/gtkfontchooserwidget.c:2118
 msgid "Character Variants"
 msgstr "Character Variants"

@@ -2993,40 +2763,40 @@ msgstr ""
 "Contact your system administrator"

 #. Description of --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:462
+#: gtk/gtkmain.c:464
 msgid "Load additional GTK+ modules"
 msgstr "Load additional GTK modules"

 #. Placeholder in --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:463
+#: gtk/gtkmain.c:465
 msgid "MODULES"
 msgstr "MODULES"

 #. Description of --g-fatal-warnings in --help output
-#: gtk/gtkmain.c:465
+#: gtk/gtkmain.c:467
 msgid "Make all warnings fatal"
 msgstr "Make all warnings fatal"

 #. Description of --gtk-debug=FLAGS in --help output
-#: gtk/gtkmain.c:468
+#: gtk/gtkmain.c:470
 msgid "GTK+ debugging flags to set"
 msgstr "GTK debugging flags to set"

 #. Description of --gtk-no-debug=FLAGS in --help output
-#: gtk/gtkmain.c:471
+#: gtk/gtkmain.c:473
 msgid "GTK+ debugging flags to unset"
 msgstr "GTK debugging flags to unset"

-#: gtk/gtkmain.c:811 gtk/gtkmain.c:1005
+#: gtk/gtkmain.c:810 gtk/gtkmain.c:1004
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "Cannot open display: %s"

-#: gtk/gtkmain.c:923
+#: gtk/gtkmain.c:922
 msgid "GTK+ Options"
 msgstr "GTK Options"

-#: gtk/gtkmain.c:923
+#: gtk/gtkmain.c:922
 msgid "Show GTK+ Options"
 msgstr "Show GTK Options"

@@ -3035,7 +2805,7 @@ msgstr "Show GTK Options"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: gtk/gtkmain.c:1276
+#: gtk/gtkmain.c:1275
 msgid "default:LTR"
 msgstr "default:LTR"

@@ -8394,15 +8164,15 @@ msgstr "File"
 msgid "_Output format"
 msgstr "_Output format"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "Print to LPR"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "Pages Per Sheet"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "Command Line"

@@ -8441,10 +8211,6 @@ msgstr "test-output.%s"
 msgid "Print to Test Printer"
 msgstr "Print to Test Printer"

-#~ msgctxt "Color name"
-#~ msgid "Dark"
-#~ msgstr "Dark"
-
 #~ msgctxt "Color name"
 #~ msgid "Light Scarlet Red"
 #~ msgstr "Light Scarlet Red"
@@ -8453,6 +8219,18 @@ msgstr "Print to Test Printer"
 #~ msgid "Scarlet Red"
 #~ msgstr "Scarlet Red"

+#~ msgctxt "Color name"
+#~ msgid "Dark Scarlet Red"
+#~ msgstr "Dark Scarlet Red"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Orange"
+#~ msgstr "Light Orange"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Orange"
+#~ msgstr "Dark Orange"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Butter"
 #~ msgstr "Light Butter"
@@ -8461,6 +8239,10 @@ msgstr "Print to Test Printer"
 #~ msgid "Butter"
 #~ msgstr "Butter"

+#~ msgctxt "Color name"
+#~ msgid "Dark Butter"
+#~ msgstr "Dark Butter"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Chameleon"
 #~ msgstr "Light Chameleon"
@@ -8473,10 +8255,22 @@ msgstr "Print to Test Printer"
 #~ msgid "Dark Chameleon"
 #~ msgstr "Dark Chameleon"

+#~ msgctxt "Color name"
+#~ msgid "Light Sky Blue"
+#~ msgstr "Light Sky Blue"
+
 #~ msgctxt "Color name"
 #~ msgid "Sky Blue"
 #~ msgstr "Sky Blue"

+#~ msgctxt "Color name"
+#~ msgid "Dark Sky Blue"
+#~ msgstr "Dark Sky Blue"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Plum"
+#~ msgstr "Light Plum"
+
 #~ msgctxt "Color name"
 #~ msgid "Plum"
 #~ msgstr "Plum"
@@ -8517,18 +8311,42 @@ msgstr "Print to Test Printer"
 #~ msgid "Dark Aluminum 2"
 #~ msgstr "Dark Aluminium 2"

+#~ msgctxt "Color name"
+#~ msgid "Black"
+#~ msgstr "Black"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Dark Gray"
+#~ msgstr "Very Dark Grey"
+
 #~ msgctxt "Color name"
 #~ msgid "Darker Gray"
 #~ msgstr "Darker Grey"

+#~ msgctxt "Color name"
+#~ msgid "Dark Gray"
+#~ msgstr "Dark Grey"
+
 #~ msgctxt "Color name"
 #~ msgid "Medium Gray"
 #~ msgstr "Medium Grey"

+#~ msgctxt "Color name"
+#~ msgid "Light Gray"
+#~ msgstr "Light Grey"
+
 #~ msgctxt "Color name"
 #~ msgid "Lighter Gray"
 #~ msgstr "Lighter Grey"

+#~ msgctxt "Color name"
+#~ msgid "Very Light Gray"
+#~ msgstr "Very Light Grey"
+
+#~ msgctxt "Color name"
+#~ msgid "White"
+#~ msgstr "White"
+
 #~ msgid "3.2 core GL profile is not available on EGL implementation"
 #~ msgstr "3.2 core GL profile is not available on EGL implementation"

@@ -16,15 +16,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-15 01:23+0000\n"
-"PO-Revision-Date: 2020-10-19 09:15+0200\n"
+"POT-Creation-Date: 2020-09-21 06:30+0000\n"
+"PO-Revision-Date: 2020-09-21 08:36+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 3.38.0\n"
+"X-Generator: Gtranslator 3.36.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: gdk/broadway/gdkbroadway-server.c:144
@@ -1946,314 +1946,91 @@ msgstr "Rojo %d%%, verde %d%%, azul %d%%"
 msgid "Color: %s"
 msgstr "Color: %s"

-#: gtk/gtkcolorchooserwidget.c:446
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "Azul muy claro"
-
-#: gtk/gtkcolorchooserwidget.c:447
-#| msgctxt "Color name"
-#| msgid "Light Sky Blue"
-msgctxt "Color name"
-msgid "Light Blue"
-msgstr "Azul claro"
-
-#: gtk/gtkcolorchooserwidget.c:448
+#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447
+#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449
+#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451
+#| msgid "_Blue:"
 msgctxt "Color name"
 msgid "Blue"
 msgstr "Azul"

-#: gtk/gtkcolorchooserwidget.c:449
-#| msgctxt "Color name"
-#| msgid "Dark Sky Blue"
-msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "Azul oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:450
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "Azul muy oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:451
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "Verde muy claro"
-
-#: gtk/gtkcolorchooserwidget.c:452
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "Verde claro"
-
-#: gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455
+#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457
+#| msgid "_Green:"
 msgctxt "Color name"
 msgid "Green"
 msgstr "Verde"

-#: gtk/gtkcolorchooserwidget.c:454
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "Verde oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:455
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "Verde muy oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:456
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "Amarillo muy claro"
-
-#: gtk/gtkcolorchooserwidget.c:457
-#| msgctxt "Color name"
-#| msgid "Yellow"
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "Amarillo claro"
-
-#: gtk/gtkcolorchooserwidget.c:458
+#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459
+#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461
+#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463
 msgctxt "Color name"
 msgid "Yellow"
 msgstr "Amarillo"

-#: gtk/gtkcolorchooserwidget.c:459
-#| msgctxt "Color name"
-#| msgid "Yellow"
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "Amarillo oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:460
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "Amarillo muy oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:461
-#| msgctxt "Color name"
-#| msgid "Light Orange"
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "Naranja muy claro"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
-msgid "Light Orange"
-msgstr "Naranja claro"
-
-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465
+#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467
+#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Naranja"

-#: gtk/gtkcolorchooserwidget.c:464
-msgctxt "Color name"
-msgid "Dark Orange"
-msgstr "Naranja oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:465
-#| msgctxt "Color name"
-#| msgid "Dark Orange"
-msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "Naranja muy oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:466
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "Rojo muy claro"
-
-#: gtk/gtkcolorchooserwidget.c:467
-#| msgctxt "Color name"
-#| msgid "Light"
-msgctxt "Color name"
-msgid "Light Red"
-msgstr "Rojo claro"
-
-#: gtk/gtkcolorchooserwidget.c:468
+#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471
+#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:474
+#| msgid "_Red:"
 msgctxt "Color name"
 msgid "Red"
 msgstr "Rojo"

-#: gtk/gtkcolorchooserwidget.c:469
-#| msgctxt "Color name"
-#| msgid "Dark Scarlet Red"
-msgctxt "Color name"
-msgid "Dark Red"
-msgstr "Rojo oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:470
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "Rojo muy oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:471
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "Morado muy claro"
-
-#: gtk/gtkcolorchooserwidget.c:472
-#| msgctxt "Color name"
-#| msgid "Light Plum"
-msgctxt "Color name"
-msgid "Light Purple"
-msgstr "Morado claro"
-
-#: gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476
+#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:479
 msgctxt "Color name"
 msgid "Purple"
 msgstr "Morado"

-#: gtk/gtkcolorchooserwidget.c:474
-#| msgctxt "Color name"
-#| msgid "Purple"
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "Morado oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:475
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "Morado muy oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:476
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "Marrón muy claro"
-
-#: gtk/gtkcolorchooserwidget.c:477
-#| msgctxt "output-bin"
-#| msgid "Right Bin"
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "Marrón claro"
-
-#: gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481
+#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483
+#: gtk/gtkcolorchooserwidget.c:484
 msgctxt "Color name"
 msgid "Brown"
 msgstr "Marrón"

-#: gtk/gtkcolorchooserwidget.c:479
-#| msgctxt "Color name"
-#| msgid "Dark Butter"
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "Marrón oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:480
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "Marrón muy oscuro"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "Blanco"
-
-#: gtk/gtkcolorchooserwidget.c:482
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "Gris claro 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "Gris claro 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "Gris claro 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "Gris claro 4"
-
-#: gtk/gtkcolorchooserwidget.c:486
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "Gris oscuro 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "Gris oscuro 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "Gris oscuro 3"
-
+#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486
+#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488
 #: gtk/gtkcolorchooserwidget.c:489
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
+#| msgctxt "keyboard label"
+#| msgid "Right"
 msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "Gris oscuro 4"
+msgid "Light"
+msgstr "Claro"

-#: gtk/gtkcolorchooserwidget.c:490
+#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491
+#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493
+#: gtk/gtkcolorchooserwidget.c:494
+#| msgctxt "Color name"
+#| msgid "Dark Plum"
 msgctxt "Color name"
-msgid "Black"
-msgstr "Negro"
+msgid "Dark"
+msgstr "Oscuro"

 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:538
 msgid "Custom"
 msgstr "Personalizada"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:545
 msgid "Custom color"
 msgstr "Color personalizado"

 # C en conflicto con Cancelar
-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:546
 msgid "Create a custom color"
 msgstr "Crear un color personalizado"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:565
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "Color personalizado %d: %s"
@@ -8432,15 +8209,15 @@ msgstr "Archivo"
 msgid "_Output format"
 msgstr "Formato de _salida"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "Imprimir a LPR"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "Páginas por hoja"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "Línea de comandos"

@@ -8479,12 +8256,6 @@ msgstr "salida-de-prueba.%s"
 msgid "Print to Test Printer"
 msgstr "Imprimir en la impresora de prueba"

-#~| msgctxt "Color name"
-#~| msgid "Dark Plum"
-#~ msgctxt "Color name"
-#~ msgid "Dark"
-#~ msgstr "Oscuro"
-
 #~ msgctxt "Color name"
 #~ msgid "Light Scarlet Red"
 #~ msgstr "Rojo escarlata claro"
@@ -8493,6 +8264,18 @@ msgstr "Imprimir en la impresora de prueba"
 #~ msgid "Scarlet Red"
 #~ msgstr "Rojo escarlata"

+#~ msgctxt "Color name"
+#~ msgid "Dark Scarlet Red"
+#~ msgstr "Rojo escarlata oscuro"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Orange"
+#~ msgstr "Naranja claro"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Orange"
+#~ msgstr "Naranja oscuro"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Butter"
 #~ msgstr "Mantequilla claro"
@@ -8501,6 +8284,10 @@ msgstr "Imprimir en la impresora de prueba"
 #~ msgid "Butter"
 #~ msgstr "Mantequilla"

+#~ msgctxt "Color name"
+#~ msgid "Dark Butter"
+#~ msgstr "Mantequilla oscuro"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Chameleon"
 #~ msgstr "Camaleón claro"
@@ -8513,10 +8300,22 @@ msgstr "Imprimir en la impresora de prueba"
 #~ msgid "Dark Chameleon"
 #~ msgstr "Camaleón oscuro"

+#~ msgctxt "Color name"
+#~ msgid "Light Sky Blue"
+#~ msgstr "Azul cielo claro"
+
 #~ msgctxt "Color name"
 #~ msgid "Sky Blue"
 #~ msgstr "Azul cielo"

+#~ msgctxt "Color name"
+#~ msgid "Dark Sky Blue"
+#~ msgstr "Azul cielo oscuro"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Plum"
+#~ msgstr "Ciruela claro"
+
 #~ msgctxt "Color name"
 #~ msgid "Plum"
 #~ msgstr "Ciruela"
@@ -8557,18 +8356,42 @@ msgstr "Imprimir en la impresora de prueba"
 #~ msgid "Dark Aluminum 2"
 #~ msgstr "Aluminio oscuro 2"

+#~ msgctxt "Color name"
+#~ msgid "Black"
+#~ msgstr "Negro"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Dark Gray"
+#~ msgstr "Gris muy oscuro"
+
 #~ msgctxt "Color name"
 #~ msgid "Darker Gray"
 #~ msgstr "Gris más oscuro"

+#~ msgctxt "Color name"
+#~ msgid "Dark Gray"
+#~ msgstr "Gris oscuro"
+
 #~ msgctxt "Color name"
 #~ msgid "Medium Gray"
 #~ msgstr "Gris medio"

+#~ msgctxt "Color name"
+#~ msgid "Light Gray"
+#~ msgstr "Gris claro"
+
 #~ msgctxt "Color name"
 #~ msgid "Lighter Gray"
 #~ msgstr "Gris muy claro"

+#~ msgctxt "Color name"
+#~ msgid "Very Light Gray"
+#~ msgstr "Gris muy claro"
+
+#~ msgctxt "Color name"
+#~ msgid "White"
+#~ msgstr "Blanco"
+
 #~ msgid "3.2 core GL profile is not available on EGL implementation"
 #~ msgstr ""
 #~ "El perfil 3.2 del núcleo de GL no está disponible en la implementación de "
@@ -9,9 +9,9 @@
 msgid ""
 msgstr "Project-Id-Version: gtk+ gtk-3-22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-27 21:43+0000\n"
-"PO-Revision-Date: 2020-10-29 21:00+0100\n"
-"Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
+"POT-Creation-Date: 2020-09-18 23:14+0000\n"
+"PO-Revision-Date: 2020-09-19 21:00+0100\n"
+"Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.esu>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
@@ -1913,245 +1913,83 @@ msgstr "Gorria %%%d, Berdea %%%d, Urdina %%%d"
 msgid "Color: %s"
 msgstr "Kolorea: %s"

-#: gtk/gtkcolorchooserwidget.c:446
-msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "Urdin oso argia"
-
-#: gtk/gtkcolorchooserwidget.c:447
-msgctxt "Color name"
-msgid "Light Blue"
-msgstr "Urdin argia"
-
-#: gtk/gtkcolorchooserwidget.c:448
+#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447
+#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449
+#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451
 msgctxt "Color name"
 msgid "Blue"
 msgstr "Urdina"

-#: gtk/gtkcolorchooserwidget.c:449
-msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "Urdin iluna"
-
-#: gtk/gtkcolorchooserwidget.c:450
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "Urdin oso iluna"
-
-#: gtk/gtkcolorchooserwidget.c:451
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "Berde oso argia"
-
-#: gtk/gtkcolorchooserwidget.c:452
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "Berde argia"
-
-#: gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455
+#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457
 msgctxt "Color name"
 msgid "Green"
 msgstr "Berdea"

-#: gtk/gtkcolorchooserwidget.c:454
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "Berde iluna"
-
-#: gtk/gtkcolorchooserwidget.c:455
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "Berde oso iluna"
-
-#: gtk/gtkcolorchooserwidget.c:456
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "Hori oso argia"
-
-#: gtk/gtkcolorchooserwidget.c:457
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "Hori argia"
-
-#: gtk/gtkcolorchooserwidget.c:458
+#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459
+#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461
+#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463
 msgctxt "Color name"
 msgid "Yellow"
 msgstr "Horia"

-#: gtk/gtkcolorchooserwidget.c:459
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "Hori iluna"
-
-#: gtk/gtkcolorchooserwidget.c:460
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "Hori oso iluna"
-
-#: gtk/gtkcolorchooserwidget.c:461
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "Laranja oso argia"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
-msgid "Light Orange"
-msgstr "Laranja argia"
-
-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465
+#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467
+#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Laranja"

-#: gtk/gtkcolorchooserwidget.c:464
-msgctxt "Color name"
-msgid "Dark Orange"
-msgstr "Laranja iluna"
-
-#: gtk/gtkcolorchooserwidget.c:465
-msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "Laranja oso iluna"
-
-#: gtk/gtkcolorchooserwidget.c:466
-msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "Gorri oso argia"
-
-#: gtk/gtkcolorchooserwidget.c:467
-msgctxt "Color name"
-msgid "Light Red"
-msgstr "Gorri argia"
-
-#: gtk/gtkcolorchooserwidget.c:468
+#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471
+#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:474
 msgctxt "Color name"
 msgid "Red"
 msgstr "Gorria"

-#: gtk/gtkcolorchooserwidget.c:469
-msgctxt "Color name"
-msgid "Dark Red"
-msgstr "Gorri iluna"
-
-#: gtk/gtkcolorchooserwidget.c:470
-msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "Gorri oso iluna"
-
-#: gtk/gtkcolorchooserwidget.c:471
-msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "More oso argia"
-
-#: gtk/gtkcolorchooserwidget.c:472
-msgctxt "Color name"
-msgid "Light Purple"
-msgstr "More argia"
-
-#: gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476
+#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:479
 msgctxt "Color name"
 msgid "Purple"
 msgstr "Morea"

-#: gtk/gtkcolorchooserwidget.c:474
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "More iluna"
-
-#: gtk/gtkcolorchooserwidget.c:475
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "More oso iluna"
-
-#: gtk/gtkcolorchooserwidget.c:476
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "Marroi oso argia"
-
-#: gtk/gtkcolorchooserwidget.c:477
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "Marroi argia"
-
-#: gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481
+#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483
+#: gtk/gtkcolorchooserwidget.c:484
 msgctxt "Color name"
 msgid "Brown"
 msgstr "Marroia"

-#: gtk/gtkcolorchooserwidget.c:479
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "Marroi iluna"
-
-#: gtk/gtkcolorchooserwidget.c:480
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "Marroi oso iluna"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "Zuria"
-
-#: gtk/gtkcolorchooserwidget.c:482
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "Gris argia 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "Gris argia 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "Gris argia 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "Gris argia 4"
-
-#: gtk/gtkcolorchooserwidget.c:486
-msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "Gris iluna 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "Gris iluna 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "Gris iluna 3"
-
+#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486
+#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488
 #: gtk/gtkcolorchooserwidget.c:489
 msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "Gris iluna 4"
+msgid "Light"
+msgstr "Argia"

-#: gtk/gtkcolorchooserwidget.c:490
+#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491
+#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493
+#: gtk/gtkcolorchooserwidget.c:494
 msgctxt "Color name"
-msgid "Black"
-msgstr "Beltza"
+msgid "Dark"
+msgstr "Iluna"

 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:538
 msgid "Custom"
 msgstr "Pertsonalizatua"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:545
 msgid "Custom color"
 msgstr "Kolore pertsonalizatua"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:546
 msgid "Create a custom color"
 msgstr "Sortu kolore pertsonalizatua"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:565
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "%d. kolore pertsonalizatua: %s"
@@ -8287,15 +8125,15 @@ msgstr "Fitxategia"
 msgid "_Output format"
 msgstr "_Irteerako formatua"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "Inprimatu LPRen"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "Orrialde orriko"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "Komando-lerroa"

@@ -8334,10 +8172,6 @@ msgstr "irteerako-proba.%s"
 msgid "Print to Test Printer"
 msgstr "Inprimatu probako inprimagailuan"

-#~ msgctxt "Color name"
-#~ msgid "Dark"
-#~ msgstr "Iluna"
-
 #~ msgctxt "Color name"
 #~ msgid "Light Scarlet Red"
 #~ msgstr "Gorri eskarlata argia"
@@ -8346,6 +8180,18 @@ msgstr "Inprimatu probako inprimagailuan"
 #~ msgid "Scarlet Red"
 #~ msgstr "Gorri eskarlata"

+#~ msgctxt "Color name"
+#~ msgid "Dark Scarlet Red"
+#~ msgstr "Gorri eskarlata iluna"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Orange"
+#~ msgstr "Laranja argia"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Orange"
+#~ msgstr "Laranja iluna"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Butter"
 #~ msgstr "Gurin argia"
@@ -8354,6 +8200,10 @@ msgstr "Inprimatu probako inprimagailuan"
 #~ msgid "Butter"
 #~ msgstr "Gurina"

+#~ msgctxt "Color name"
+#~ msgid "Dark Butter"
+#~ msgstr "Gurin iluna"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Chameleon"
 #~ msgstr "Kameleoi argia"
@@ -8366,10 +8216,22 @@ msgstr "Inprimatu probako inprimagailuan"
 #~ msgid "Dark Chameleon"
 #~ msgstr "Kameleoi iluna"

+#~ msgctxt "Color name"
+#~ msgid "Light Sky Blue"
+#~ msgstr "Zeru urdin argia"
+
 #~ msgctxt "Color name"
 #~ msgid "Sky Blue"
 #~ msgstr "Zeru urdina"

+#~ msgctxt "Color name"
+#~ msgid "Dark Sky Blue"
+#~ msgstr "Zeru urdin iluna"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Plum"
+#~ msgstr "Aran argia"
+
 #~ msgctxt "Color name"
 #~ msgid "Plum"
 #~ msgstr "Arana"
@@ -8410,18 +8272,42 @@ msgstr "Inprimatu probako inprimagailuan"
 #~ msgid "Dark Aluminum 2"
 #~ msgstr "Aluminio iluna 2"

+#~ msgctxt "Color name"
+#~ msgid "Black"
+#~ msgstr "Beltza"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Dark Gray"
+#~ msgstr "Gris oso iluna"
+
 #~ msgctxt "Color name"
 #~ msgid "Darker Gray"
 #~ msgstr "Gris ilunagoa"

+#~ msgctxt "Color name"
+#~ msgid "Dark Gray"
+#~ msgstr "Gris iluna"
+
 #~ msgctxt "Color name"
 #~ msgid "Medium Gray"
 #~ msgstr "Tarteko grisa"

+#~ msgctxt "Color name"
+#~ msgid "Light Gray"
+#~ msgstr "Gris argia"
+
 #~ msgctxt "Color name"
 #~ msgid "Lighter Gray"
 #~ msgstr "Gris argiagoa"

+#~ msgctxt "Color name"
+#~ msgid "Very Light Gray"
+#~ msgstr "Gris oso argia"
+
+#~ msgctxt "Color name"
+#~ msgid "White"
+#~ msgstr "Zuria"
+
 #~ msgid "3.2 core GL profile is not available on EGL implementation"
 #~ msgstr "3.2 nukleoa GL profila ez dago erabilgarri EGL inplementazioan"

@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-23 13:46+0000\n"
-"PO-Revision-Date: 2020-12-23 15:21+0000\n"
+"POT-Creation-Date: 2020-09-08 04:53+0000\n"
+"PO-Revision-Date: 2020-09-08 12:04+0000\n"
 "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Bookmarks: 133,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 2.4.1\n"

 #: gdk/broadway/gdkbroadway-server.c:144
 #, c-format
@@ -90,7 +90,7 @@ msgstr "پرچم‌های اشکال‌زدایی GDK که باید صفر شو

 #: gdk/gdkwindow.c:2851
 msgid "GL support disabled via GDK_DEBUG"
-msgstr "پشتیبانی از GL توسط GDK_DEBUG از کار افتاده"
+msgstr "پشتیبانی از GL توسط GDK_DEBUG غیرفعال شده است"

 #: gdk/gdkwindow.c:2862
 msgid "The current backend does not support OpenGL"
@@ -1883,7 +1883,7 @@ msgstr "%Y"
 #: gtk/gtkcellrendereraccel.c:273
 msgctxt "Accelerator"
 msgid "Disabled"
-msgstr "از کار افتاده"
+msgstr "از کار انداخته شده"

 #. This label is displayed in a treeview cell displaying
 #. * an accelerator key combination that is not valid according
@@ -1928,243 +1928,198 @@ msgstr "رنگ: %s"

 #: gtk/gtkcolorchooserwidget.c:446
 msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "آبی خیلی روشن"
+msgid "Light Scarlet Red"
+msgstr "قرمز اسکارلت روشن"

 #: gtk/gtkcolorchooserwidget.c:447
 msgctxt "Color name"
-msgid "Light Blue"
-msgstr "آبی روشن"
+msgid "Scarlet Red"
+msgstr "قرمز اسکارلت"

 #: gtk/gtkcolorchooserwidget.c:448
 msgctxt "Color name"
-msgid "Blue"
-msgstr "آبی"
+msgid "Dark Scarlet Red"
+msgstr "قرمز اسکارلت تیره"

 #: gtk/gtkcolorchooserwidget.c:449
 msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "آبی تیره"
-
-#: gtk/gtkcolorchooserwidget.c:450
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "آبی خیلی تیره"
-
-#: gtk/gtkcolorchooserwidget.c:451
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "سبز خیلی روشن"
-
-#: gtk/gtkcolorchooserwidget.c:452
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "سبز روشن"
-
-#: gtk/gtkcolorchooserwidget.c:453
-msgctxt "Color name"
-msgid "Green"
-msgstr "سبز"
-
-#: gtk/gtkcolorchooserwidget.c:454
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "سبز تیره"
-
-#: gtk/gtkcolorchooserwidget.c:455
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "سبز خیلی تیره"
-
-#: gtk/gtkcolorchooserwidget.c:456
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "زرد خیلی روشن"
-
-#: gtk/gtkcolorchooserwidget.c:457
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "زرد روشن"
-
-#: gtk/gtkcolorchooserwidget.c:458
-msgctxt "Color name"
-msgid "Yellow"
-msgstr "زرد"
-
-#: gtk/gtkcolorchooserwidget.c:459
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "زرد تیره"
-
-#: gtk/gtkcolorchooserwidget.c:460
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "زرد خیلی تیره"
-
-#: gtk/gtkcolorchooserwidget.c:461
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "نارنجی خیلی روشن"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
 msgid "Light Orange"
 msgstr "نارنجی روشن"

-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:450
 msgctxt "Color name"
 msgid "Orange"
 msgstr "نارنجی"

-#: gtk/gtkcolorchooserwidget.c:464
+#: gtk/gtkcolorchooserwidget.c:451
 msgctxt "Color name"
 msgid "Dark Orange"
 msgstr "نارنجی تیره"

+#: gtk/gtkcolorchooserwidget.c:452
+msgctxt "Color name"
+msgid "Light Butter"
+msgstr "کره‌ای روشن"
+
+#: gtk/gtkcolorchooserwidget.c:453
+msgctxt "Color name"
+msgid "Butter"
+msgstr "کره‌ای"
+
+#: gtk/gtkcolorchooserwidget.c:454
+msgctxt "Color name"
+msgid "Dark Butter"
+msgstr "کره‌ای تیره"
+
+#: gtk/gtkcolorchooserwidget.c:455
+msgctxt "Color name"
+msgid "Light Chameleon"
+msgstr "چملون روشن"
+
+#: gtk/gtkcolorchooserwidget.c:456
+msgctxt "Color name"
+msgid "Chameleon"
+msgstr "چملون"
+
+#: gtk/gtkcolorchooserwidget.c:457
+msgctxt "Color name"
+msgid "Dark Chameleon"
+msgstr "چملون تیره"
+
+#: gtk/gtkcolorchooserwidget.c:458
+msgctxt "Color name"
+msgid "Light Sky Blue"
+msgstr "آبی آسمانی روشن"
+
+#: gtk/gtkcolorchooserwidget.c:459
+msgctxt "Color name"
+msgid "Sky Blue"
+msgstr "آبی آسمانی"
+
+#: gtk/gtkcolorchooserwidget.c:460
+msgctxt "Color name"
+msgid "Dark Sky Blue"
+msgstr "آبی آسمانی تیره"
+
+#: gtk/gtkcolorchooserwidget.c:461
+msgctxt "Color name"
+msgid "Light Plum"
+msgstr "آلویی روشن"
+
+#: gtk/gtkcolorchooserwidget.c:462
+msgctxt "Color name"
+msgid "Plum"
+msgstr "آلویی"
+
+#: gtk/gtkcolorchooserwidget.c:463
+msgctxt "Color name"
+msgid "Dark Plum"
+msgstr "آلویی تیره"
+
+#: gtk/gtkcolorchooserwidget.c:464
+msgctxt "Color name"
+msgid "Light Chocolate"
+msgstr "شکلاتی روشن"
+
 #: gtk/gtkcolorchooserwidget.c:465
 msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "نارنجی خیلی تیره"
+msgid "Chocolate"
+msgstr "شکلاتی"

 #: gtk/gtkcolorchooserwidget.c:466
 msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "قرمز خیلی روشن"
+msgid "Dark Chocolate"
+msgstr "شکلاتی تیره"

 #: gtk/gtkcolorchooserwidget.c:467
 msgctxt "Color name"
-msgid "Light Red"
-msgstr "قرمز روشن"
+msgid "Light Aluminum 1"
+msgstr "آلومینیومی روشن ۱"

 #: gtk/gtkcolorchooserwidget.c:468
 msgctxt "Color name"
-msgid "Red"
-msgstr "قرمز"
+msgid "Aluminum 1"
+msgstr "آلومینیومی ۱"

 #: gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
-msgid "Dark Red"
-msgstr "قرمز تیره"
+msgid "Dark Aluminum 1"
+msgstr "آلومینیومی تیره"

 #: gtk/gtkcolorchooserwidget.c:470
 msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "قرمز خیلی تیره"
+msgid "Light Aluminum 2"
+msgstr "آلومینیومی روشن ۱"

 #: gtk/gtkcolorchooserwidget.c:471
 msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "بنفش خیلی روشن"
+msgid "Aluminum 2"
+msgstr "آلومینیومی ۲"

 #: gtk/gtkcolorchooserwidget.c:472
 msgctxt "Color name"
-msgid "Light Purple"
-msgstr "بنفش روشن"
-
-#: gtk/gtkcolorchooserwidget.c:473
-msgctxt "Color name"
-msgid "Purple"
-msgstr "بنفش"
-
-#: gtk/gtkcolorchooserwidget.c:474
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "بنفش تیره"
-
-#: gtk/gtkcolorchooserwidget.c:475
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "بنفش خیلی تیره"
-
-#: gtk/gtkcolorchooserwidget.c:476
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "قهوه‌ای خیلی روشن"
-
-#: gtk/gtkcolorchooserwidget.c:477
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "قهوه‌ای روشن"
-
-#: gtk/gtkcolorchooserwidget.c:478
-msgctxt "Color name"
-msgid "Brown"
-msgstr "قهوه‌ای"
-
-#: gtk/gtkcolorchooserwidget.c:479
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "قهوه‌ای تیره"
-
-#: gtk/gtkcolorchooserwidget.c:480
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "قهوه‌ای خیلی تیره"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "سفید"
-
-#: gtk/gtkcolorchooserwidget.c:482
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "خاکستری روشن ۱"
-
-#: gtk/gtkcolorchooserwidget.c:483
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "خاکستری روشن ۲"
-
-#: gtk/gtkcolorchooserwidget.c:484
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "خاکستری روشن ۳"
-
-#: gtk/gtkcolorchooserwidget.c:485
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "خاکستری روشن ۴"
+msgid "Dark Aluminum 2"
+msgstr "آلومینیومی تیره ۲"

 #: gtk/gtkcolorchooserwidget.c:486
 msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "خاکستری تیره ۱"
-
-#: gtk/gtkcolorchooserwidget.c:487
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "خاکستری تیره ۲"
-
-#: gtk/gtkcolorchooserwidget.c:488
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "خاکستری تیره ۳"
-
-#: gtk/gtkcolorchooserwidget.c:489
-msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "خاکستری تیره ۴"
-
-#: gtk/gtkcolorchooserwidget.c:490
-msgctxt "Color name"
 msgid "Black"
 msgstr "مشکی"

+#: gtk/gtkcolorchooserwidget.c:487
+msgctxt "Color name"
+msgid "Very Dark Gray"
+msgstr "خاکستری خیلی تیره"
+
+#: gtk/gtkcolorchooserwidget.c:488
+msgctxt "Color name"
+msgid "Darker Gray"
+msgstr "خاکستری تیره‌تر"
+
+#: gtk/gtkcolorchooserwidget.c:489
+msgctxt "Color name"
+msgid "Dark Gray"
+msgstr "خاکستری تیره"
+
+#: gtk/gtkcolorchooserwidget.c:490
+msgctxt "Color name"
+msgid "Medium Gray"
+msgstr "خاکستری متوسط"
+
+#: gtk/gtkcolorchooserwidget.c:491
+msgctxt "Color name"
+msgid "Light Gray"
+msgstr "خاکستری روشن"
+
+#: gtk/gtkcolorchooserwidget.c:492
+msgctxt "Color name"
+msgid "Lighter Gray"
+msgstr "خاکستری روشن‌تر"
+
+#: gtk/gtkcolorchooserwidget.c:493
+msgctxt "Color name"
+msgid "Very Light Gray"
+msgstr "خاکستری خیلی روشن‌تر"
+
+#: gtk/gtkcolorchooserwidget.c:494
+msgctxt "Color name"
+msgid "White"
+msgstr "سفید"
+
 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:543
 msgid "Custom"
 msgstr "سفارشی"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:550
 msgid "Custom color"
 msgstr "رنگ سفارشی"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:551
 msgid "Create a custom color"
 msgstr "ایجاد یک رنگ سفارشی"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:570
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "رنگ سفارشی %Id: %s"
@@ -2706,51 +2661,51 @@ msgctxt "font"
 msgid "None"
 msgstr "هیچ‌کدام"

-#: gtk/gtkfontchooserwidget.c:1556
+#: gtk/gtkfontchooserwidget.c:1525
 msgid "Width"
 msgstr "پهنا"

-#: gtk/gtkfontchooserwidget.c:1557
+#: gtk/gtkfontchooserwidget.c:1526
 msgid "Weight"
 msgstr "وزن"

-#: gtk/gtkfontchooserwidget.c:1558
+#: gtk/gtkfontchooserwidget.c:1527
 msgid "Italic"
 msgstr "کج"

-#: gtk/gtkfontchooserwidget.c:1559
+#: gtk/gtkfontchooserwidget.c:1528
 msgid "Slant"
 msgstr "شکافتن"

-#: gtk/gtkfontchooserwidget.c:1560
+#: gtk/gtkfontchooserwidget.c:1529
 msgid "Optical Size"
 msgstr "اندازهٔ نوری"

-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
+#: gtk/gtkfontchooserwidget.c:2066 gtk/inspector/prop-editor.c:1676
 msgid "Default"
 msgstr "پیش‌گزیده"

-#: gtk/gtkfontchooserwidget.c:2144
+#: gtk/gtkfontchooserwidget.c:2113
 msgid "Ligatures"
 msgstr "جایگزین‌ها"

-#: gtk/gtkfontchooserwidget.c:2145
+#: gtk/gtkfontchooserwidget.c:2114
 msgid "Letter Case"
 msgstr "حالت حرف"

-#: gtk/gtkfontchooserwidget.c:2146
+#: gtk/gtkfontchooserwidget.c:2115
 msgid "Number Case"
 msgstr "حالت عدد"

-#: gtk/gtkfontchooserwidget.c:2147
+#: gtk/gtkfontchooserwidget.c:2116
 msgid "Number Spacing"
 msgstr "فاصله‌گذاری عدد"

-#: gtk/gtkfontchooserwidget.c:2148
+#: gtk/gtkfontchooserwidget.c:2117
 msgid "Number Formatting"
 msgstr "قالب‌بندی عدد"

-#: gtk/gtkfontchooserwidget.c:2149
+#: gtk/gtkfontchooserwidget.c:2118
 msgid "Character Variants"
 msgstr "دگرگونه‌های نویسه"

@@ -4079,7 +4034,7 @@ msgstr "پیشوند"

 #: gtk/inspector/actions.ui:56
 msgid "Enabled"
-msgstr "به‌کارافتاده"
+msgstr "فعال شده"

 #: gtk/inspector/actions.ui:69
 msgid "Parameter Type"
@@ -4094,7 +4049,8 @@ msgid ""
 "You can temporarily disable this custom CSS by clicking on the “Pause” button "
 "above."
 msgstr ""
-"با کلیک روی دکمه «مکث» در بالا می‌توانید این CSS شخصی را موقّتاً از کار بیندازید."
+"شما می‌توانید بطور موقت این CSS سفارشی را با کلیک روی دکمه «مکث» در بالا غیرفعال "
+"کنید."

 #: gtk/inspector/css-editor.c:114
 msgid "Changes are applied instantly and globally, for the whole application."
@@ -4107,7 +4063,7 @@ msgstr "ذخیره CSS شکست خورد"

 #: gtk/inspector/css-editor.ui:34
 msgid "Disable this custom CSS"
-msgstr "از کار انداختن CSS سفارشی"
+msgstr "غیرفعال‌سازی CSS سفارشی"

 #: gtk/inspector/css-editor.ui:55
 msgid "Save the current CSS"
@@ -4511,7 +4467,7 @@ msgstr "تجمعی"

 #: gtk/inspector/statistics.ui:165
 msgid "Enable statistics with GOBJECT_DEBUG=instance-count"
-msgstr "به کار انداختن با GOBJECT_DEBUG=instance-count"
+msgstr "فعال‌سازی آمارها را با GOBJECT_DEBUG=instance-count"

 #: gtk/inspector/visual.c:432 gtk/inspector/visual.c:447
 msgid "Theme is hardcoded by GTK_THEME"
@@ -4535,7 +4491,7 @@ msgstr ""

 #: gtk/inspector/visual.c:831 gtk/inspector/visual.c:832 gtk/inspector/visual.c:833
 msgid "GL rendering is disabled"
-msgstr "پرداخت GL از کار افتاده"
+msgstr "رندر GL غیرفعال است"

 #: gtk/inspector/visual.ui:61
 msgid "GTK+ Theme"
@@ -4635,7 +4591,7 @@ msgstr "همیشه"

 #: gtk/inspector/visual.ui:742
 msgid "Disabled"
-msgstr "از کار افتاده"
+msgstr "غیرفعال"

 #: gtk/inspector/visual.ui:766
 msgid "Software GL"
@@ -4651,15 +4607,15 @@ msgstr "افزونه بافت مستطیل"

 #: gtk/inspector/window.ui:31
 msgid "Select an Object"
-msgstr "شی‌ای برگزینید"
+msgstr "یک شیء انتخاب کنید"

 #: gtk/inspector/window.ui:54 gtk/inspector/window.ui:134
 msgid "Show Details"
-msgstr "نمایش جزییات"
+msgstr "نمایش جزئیات"

 #: gtk/inspector/window.ui:77
 msgid "Show all Objects"
-msgstr "نمایش تمام اشیا"
+msgstr "نمایش تمام اشیاء"

 #: gtk/inspector/window.ui:107
 msgid "Collect Statistics"
@@ -4695,7 +4651,7 @@ msgstr "سلسله‌مراتب کلاس"

 #: gtk/inspector/window.ui:422
 msgid "CSS Selector"
-msgstr "گزینشگر CSS"
+msgstr "انتخابگر CSS"

 #: gtk/inspector/window.ui:431
 msgid "CSS nodes"
@@ -5943,42 +5899,42 @@ msgstr "پاکت you8"
 #: gtk/paper_names_offsets.c:103
 msgctxt "paper size"
 msgid "10×11"
-msgstr "۱۰×۱۱"
+msgstr "10×11"

 #: gtk/paper_names_offsets.c:104
 msgctxt "paper size"
 msgid "10×13"
-msgstr "۱۰×۱۳"
+msgstr "10×13"

 #: gtk/paper_names_offsets.c:105
 msgctxt "paper size"
 msgid "10×14"
-msgstr "۱۰×۱۴"
+msgstr "10×14"

 #: gtk/paper_names_offsets.c:106
 msgctxt "paper size"
 msgid "10×15"
-msgstr "۱۰×۱۵"
+msgstr "10×15"

 #: gtk/paper_names_offsets.c:107
 msgctxt "paper size"
 msgid "11×12"
-msgstr "۱۱×۱۲"
+msgstr "11×12"

 #: gtk/paper_names_offsets.c:108
 msgctxt "paper size"
 msgid "11×15"
-msgstr "۱۱×۱۵"
+msgstr "11×15"

 #: gtk/paper_names_offsets.c:109
 msgctxt "paper size"
 msgid "12×19"
-msgstr "۱۲×۱۹"
+msgstr "12×19"

 #: gtk/paper_names_offsets.c:110
 msgctxt "paper size"
 msgid "5×7"
-msgstr "۵×۷"
+msgstr "5×7"

 #: gtk/paper_names_offsets.c:111
 msgctxt "paper size"
@@ -6208,12 +6164,12 @@ msgstr "ربع کاغذی"
 #: gtk/paper_names_offsets.c:156
 msgctxt "paper size"
 msgid "Super A"
-msgstr "سوپر A"
+msgstr "Super A"

 #: gtk/paper_names_offsets.c:157
 msgctxt "paper size"
 msgid "Super B"
-msgstr "سوپر B"
+msgstr "Super B"

 #: gtk/paper_names_offsets.c:158
 msgctxt "paper size"
@@ -8316,15 +8272,15 @@ msgstr "پرونده"
 msgid "_Output format"
 msgstr "_قالب خروجی"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "چاپ به صورت LPR"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "تعداد صفحات در برگه"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "خط فرمان"

@@ -8363,78 +8319,6 @@ msgstr "آزمایش خروجی.%s"
 msgid "Print to Test Printer"
 msgstr "چاپ به چاپگر آزمایشی"

-#~ msgctxt "Color name"
-#~ msgid "Scarlet Red"
-#~ msgstr "قرمز اسکارلت"
-
-#~ msgctxt "Color name"
-#~ msgid "Light Butter"
-#~ msgstr "کره‌ای روشن"
-
-#~ msgctxt "Color name"
-#~ msgid "Butter"
-#~ msgstr "کره‌ای"
-
-#~ msgctxt "Color name"
-#~ msgid "Chameleon"
-#~ msgstr "چملون"
-
-#~ msgctxt "Color name"
-#~ msgid "Sky Blue"
-#~ msgstr "آبی آسمانی"
-
-#~ msgctxt "Color name"
-#~ msgid "Plum"
-#~ msgstr "آلویی"
-
-#~ msgctxt "Color name"
-#~ msgid "Light Chocolate"
-#~ msgstr "شکلاتی روشن"
-
-#~ msgctxt "Color name"
-#~ msgid "Chocolate"
-#~ msgstr "شکلاتی"
-
-#~ msgctxt "Color name"
-#~ msgid "Dark Chocolate"
-#~ msgstr "شکلاتی تیره"
-
-#~ msgctxt "Color name"
-#~ msgid "Light Aluminum 1"
-#~ msgstr "آلومینیومی روشن ۱"
-
-#~ msgctxt "Color name"
-#~ msgid "Aluminum 1"
-#~ msgstr "آلومینیومی ۱"
-
-#~ msgctxt "Color name"
-#~ msgid "Dark Aluminum 1"
-#~ msgstr "آلومینیومی تیره"
-
-#~ msgctxt "Color name"
-#~ msgid "Light Aluminum 2"
-#~ msgstr "آلومینیومی روشن ۱"
-
-#~ msgctxt "Color name"
-#~ msgid "Aluminum 2"
-#~ msgstr "آلومینیومی ۲"
-
-#~ msgctxt "Color name"
-#~ msgid "Dark Aluminum 2"
-#~ msgstr "آلومینیومی تیره ۲"
-
-#~ msgctxt "Color name"
-#~ msgid "Darker Gray"
-#~ msgstr "خاکستری تیره‌تر"
-
-#~ msgctxt "Color name"
-#~ msgid "Medium Gray"
-#~ msgstr "خاکستری متوسط"
-
-#~ msgctxt "Color name"
-#~ msgid "Lighter Gray"
-#~ msgstr "خاکستری روشن‌تر"
-
 #~ msgid "3.2 core GL profile is not available on EGL implementation"
 #~ msgstr "نمایه هسته ۳.۲ از GL بر روی پیاده‌سازی EGL موجود نیست"

@@ -13,14 +13,14 @@
 # Antón Méixome <meixome@certima.net>, 2009, 2010.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012-2021.
+# Fran Dieguez <frandieguez@gnome.org>, 2012-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-master-po-gl-77922___.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-31 10:25+0000\n"
-"PO-Revision-Date: 2021-01-05 00:03+0100\n"
+"POT-Creation-Date: 2020-09-18 21:09+0000\n"
+"PO-Revision-Date: 2020-09-19 01:11+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <proxecto@trasno.gal>\n"
 "Language: gl\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 3.38.0\n"
+"X-Generator: Gtranslator 3.36.0\n"
 "X-Project-Style: gnome\n"

 #: gdk/broadway/gdkbroadway-server.c:144
@@ -1946,313 +1946,90 @@ msgstr "Vermello %d%%, Verde %d%%, Azul %d%%"
 msgid "Color: %s"
 msgstr "Cor: %s"

-#: gtk/gtkcolorchooserwidget.c:446
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "Azul moi claro"
-
-#: gtk/gtkcolorchooserwidget.c:447
-#| msgctxt "Color name"
-#| msgid "Light Sky Blue"
-msgctxt "Color name"
-msgid "Light Blue"
-msgstr "Azul claro"
-
-#: gtk/gtkcolorchooserwidget.c:448
+#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447
+#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449
+#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451
+#| msgid "_Blue:"
 msgctxt "Color name"
 msgid "Blue"
 msgstr "Azul"

-#: gtk/gtkcolorchooserwidget.c:449
-#| msgctxt "Color name"
-#| msgid "Dark Sky Blue"
-msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "Azul escuro"
-
-#: gtk/gtkcolorchooserwidget.c:450
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "Azul moi escuro"
-
-#: gtk/gtkcolorchooserwidget.c:451
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "Verde moi claro"
-
-#: gtk/gtkcolorchooserwidget.c:452
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "Gris claro"
-
-#: gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455
+#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457
+#| msgid "_Green:"
 msgctxt "Color name"
 msgid "Green"
 msgstr "Verde"

-#: gtk/gtkcolorchooserwidget.c:454
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "Verde escuro"
-
-#: gtk/gtkcolorchooserwidget.c:455
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "Verde moi escuro"
-
-#: gtk/gtkcolorchooserwidget.c:456
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "Amarelo moi claro"
-
-#: gtk/gtkcolorchooserwidget.c:457
-#| msgctxt "Color name"
-#| msgid "Yellow"
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "Amarelo claro"
-
-#: gtk/gtkcolorchooserwidget.c:458
+#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459
+#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461
+#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463
 msgctxt "Color name"
 msgid "Yellow"
 msgstr "Amarelo"

-#: gtk/gtkcolorchooserwidget.c:459
-#| msgctxt "Color name"
-#| msgid "Yellow"
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "Amarelo escuro"
-
-#: gtk/gtkcolorchooserwidget.c:460
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "Amarelo moi escuro"
-
-#: gtk/gtkcolorchooserwidget.c:461
-#| msgctxt "Color name"
-#| msgid "Light Orange"
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "Laranxa moi claro"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
-msgid "Light Orange"
-msgstr "Laranxa claro"
-
-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465
+#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467
+#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Laranxa"

-#: gtk/gtkcolorchooserwidget.c:464
-msgctxt "Color name"
-msgid "Dark Orange"
-msgstr "Laranxa escuro"
-
-#: gtk/gtkcolorchooserwidget.c:465
-#| msgctxt "Color name"
-#| msgid "Dark Orange"
-msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "Laranxa moi escuro"
-
-#: gtk/gtkcolorchooserwidget.c:466
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "Vermello moi claro"
-
-#: gtk/gtkcolorchooserwidget.c:467
-#| msgctxt "Color name"
-#| msgid "Light"
-msgctxt "Color name"
-msgid "Light Red"
-msgstr "Vermello claro"
-
-#: gtk/gtkcolorchooserwidget.c:468
+#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471
+#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:474
+#| msgid "_Red:"
 msgctxt "Color name"
 msgid "Red"
 msgstr "Vermello"

-#: gtk/gtkcolorchooserwidget.c:469
-#| msgctxt "Color name"
-#| msgid "Dark Scarlet Red"
-msgctxt "Color name"
-msgid "Dark Red"
-msgstr "Vermello escuro"
-
-#: gtk/gtkcolorchooserwidget.c:470
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "Vermello moi escuro"
-
-#: gtk/gtkcolorchooserwidget.c:471
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "Morado moi claro"
-
-#: gtk/gtkcolorchooserwidget.c:472
-#| msgctxt "Color name"
-#| msgid "Light Plum"
-msgctxt "Color name"
-msgid "Light Purple"
-msgstr "Morado claro"
-
-#: gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476
+#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:479
 msgctxt "Color name"
 msgid "Purple"
 msgstr "Morado"

-#: gtk/gtkcolorchooserwidget.c:474
-#| msgctxt "Color name"
-#| msgid "Purple"
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "Morado escuro"
-
-#: gtk/gtkcolorchooserwidget.c:475
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "Morado moi escuro"
-
-#: gtk/gtkcolorchooserwidget.c:476
-#| msgctxt "Color name"
-#| msgid "Very Light Gray"
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "Marrón moi claro"
-
-#: gtk/gtkcolorchooserwidget.c:477
-#| msgctxt "output-bin"
-#| msgid "Right Bin"
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "Marrón claro"
-
-#: gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481
+#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483
+#: gtk/gtkcolorchooserwidget.c:484
 msgctxt "Color name"
 msgid "Brown"
 msgstr "Marrón"

-#: gtk/gtkcolorchooserwidget.c:479
-#| msgctxt "Color name"
-#| msgid "Dark Butter"
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "Marrón escuro"
-
-#: gtk/gtkcolorchooserwidget.c:480
-#| msgctxt "Color name"
-#| msgid "Very Dark Gray"
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "Marrón moi escuro"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "Branco"
-
-#: gtk/gtkcolorchooserwidget.c:482
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "Gris claro 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "Gris claro 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "Gris claro 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-#| msgctxt "Color name"
-#| msgid "Light Gray"
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "Gris claro 4"
-
-#: gtk/gtkcolorchooserwidget.c:486
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "Gris escuro 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "Gris escuro 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "Gris escuro 3"
-
+#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486
+#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488
 #: gtk/gtkcolorchooserwidget.c:489
-#| msgctxt "Color name"
-#| msgid "Dark Gray"
+#| msgctxt "keyboard label"
+#| msgid "Right"
 msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "Gris escuro 4"
+msgid "Light"
+msgstr "Claro"

-#: gtk/gtkcolorchooserwidget.c:490
+#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491
+#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493
+#: gtk/gtkcolorchooserwidget.c:494
+#| msgctxt "Color name"
+#| msgid "Dark Plum"
 msgctxt "Color name"
-msgid "Black"
-msgstr "Negro"
+msgid "Dark"
+msgstr "Escuro"

 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:538
 msgid "Custom"
 msgstr "Personalizado"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:545
 msgid "Custom color"
 msgstr "Cor personalizado"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:546
 msgid "Create a custom color"
 msgstr "Crear un cor personalizado"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:565
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "Cor personalizado %d: %s"
@@ -2798,51 +2575,51 @@ msgctxt "font"
 msgid "None"
 msgstr "Ningún"

-#: gtk/gtkfontchooserwidget.c:1556
+#: gtk/gtkfontchooserwidget.c:1525
 msgid "Width"
 msgstr "Anchura"

-#: gtk/gtkfontchooserwidget.c:1557
+#: gtk/gtkfontchooserwidget.c:1526
 msgid "Weight"
 msgstr "Peso"

-#: gtk/gtkfontchooserwidget.c:1558
+#: gtk/gtkfontchooserwidget.c:1527
 msgid "Italic"
 msgstr "Cursiva"

-#: gtk/gtkfontchooserwidget.c:1559
+#: gtk/gtkfontchooserwidget.c:1528
 msgid "Slant"
 msgstr "Slant"

-#: gtk/gtkfontchooserwidget.c:1560
+#: gtk/gtkfontchooserwidget.c:1529
 msgid "Optical Size"
 msgstr "Tamaño óptico"

-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
+#: gtk/gtkfontchooserwidget.c:2066 gtk/inspector/prop-editor.c:1676
 msgid "Default"
 msgstr "Por omisión"

-#: gtk/gtkfontchooserwidget.c:2144
+#: gtk/gtkfontchooserwidget.c:2113
 msgid "Ligatures"
 msgstr "Ligaduras"

-#: gtk/gtkfontchooserwidget.c:2145
+#: gtk/gtkfontchooserwidget.c:2114
 msgid "Letter Case"
 msgstr "Maiúscula"

-#: gtk/gtkfontchooserwidget.c:2146
+#: gtk/gtkfontchooserwidget.c:2115
 msgid "Number Case"
 msgstr "Maiúscula numérica"

-#: gtk/gtkfontchooserwidget.c:2147
+#: gtk/gtkfontchooserwidget.c:2116
 msgid "Number Spacing"
 msgstr "Espaciado numérico"

-#: gtk/gtkfontchooserwidget.c:2148
+#: gtk/gtkfontchooserwidget.c:2117
 msgid "Number Formatting"
 msgstr "Formato numérico"

-#: gtk/gtkfontchooserwidget.c:2149
+#: gtk/gtkfontchooserwidget.c:2118
 msgid "Character Variants"
 msgstr "Variantes de caracteres"

@@ -8425,15 +8202,15 @@ msgstr "Ficheiro"
 msgid "_Output format"
 msgstr "Formato de _saída"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "Imprimir a LPR"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "Páxinas por folla"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "Liña de ordes"

@@ -8472,12 +8249,6 @@ msgstr "saída-de-proba.%s"
 msgid "Print to Test Printer"
 msgstr "Imprimir para probar a impresora"

-#~| msgctxt "Color name"
-#~| msgid "Dark Plum"
-#~ msgctxt "Color name"
-#~ msgid "Dark"
-#~ msgstr "Escuro"
-
 #~ msgctxt "Color name"
 #~ msgid "Light Scarlet Red"
 #~ msgstr "Vermello escarlata claro"
@@ -8486,6 +8257,18 @@ msgstr "Imprimir para probar a impresora"
 #~ msgid "Scarlet Red"
 #~ msgstr "Vermello escarlata"

+#~ msgctxt "Color name"
+#~ msgid "Dark Scarlet Red"
+#~ msgstr "Vermello escarlata escuro"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Orange"
+#~ msgstr "Laranxa claro"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Orange"
+#~ msgstr "Laranxa escuro"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Butter"
 #~ msgstr "Manteiga claro"
@@ -8494,6 +8277,10 @@ msgstr "Imprimir para probar a impresora"
 #~ msgid "Butter"
 #~ msgstr "Manteiga"

+#~ msgctxt "Color name"
+#~ msgid "Dark Butter"
+#~ msgstr "Manteiga escuro"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Chameleon"
 #~ msgstr "Camaleón claro"
@@ -8506,10 +8293,22 @@ msgstr "Imprimir para probar a impresora"
 #~ msgid "Dark Chameleon"
 #~ msgstr "Camaleón escuro"

+#~ msgctxt "Color name"
+#~ msgid "Light Sky Blue"
+#~ msgstr "Axul ceo claro"
+
 #~ msgctxt "Color name"
 #~ msgid "Sky Blue"
 #~ msgstr "Azul ceo"

+#~ msgctxt "Color name"
+#~ msgid "Dark Sky Blue"
+#~ msgstr "Azul ceo escuro"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Plum"
+#~ msgstr "Cirola claro"
+
 #~ msgctxt "Color name"
 #~ msgid "Plum"
 #~ msgstr "Cirola"
@@ -8550,14 +8349,38 @@ msgstr "Imprimir para probar a impresora"
 #~ msgid "Dark Aluminum 2"
 #~ msgstr "Aluminio claro 2"

+#~ msgctxt "Color name"
+#~ msgid "Black"
+#~ msgstr "Negro"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Dark Gray"
+#~ msgstr "Gris moi escuro"
+
 #~ msgctxt "Color name"
 #~ msgid "Darker Gray"
 #~ msgstr "Gris moi escuro"

+#~ msgctxt "Color name"
+#~ msgid "Dark Gray"
+#~ msgstr "Gris escuro"
+
 #~ msgctxt "Color name"
 #~ msgid "Medium Gray"
 #~ msgstr "Gris medio"

+#~ msgctxt "Color name"
+#~ msgid "Light Gray"
+#~ msgstr "Gris claro"
+
 #~ msgctxt "Color name"
 #~ msgid "Lighter Gray"
 #~ msgstr "Gris moi claro"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Light Gray"
+#~ msgstr "Gris moi claro"
+
+#~ msgctxt "Color name"
+#~ msgid "White"
+#~ msgstr "Branco"
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-07 19:57+0000\n"
-"PO-Revision-Date: 2020-10-19 18:35+0200\n"
+"POT-Creation-Date: 2020-09-17 15:18+0000\n"
+"PO-Revision-Date: 2020-09-17 17:36+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -1930,245 +1930,83 @@ msgstr "Crvena %d%%, Zelena %d%%, Plava %d%%"
 msgid "Color: %s"
 msgstr "Boja: %s"

-#: gtk/gtkcolorchooserwidget.c:446
-msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "Vrlo svjetlo plava"
-
-#: gtk/gtkcolorchooserwidget.c:447
-msgctxt "Color name"
-msgid "Light Blue"
-msgstr "Svjetlo plava"
-
-#: gtk/gtkcolorchooserwidget.c:448
+#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447
+#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449
+#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451
 msgctxt "Color name"
 msgid "Blue"
 msgstr "Plava"

-#: gtk/gtkcolorchooserwidget.c:449
-msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "Tamno plava"
-
-#: gtk/gtkcolorchooserwidget.c:450
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "Vrlo tamno plava"
-
-#: gtk/gtkcolorchooserwidget.c:451
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "Vrlo svjetlo zelena"
-
-#: gtk/gtkcolorchooserwidget.c:452
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "Svjetlo zelena"
-
-#: gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455
+#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457
 msgctxt "Color name"
 msgid "Green"
 msgstr "Zelena"

-#: gtk/gtkcolorchooserwidget.c:454
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "Tamno zelena"
-
-#: gtk/gtkcolorchooserwidget.c:455
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "Vrlo tamno zelena"
-
-#: gtk/gtkcolorchooserwidget.c:456
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "Vrlo svjetlo žuta"
-
-#: gtk/gtkcolorchooserwidget.c:457
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "Svjetlo žuta"
-
-#: gtk/gtkcolorchooserwidget.c:458
+#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459
+#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461
+#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463
 msgctxt "Color name"
 msgid "Yellow"
 msgstr "Žuta"

-#: gtk/gtkcolorchooserwidget.c:459
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "Tamno žuta"
-
-#: gtk/gtkcolorchooserwidget.c:460
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "Vrlo tamno žuta"
-
-#: gtk/gtkcolorchooserwidget.c:461
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "Vrlo svjetlo narančasta"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
-msgid "Light Orange"
-msgstr "Svjetlo narančasta"
-
-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465
+#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467
+#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Narančasta"

-#: gtk/gtkcolorchooserwidget.c:464
-msgctxt "Color name"
-msgid "Dark Orange"
-msgstr "Tamno narančasta"
-
-#: gtk/gtkcolorchooserwidget.c:465
-msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "Vrlo tamno narančasta"
-
-#: gtk/gtkcolorchooserwidget.c:466
-msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "Vrlo svjetlo crvena"
-
-#: gtk/gtkcolorchooserwidget.c:467
-msgctxt "Color name"
-msgid "Light Red"
-msgstr "Svjetlo crvena"
-
-#: gtk/gtkcolorchooserwidget.c:468
+#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471
+#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:474
 msgctxt "Color name"
 msgid "Red"
 msgstr "Crvena"

-#: gtk/gtkcolorchooserwidget.c:469
-msgctxt "Color name"
-msgid "Dark Red"
-msgstr "Tamno crvena"
-
-#: gtk/gtkcolorchooserwidget.c:470
-msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "Vrlo tamno crvena"
-
-#: gtk/gtkcolorchooserwidget.c:471
-msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "Vrlo svjetlo ljubičasta"
-
-#: gtk/gtkcolorchooserwidget.c:472
-msgctxt "Color name"
-msgid "Light Purple"
-msgstr "Svjetlo ljubičasta"
-
-#: gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476
+#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:479
 msgctxt "Color name"
 msgid "Purple"
 msgstr "Ljubičasta"

-#: gtk/gtkcolorchooserwidget.c:474
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "Tamno ljubičasta"
-
-#: gtk/gtkcolorchooserwidget.c:475
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "Vrlo tamno ljubičasta"
-
-#: gtk/gtkcolorchooserwidget.c:476
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "Vrlo svjetlo smeđa"
-
-#: gtk/gtkcolorchooserwidget.c:477
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "Svjetlo smeđa"
-
-#: gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481
+#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483
+#: gtk/gtkcolorchooserwidget.c:484
 msgctxt "Color name"
 msgid "Brown"
 msgstr "Smeđa"

-#: gtk/gtkcolorchooserwidget.c:479
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "Tamno smeđa"
-
-#: gtk/gtkcolorchooserwidget.c:480
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "Vrlo tamno smeđa"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "Bijela"
-
-#: gtk/gtkcolorchooserwidget.c:482
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "Svjetlo siva 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "Svjetlo siva 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "Svjetlo siva 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "Svjetlo siva 4"
-
-#: gtk/gtkcolorchooserwidget.c:486
-msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "Tamno siva 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "Tamno siva 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "Tamno siva 3"
-
+#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486
+#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488
 #: gtk/gtkcolorchooserwidget.c:489
 msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "Tamno siva 4"
+msgid "Light"
+msgstr "Svjetla"

-#: gtk/gtkcolorchooserwidget.c:490
+#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491
+#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493
+#: gtk/gtkcolorchooserwidget.c:494
 msgctxt "Color name"
-msgid "Black"
-msgstr "Crna"
+msgid "Dark"
+msgstr "Tamna"

 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:538
 msgid "Custom"
 msgstr "Prilagođena"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:545
 msgid "Custom color"
 msgstr "Prilagođena boja"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:546
 msgid "Create a custom color"
 msgstr "Stvori prilagođenu boju"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:565
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "Prilagođena boja %d: %s"
@@ -8378,10 +8216,6 @@ msgstr "testni-ispis.%s"
 msgid "Print to Test Printer"
 msgstr "Ispiši na testnom pisaču"

-#~ msgctxt "Color name"
-#~ msgid "Dark"
-#~ msgstr "Tamna"
-
 #~ msgid "This clipboard cannot store data."
 #~ msgstr "Međuspremnik ne može pohraniti podatke."

@@ -8604,6 +8438,18 @@ msgstr "Ispiši na testnom pisaču"
 #~ msgid "Scarlet Red"
 #~ msgstr "Grimizno crvena"

+#~ msgctxt "Color name"
+#~ msgid "Dark Scarlet Red"
+#~ msgstr "Tamno grimizno crvena"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Orange"
+#~ msgstr "Svjetlo narančasta"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Orange"
+#~ msgstr "Tamno narančasta"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Butter"
 #~ msgstr "Svjetlo maslo"
@@ -8612,6 +8458,10 @@ msgstr "Ispiši na testnom pisaču"
 #~ msgid "Butter"
 #~ msgstr "Maslo"

+#~ msgctxt "Color name"
+#~ msgid "Dark Butter"
+#~ msgstr "Tamno maslo"
+
 #~ msgctxt "Color name"
 #~ msgid "Light Chameleon"
 #~ msgstr "Svjetli kameleon"
@@ -8624,10 +8474,22 @@ msgstr "Ispiši na testnom pisaču"
 #~ msgid "Dark Chameleon"
 #~ msgstr "Tamni kameleon"

+#~ msgctxt "Color name"
+#~ msgid "Light Sky Blue"
+#~ msgstr "Svjetlo nebesko plava"
+
 #~ msgctxt "Color name"
 #~ msgid "Sky Blue"
 #~ msgstr "Nebesko plava"

+#~ msgctxt "Color name"
+#~ msgid "Dark Sky Blue"
+#~ msgstr "Tamno nebesko plava"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Plum"
+#~ msgstr "Svjetla šljiva"
+
 #~ msgctxt "Color name"
 #~ msgid "Plum"
 #~ msgstr "Šljiva"
@@ -8668,18 +8530,42 @@ msgstr "Ispiši na testnom pisaču"
 #~ msgid "Dark Aluminum 2"
 #~ msgstr "Tamna aluminijska 2"

+#~ msgctxt "Color name"
+#~ msgid "Black"
+#~ msgstr "Crna"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Dark Gray"
+#~ msgstr "Vrlo tamno siva"
+
 #~ msgctxt "Color name"
 #~ msgid "Darker Gray"
 #~ msgstr "Tamnije siva"

+#~ msgctxt "Color name"
+#~ msgid "Dark Gray"
+#~ msgstr "Tamno siva"
+
 #~ msgctxt "Color name"
 #~ msgid "Medium Gray"
 #~ msgstr "Srednje siva"

+#~ msgctxt "Color name"
+#~ msgid "Light Gray"
+#~ msgstr "Svjetlo siva"
+
 #~ msgctxt "Color name"
 #~ msgid "Lighter Gray"
 #~ msgstr "Svjetlije siva"

+#~ msgctxt "Color name"
+#~ msgid "Very Light Gray"
+#~ msgstr "Vrlo svjetlo siva"
+
+#~ msgctxt "Color name"
+#~ msgid "White"
+#~ msgstr "Bijela"
+
 #~ msgid "Customize"
 #~ msgstr "Prilagodi"

@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ gtk-3-22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-08 03:44+0000\n"
-"PO-Revision-Date: 2020-11-08 19:06+0700\n"
+"POT-Creation-Date: 2020-09-19 12:17+0000\n"
+"PO-Revision-Date: 2020-09-20 10:03+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@@ -27,7 +27,7 @@ msgstr ""
 #: gdk/broadway/gdkbroadway-server.c:144
 #, c-format
 msgid "Broadway display type not supported: %s"
-msgstr "Tipe tampilan Broadway tak didukung: %s"
+msgstr "Tipe tampilan broadway tak didukung: %s"

 #: gdk/gdk.c:179
 #, c-format
@@ -1939,245 +1939,83 @@ msgstr "Merah %d%%, Hijau %d%%, Biru %d%%"
 msgid "Color: %s"
 msgstr "Warna: %s"

-#: gtk/gtkcolorchooserwidget.c:446
-msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "Biru Sangat Terang"
-
-#: gtk/gtkcolorchooserwidget.c:447
-msgctxt "Color name"
-msgid "Light Blue"
-msgstr "Biru Terang"
-
-#: gtk/gtkcolorchooserwidget.c:448
+#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447
+#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449
+#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451
 msgctxt "Color name"
 msgid "Blue"
 msgstr "Biru"

-#: gtk/gtkcolorchooserwidget.c:449
-msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "Biru Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:450
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "Biru Sangat Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:451
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "Hijau Sangat Terang"
-
-#: gtk/gtkcolorchooserwidget.c:452
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "Hijau Terang"
-
-#: gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455
+#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457
 msgctxt "Color name"
 msgid "Green"
 msgstr "Hijau"

-#: gtk/gtkcolorchooserwidget.c:454
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "Hijau Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:455
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "Hijau Sangat Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:456
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "Kuning Sangat Terang"
-
-#: gtk/gtkcolorchooserwidget.c:457
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "Kuning Terang"
-
-#: gtk/gtkcolorchooserwidget.c:458
+#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459
+#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461
+#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463
 msgctxt "Color name"
 msgid "Yellow"
 msgstr "Kuning"

-#: gtk/gtkcolorchooserwidget.c:459
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "Kuning Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:460
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "Kuning Sangat Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:461
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "Jingga SangatTerang"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
-msgid "Light Orange"
-msgstr "Oranye Terang"
-
-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465
+#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467
+#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Oranye"

-#: gtk/gtkcolorchooserwidget.c:464
-msgctxt "Color name"
-msgid "Dark Orange"
-msgstr "Oranye Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:465
-msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "Jingga Sangat Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:466
-msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "Merah Sangat Terang"
-
-#: gtk/gtkcolorchooserwidget.c:467
-msgctxt "Color name"
-msgid "Light Red"
-msgstr "Merah Terang"
-
-#: gtk/gtkcolorchooserwidget.c:468
+#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471
+#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:474
 msgctxt "Color name"
 msgid "Red"
 msgstr "Merah"

-#: gtk/gtkcolorchooserwidget.c:469
-msgctxt "Color name"
-msgid "Dark Red"
-msgstr "Merah Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:470
-msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "Merah Sangat Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:471
-msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "Ungu Sangat Terang"
-
-#: gtk/gtkcolorchooserwidget.c:472
-msgctxt "Color name"
-msgid "Light Purple"
-msgstr "Ungu Terang"
-
-#: gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476
+#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:479
 msgctxt "Color name"
 msgid "Purple"
 msgstr "Ungu"

-#: gtk/gtkcolorchooserwidget.c:474
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "Ungu Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:475
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "Ungu Sangat Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:476
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "Coklat Sangat Terang"
-
-#: gtk/gtkcolorchooserwidget.c:477
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "Coklat Terang"
-
-#: gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481
+#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483
+#: gtk/gtkcolorchooserwidget.c:484
 msgctxt "Color name"
 msgid "Brown"
 msgstr "Coklat"

-#: gtk/gtkcolorchooserwidget.c:479
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "Coklat Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:480
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "Coklat Sangat Gelap"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "Putih"
-
-#: gtk/gtkcolorchooserwidget.c:482
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "Kelabu Terang 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "Kelabu Terang 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "Kelabu Terang 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "Kelabu Terang 4"
-
-#: gtk/gtkcolorchooserwidget.c:486
-msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "Kelabu Gelap 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "Kelabu Gelap 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "Kelabu Gelap 3"
-
+#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486
+#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488
 #: gtk/gtkcolorchooserwidget.c:489
 msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "Kelabu Gelap 4"
+msgid "Light"
+msgstr "Terang"

-#: gtk/gtkcolorchooserwidget.c:490
+#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491
+#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493
+#: gtk/gtkcolorchooserwidget.c:494
 msgctxt "Color name"
-msgid "Black"
-msgstr "Hitam"
+msgid "Dark"
+msgstr "Gelap"

 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:538
 msgid "Custom"
 msgstr "Sesuaian"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:545
 msgid "Custom color"
 msgstr "Warna gubahan"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:546
 msgid "Create a custom color"
 msgstr "Buat warna gubahan"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:565
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "Warna gubahan %d: %s"
@@ -2723,52 +2561,52 @@ msgctxt "font"
 msgid "None"
 msgstr "Nihil"

-#: gtk/gtkfontchooserwidget.c:1556
+#: gtk/gtkfontchooserwidget.c:1525
 msgid "Width"
 msgstr "Lebar"

-#: gtk/gtkfontchooserwidget.c:1557
+#: gtk/gtkfontchooserwidget.c:1526
 msgid "Weight"
 msgstr "Bobot"

-#: gtk/gtkfontchooserwidget.c:1558
+#: gtk/gtkfontchooserwidget.c:1527
 msgid "Italic"
 msgstr "Miring"

-#: gtk/gtkfontchooserwidget.c:1559
+#: gtk/gtkfontchooserwidget.c:1528
 msgid "Slant"
 msgstr "Miring"

-#: gtk/gtkfontchooserwidget.c:1560
+#: gtk/gtkfontchooserwidget.c:1529
 msgid "Optical Size"
 msgstr "Ukuran Optik"

-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
+#: gtk/gtkfontchooserwidget.c:2066 gtk/inspector/prop-editor.c:1676
 msgid "Default"
 msgstr "Baku"

-#: gtk/gtkfontchooserwidget.c:2144
+#: gtk/gtkfontchooserwidget.c:2113
 msgid "Ligatures"
 msgstr "Ligatura"

-#: gtk/gtkfontchooserwidget.c:2145
+#: gtk/gtkfontchooserwidget.c:2114
 msgid "Letter Case"
 msgstr "Huruf besar kecil"

 # https://www.bamagazine.com/Text-type-typeface-s/105.htm
-#: gtk/gtkfontchooserwidget.c:2146
+#: gtk/gtkfontchooserwidget.c:2115
 msgid "Number Case"
 msgstr "Notasi angka"

-#: gtk/gtkfontchooserwidget.c:2147
+#: gtk/gtkfontchooserwidget.c:2116
 msgid "Number Spacing"
 msgstr "Spasi Angka"

-#: gtk/gtkfontchooserwidget.c:2148
+#: gtk/gtkfontchooserwidget.c:2117
 msgid "Number Formatting"
 msgstr "Format Angka"

-#: gtk/gtkfontchooserwidget.c:2149
+#: gtk/gtkfontchooserwidget.c:2118
 msgid "Character Variants"
 msgstr "Varian Karakter"

@@ -8339,15 +8177,15 @@ msgstr "Berkas"
 msgid "_Output format"
 msgstr "F_ormat keluaran"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "Cetak melalui LPR"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "Halaman Per Lembar"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "Baris Perintah"

@@ -8385,3 +8223,156 @@ msgstr "keluaran.%s"
 #: modules/printbackends/test/gtkprintbackendtest.c:465
 msgid "Print to Test Printer"
 msgstr "Cetak untuk Menguji Pencetak"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Scarlet Red"
+#~ msgstr "Merah Scarlet Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Scarlet Red"
+#~ msgstr "Merah Scarlet"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Scarlet Red"
+#~ msgstr "Merah Scarlet Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Orange"
+#~ msgstr "Oranye Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Orange"
+#~ msgstr "Oranye Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Butter"
+#~ msgstr "Mentega Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Butter"
+#~ msgstr "Mentega"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Butter"
+#~ msgstr "Mentega Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Chameleon"
+#~ msgstr "Bunglon Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Chameleon"
+#~ msgstr "Bunglon"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Chameleon"
+#~ msgstr "Bunglon Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Sky Blue"
+#~ msgstr "Biru Langit Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Sky Blue"
+#~ msgstr "Biru Langit"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Sky Blue"
+#~ msgstr "Biru Langit Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Plum"
+#~ msgstr "Prem Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Plum"
+#~ msgstr "Prem"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Chocolate"
+#~ msgstr "Coklat Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Chocolate"
+#~ msgstr "Coklat"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Chocolate"
+#~ msgstr "Coklat Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Aluminum 1"
+#~ msgstr "Aluminum Terang 1"
+
+#~ msgctxt "Color name"
+#~ msgid "Aluminum 1"
+#~ msgstr "Aluminum 1"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Aluminum 1"
+#~ msgstr "Aluminum Gelap 1"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Aluminum 2"
+#~ msgstr "Aluminum Terang 2"
+
+#~ msgctxt "Color name"
+#~ msgid "Aluminum 2"
+#~ msgstr "Aluminum 2"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Aluminum 2"
+#~ msgstr "Aluminum Gelap 2"
+
+#~ msgctxt "Color name"
+#~ msgid "Black"
+#~ msgstr "Hitam"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Dark Gray"
+#~ msgstr "Kelabu Sangat Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Darker Gray"
+#~ msgstr "Kelabu Lebih Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Dark Gray"
+#~ msgstr "Kelabu Gelap"
+
+#~ msgctxt "Color name"
+#~ msgid "Medium Gray"
+#~ msgstr "Kelabu Sedang"
+
+#~ msgctxt "Color name"
+#~ msgid "Light Gray"
+#~ msgstr "Kelabu Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Lighter Gray"
+#~ msgstr "Kelabu Lebih Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "Very Light Gray"
+#~ msgstr "Kelabu Sangat Terang"
+
+#~ msgctxt "Color name"
+#~ msgid "White"
+#~ msgstr "Putih"
+
+#~ msgid "3.2 core GL profile is not available on EGL implementation"
+#~ msgstr "Profil GL inti 3.2 tak tersedia pada implementasi EGL"
+
+#~ msgid "Not implemented on OS X"
+#~ msgstr "Tak diimplementasi pada OS X"
+
+#~ msgctxt "switch"
+#~ msgid "ON"
+#~ msgstr "NYALA"
+
+#~ msgctxt "switch"
+#~ msgid "OFF"
+#~ msgstr "MATI"
+
+#~ msgid "smb://"
+#~ msgstr "smb://"
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 13:46+0000\n"
-"PO-Revision-Date: 2020-11-16 09:49+0100\n"
+"POT-Creation-Date: 2020-09-27 19:07+0000\n"
+"PO-Revision-Date: 2020-09-28 09:38+0200\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italiano <gnome-it-list@gnome.org>\n"
 "Language: it\n"
@@ -1983,245 +1983,83 @@ msgstr "Rosso %d%%, verde %d%%, blu %d%%"
 msgid "Color: %s"
 msgstr "Colore: %s"

-#: gtk/gtkcolorchooserwidget.c:446
-msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "Blu molto chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:447
-msgctxt "Color name"
-msgid "Light Blue"
-msgstr "Blu chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:448
+#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447
+#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449
+#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451
 msgctxt "Color name"
 msgid "Blue"
 msgstr "Blu"

-#: gtk/gtkcolorchooserwidget.c:449
-msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "Blu scuro"
-
-#: gtk/gtkcolorchooserwidget.c:450
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "Blu molto scuro"
-
-#: gtk/gtkcolorchooserwidget.c:451
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "Verde molto chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:452
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "Verde chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453
+#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455
+#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457
 msgctxt "Color name"
 msgid "Green"
 msgstr "Verde"

-#: gtk/gtkcolorchooserwidget.c:454
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "Verde scuro"
-
-#: gtk/gtkcolorchooserwidget.c:455
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "Verde molto scuro"
-
-#: gtk/gtkcolorchooserwidget.c:456
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "Giallo molto chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:457
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "Giallo chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:458
+#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459
+#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461
+#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463
 msgctxt "Color name"
 msgid "Yellow"
 msgstr "Giallo"

-#: gtk/gtkcolorchooserwidget.c:459
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "Giallo scuro"
-
-#: gtk/gtkcolorchooserwidget.c:460
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "Giallo molto scuro"
-
-#: gtk/gtkcolorchooserwidget.c:461
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "Arancione molto chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
-msgid "Light Orange"
-msgstr "Arancione chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465
+#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467
+#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Arancione"

-#: gtk/gtkcolorchooserwidget.c:464
-msgctxt "Color name"
-msgid "Dark Orange"
-msgstr "Arancione scuro"
-
-#: gtk/gtkcolorchooserwidget.c:465
-msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "Arancione molto scuro"
-
-#: gtk/gtkcolorchooserwidget.c:466
-msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "Rosso molto chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:467
-msgctxt "Color name"
-msgid "Light Red"
-msgstr "Rosso chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:468
+#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471
+#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:474
 msgctxt "Color name"
 msgid "Red"
 msgstr "Rosso"

-#: gtk/gtkcolorchooserwidget.c:469
-msgctxt "Color name"
-msgid "Dark Red"
-msgstr "Rosso scuro"
-
-#: gtk/gtkcolorchooserwidget.c:470
-msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "Rosso molto scuro"
-
-#: gtk/gtkcolorchooserwidget.c:471
-msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "Viola molto chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:472
-msgctxt "Color name"
-msgid "Light Purple"
-msgstr "Viola chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:473
+#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476
+#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:479
 msgctxt "Color name"
 msgid "Purple"
 msgstr "Viola"

-#: gtk/gtkcolorchooserwidget.c:474
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "Viola scuro"
-
-#: gtk/gtkcolorchooserwidget.c:475
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "Viola molto scuro"
-
-#: gtk/gtkcolorchooserwidget.c:476
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "Marrone molto chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:477
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "Marrone chiaro"
-
-#: gtk/gtkcolorchooserwidget.c:478
+#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481
+#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483
+#: gtk/gtkcolorchooserwidget.c:484
 msgctxt "Color name"
 msgid "Brown"
 msgstr "Marrone"

-#: gtk/gtkcolorchooserwidget.c:479
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "Marrone scuro"
-
-#: gtk/gtkcolorchooserwidget.c:480
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "Marrone molto scuro"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "Bianco"
-
-#: gtk/gtkcolorchooserwidget.c:482
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "Grigio chiaro 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "Grigio chiaro 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "Grigio chiaro 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "Grigio chiaro 4"
-
-#: gtk/gtkcolorchooserwidget.c:486
-msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "Grigio scuro 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "Grigio scuro 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "Grigio scuro 3"
-
+#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486
+#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488
 #: gtk/gtkcolorchooserwidget.c:489
 msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "Grigio scuro 4"
+msgid "Light"
+msgstr "Chiaro"

-#: gtk/gtkcolorchooserwidget.c:490
+#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491
+#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493
+#: gtk/gtkcolorchooserwidget.c:494
 msgctxt "Color name"
-msgid "Black"
-msgstr "Nero"
+msgid "Dark"
+msgstr "Scuro"

 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:538
 msgid "Custom"
 msgstr "Personalizzato"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:545
 msgid "Custom color"
 msgstr "Colore personalizzato"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:546
 msgid "Create a custom color"
 msgstr "Crea un colore personalizzato"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:565
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "Colore personalizzato %d: %s"
@@ -2780,51 +2618,51 @@ msgctxt "font"
 msgid "None"
 msgstr "Nessuno"

-#: gtk/gtkfontchooserwidget.c:1556
+#: gtk/gtkfontchooserwidget.c:1525
 msgid "Width"
 msgstr "Larghezza"

-#: gtk/gtkfontchooserwidget.c:1557
+#: gtk/gtkfontchooserwidget.c:1526
 msgid "Weight"
 msgstr "Peso"

-#: gtk/gtkfontchooserwidget.c:1558
+#: gtk/gtkfontchooserwidget.c:1527
 msgid "Italic"
 msgstr "Corsivo"

-#: gtk/gtkfontchooserwidget.c:1559
+#: gtk/gtkfontchooserwidget.c:1528
 msgid "Slant"
 msgstr "Inclinato"

-#: gtk/gtkfontchooserwidget.c:1560
+#: gtk/gtkfontchooserwidget.c:1529
 msgid "Optical Size"
 msgstr "Dimensione ottica"

-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
+#: gtk/gtkfontchooserwidget.c:2066 gtk/inspector/prop-editor.c:1676
 msgid "Default"
 msgstr "Predefinito"

-#: gtk/gtkfontchooserwidget.c:2144
+#: gtk/gtkfontchooserwidget.c:2113
 msgid "Ligatures"
 msgstr "Legature"

-#: gtk/gtkfontchooserwidget.c:2145
+#: gtk/gtkfontchooserwidget.c:2114
 msgid "Letter Case"
 msgstr "Testo normale"

-#: gtk/gtkfontchooserwidget.c:2146
+#: gtk/gtkfontchooserwidget.c:2115
 msgid "Number Case"
 msgstr "Numeri"

-#: gtk/gtkfontchooserwidget.c:2147
+#: gtk/gtkfontchooserwidget.c:2116
 msgid "Number Spacing"
 msgstr "Spaziatura numeri"

-#: gtk/gtkfontchooserwidget.c:2148
+#: gtk/gtkfontchooserwidget.c:2117
 msgid "Number Formatting"
 msgstr "Formattazione numeri"

-#: gtk/gtkfontchooserwidget.c:2149
+#: gtk/gtkfontchooserwidget.c:2118
 msgid "Character Variants"
 msgstr "Varianti carattere"

@@ -8450,15 +8288,15 @@ msgstr "File"
 msgid "_Output format"
 msgstr "Formato di _output"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "Stampa su LPR"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "Pagine per foglio"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "Riga di comando"

@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-18 01:03+0000\n"
-"PO-Revision-Date: 2020-12-20 16:48+0900\n"
+"POT-Creation-Date: 2020-08-17 08:40+0000\n"
+"PO-Revision-Date: 2020-08-18 17:45+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@@ -1940,243 +1940,198 @@ msgstr "色: %s"

 #: gtk/gtkcolorchooserwidget.c:446
 msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "ごく明るい青"
+msgid "Light Scarlet Red"
+msgstr "明るいスカーレットレッド"

 #: gtk/gtkcolorchooserwidget.c:447
 msgctxt "Color name"
-msgid "Light Blue"
-msgstr "明るい青"
+msgid "Scarlet Red"
+msgstr "スカーレットレッド"

 #: gtk/gtkcolorchooserwidget.c:448
 msgctxt "Color name"
-msgid "Blue"
-msgstr "青"
+msgid "Dark Scarlet Red"
+msgstr "暗いスカーレットレッド"

 #: gtk/gtkcolorchooserwidget.c:449
 msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "暗い青"
-
-#: gtk/gtkcolorchooserwidget.c:450
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "ごく暗い青"
-
-#: gtk/gtkcolorchooserwidget.c:451
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "ごく明るい緑"
-
-#: gtk/gtkcolorchooserwidget.c:452
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "明るい緑"
-
-#: gtk/gtkcolorchooserwidget.c:453
-msgctxt "Color name"
-msgid "Green"
-msgstr "緑"
-
-#: gtk/gtkcolorchooserwidget.c:454
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "暗い緑"
-
-#: gtk/gtkcolorchooserwidget.c:455
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "ごく暗い緑"
-
-#: gtk/gtkcolorchooserwidget.c:456
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "ごく明るい黄色"
-
-#: gtk/gtkcolorchooserwidget.c:457
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "明るい黄色"
-
-#: gtk/gtkcolorchooserwidget.c:458
-msgctxt "Color name"
-msgid "Yellow"
-msgstr "黄色"
-
-#: gtk/gtkcolorchooserwidget.c:459
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "暗い黄色"
-
-#: gtk/gtkcolorchooserwidget.c:460
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "ごく暗い黄色"
-
-#: gtk/gtkcolorchooserwidget.c:461
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "ごく明るいオレンジ"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
 msgid "Light Orange"
 msgstr "明るいオレンジ"

-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:450
 msgctxt "Color name"
 msgid "Orange"
 msgstr "オレンジ"

-#: gtk/gtkcolorchooserwidget.c:464
+#: gtk/gtkcolorchooserwidget.c:451
 msgctxt "Color name"
 msgid "Dark Orange"
 msgstr "暗いオレンジ"

+#: gtk/gtkcolorchooserwidget.c:452
+msgctxt "Color name"
+msgid "Light Butter"
+msgstr "明るいバター"
+
+#: gtk/gtkcolorchooserwidget.c:453
+msgctxt "Color name"
+msgid "Butter"
+msgstr "バター"
+
+#: gtk/gtkcolorchooserwidget.c:454
+msgctxt "Color name"
+msgid "Dark Butter"
+msgstr "暗いバター"
+
+#: gtk/gtkcolorchooserwidget.c:455
+msgctxt "Color name"
+msgid "Light Chameleon"
+msgstr "明るいカメレオン"
+
+#: gtk/gtkcolorchooserwidget.c:456
+msgctxt "Color name"
+msgid "Chameleon"
+msgstr "カメレオン"
+
+#: gtk/gtkcolorchooserwidget.c:457
+msgctxt "Color name"
+msgid "Dark Chameleon"
+msgstr "暗いカメレオン"
+
+#: gtk/gtkcolorchooserwidget.c:458
+msgctxt "Color name"
+msgid "Light Sky Blue"
+msgstr "明るいスカイブルー"
+
+#: gtk/gtkcolorchooserwidget.c:459
+msgctxt "Color name"
+msgid "Sky Blue"
+msgstr "スカイブルー"
+
+#: gtk/gtkcolorchooserwidget.c:460
+msgctxt "Color name"
+msgid "Dark Sky Blue"
+msgstr "暗いスカイブルー"
+
+#: gtk/gtkcolorchooserwidget.c:461
+msgctxt "Color name"
+msgid "Light Plum"
+msgstr "明るいプラム"
+
+#: gtk/gtkcolorchooserwidget.c:462
+msgctxt "Color name"
+msgid "Plum"
+msgstr "プラム"
+
+#: gtk/gtkcolorchooserwidget.c:463
+msgctxt "Color name"
+msgid "Dark Plum"
+msgstr "暗いプラム"
+
+#: gtk/gtkcolorchooserwidget.c:464
+msgctxt "Color name"
+msgid "Light Chocolate"
+msgstr "明るいチョコレート"
+
 #: gtk/gtkcolorchooserwidget.c:465
 msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "ごく暗いオレンジ"
+msgid "Chocolate"
+msgstr "チョコレート"

 #: gtk/gtkcolorchooserwidget.c:466
 msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "ごく明るい赤"
+msgid "Dark Chocolate"
+msgstr "暗いチョコレート"

 #: gtk/gtkcolorchooserwidget.c:467
 msgctxt "Color name"
-msgid "Light Red"
-msgstr "明るい赤"
+msgid "Light Aluminum 1"
+msgstr "明るいアルミニウム 1"

 #: gtk/gtkcolorchooserwidget.c:468
 msgctxt "Color name"
-msgid "Red"
-msgstr "赤"
+msgid "Aluminum 1"
+msgstr "アルミニウム 1"

 #: gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
-msgid "Dark Red"
-msgstr "暗い赤"
+msgid "Dark Aluminum 1"
+msgstr "暗いアルミニウム 1"

 #: gtk/gtkcolorchooserwidget.c:470
 msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "ごく暗い赤"
+msgid "Light Aluminum 2"
+msgstr "明るいアルミニウム 2"

 #: gtk/gtkcolorchooserwidget.c:471
 msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "ごく明るい紫"
+msgid "Aluminum 2"
+msgstr "アルミニウム 2"

 #: gtk/gtkcolorchooserwidget.c:472
 msgctxt "Color name"
-msgid "Light Purple"
-msgstr "明るい紫"
-
-#: gtk/gtkcolorchooserwidget.c:473
-msgctxt "Color name"
-msgid "Purple"
-msgstr "紫"
-
-#: gtk/gtkcolorchooserwidget.c:474
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "暗い紫"
-
-#: gtk/gtkcolorchooserwidget.c:475
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "ごく暗い紫"
-
-#: gtk/gtkcolorchooserwidget.c:476
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "ごく明るい茶色"
-
-#: gtk/gtkcolorchooserwidget.c:477
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "明るい茶色"
-
-#: gtk/gtkcolorchooserwidget.c:478
-msgctxt "Color name"
-msgid "Brown"
-msgstr "茶色"
-
-#: gtk/gtkcolorchooserwidget.c:479
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "暗い茶色"
-
-#: gtk/gtkcolorchooserwidget.c:480
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "ごく暗い茶色"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "白"
-
-#: gtk/gtkcolorchooserwidget.c:482
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "明るい灰色 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "明るい灰色 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "明るい灰色 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "明るい灰色 4"
+msgid "Dark Aluminum 2"
+msgstr "暗いアルミニウム 2"

 #: gtk/gtkcolorchooserwidget.c:486
 msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "暗い灰色 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "暗い灰色 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "暗い灰色 3"
-
-#: gtk/gtkcolorchooserwidget.c:489
-msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "暗い灰色 4"
-
-#: gtk/gtkcolorchooserwidget.c:490
-msgctxt "Color name"
 msgid "Black"
 msgstr "黒"

+#: gtk/gtkcolorchooserwidget.c:487
+msgctxt "Color name"
+msgid "Very Dark Gray"
+msgstr "ごく暗い灰色"
+
+#: gtk/gtkcolorchooserwidget.c:488
+msgctxt "Color name"
+msgid "Darker Gray"
+msgstr "より暗い灰色"
+
+#: gtk/gtkcolorchooserwidget.c:489
+msgctxt "Color name"
+msgid "Dark Gray"
+msgstr "暗い灰色"
+
+#: gtk/gtkcolorchooserwidget.c:490
+msgctxt "Color name"
+msgid "Medium Gray"
+msgstr "中位の灰色"
+
+#: gtk/gtkcolorchooserwidget.c:491
+msgctxt "Color name"
+msgid "Light Gray"
+msgstr "明るい灰色"
+
+#: gtk/gtkcolorchooserwidget.c:492
+msgctxt "Color name"
+msgid "Lighter Gray"
+msgstr "より明るい灰色"
+
+#: gtk/gtkcolorchooserwidget.c:493
+msgctxt "Color name"
+msgid "Very Light Gray"
+msgstr "ごく明るい灰色"
+
+#: gtk/gtkcolorchooserwidget.c:494
+msgctxt "Color name"
+msgid "White"
+msgstr "白"
+
 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:543
 msgid "Custom"
 msgstr "作成した色"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:550
 msgid "Custom color"
 msgstr "色を作成"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:551
 msgid "Create a custom color"
 msgstr "色を作成します"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:570
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "作成した色 %d: %s"
@@ -2723,51 +2678,51 @@ msgctxt "font"
 msgid "None"
 msgstr "なし"

-#: gtk/gtkfontchooserwidget.c:1556
+#: gtk/gtkfontchooserwidget.c:1525
 msgid "Width"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:1557
+#: gtk/gtkfontchooserwidget.c:1526
 msgid "Weight"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:1558
+#: gtk/gtkfontchooserwidget.c:1527
 msgid "Italic"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:1559
+#: gtk/gtkfontchooserwidget.c:1528
 msgid "Slant"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:1560
+#: gtk/gtkfontchooserwidget.c:1529
 msgid "Optical Size"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
+#: gtk/gtkfontchooserwidget.c:2066 gtk/inspector/prop-editor.c:1676
 msgid "Default"
 msgstr "デフォルト"

-#: gtk/gtkfontchooserwidget.c:2144
+#: gtk/gtkfontchooserwidget.c:2113
 msgid "Ligatures"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:2145
+#: gtk/gtkfontchooserwidget.c:2114
 msgid "Letter Case"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:2146
+#: gtk/gtkfontchooserwidget.c:2115
 msgid "Number Case"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:2147
+#: gtk/gtkfontchooserwidget.c:2116
 msgid "Number Spacing"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:2148
+#: gtk/gtkfontchooserwidget.c:2117
 msgid "Number Formatting"
 msgstr ""

-#: gtk/gtkfontchooserwidget.c:2149
+#: gtk/gtkfontchooserwidget.c:2118
 msgid "Character Variants"
 msgstr ""

@@ -8351,15 +8306,15 @@ msgstr "ファイル"
 msgid "_Output format"
 msgstr "出力の形式(_O)"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "LPR に印刷する"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "段組印刷"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "コマンドライン"

@@ -8398,74 +8353,6 @@ msgstr "test-output.%s"
 msgid "Print to Test Printer"
 msgstr "テスト用プリンターに印刷する"

-#~ msgctxt "Color name"
-#~ msgid "Scarlet Red"
-#~ msgstr "スカーレットレッド"
-
-#~ msgctxt "Color name"
-#~ msgid "Butter"
-#~ msgstr "バター"
-
-#~ msgctxt "Color name"
-#~ msgid "Chameleon"
-#~ msgstr "カメレオン"
-
-#~ msgctxt "Color name"
-#~ msgid "Sky Blue"
-#~ msgstr "スカイブルー"
-
-#~ msgctxt "Color name"
-#~ msgid "Plum"
-#~ msgstr "プラム"
-
-#~ msgctxt "Color name"
-#~ msgid "Light Chocolate"
-#~ msgstr "明るいチョコレート"
-
-#~ msgctxt "Color name"
-#~ msgid "Chocolate"
-#~ msgstr "チョコレート"
-
-#~ msgctxt "Color name"
-#~ msgid "Dark Chocolate"
-#~ msgstr "暗いチョコレート"
-
-#~ msgctxt "Color name"
-#~ msgid "Light Aluminum 1"
-#~ msgstr "明るいアルミニウム 1"
-
-#~ msgctxt "Color name"
-#~ msgid "Aluminum 1"
-#~ msgstr "アルミニウム 1"
-
-#~ msgctxt "Color name"
-#~ msgid "Dark Aluminum 1"
-#~ msgstr "暗いアルミニウム 1"
-
-#~ msgctxt "Color name"
-#~ msgid "Light Aluminum 2"
-#~ msgstr "明るいアルミニウム 2"
-
-#~ msgctxt "Color name"
-#~ msgid "Aluminum 2"
-#~ msgstr "アルミニウム 2"
-
-#~ msgctxt "Color name"
-#~ msgid "Dark Aluminum 2"
-#~ msgstr "暗いアルミニウム 2"
-
-#~ msgctxt "Color name"
-#~ msgid "Darker Gray"
-#~ msgstr "より暗い灰色"
-
-#~ msgctxt "Color name"
-#~ msgid "Medium Gray"
-#~ msgstr "中位の灰色"
-
-#~ msgctxt "Color name"
-#~ msgid "Lighter Gray"
-#~ msgstr "より明るい灰色"
-
 #~ msgctxt "switch"
 #~ msgid "ON"
 #~ msgstr "オン"
@@ -179,7 +179,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 0
-            name: Black
+            name: Dark Aluminum 2
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -196,7 +196,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 1
-            name: Dark Gray 4
+            name: Aluminum 2
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -213,7 +213,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 2
-            name: Dark Gray 3
+            name: Light Aluminum 2
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -230,7 +230,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 3
-            name: Dark Gray 2
+            name: Dark Aluminum 1
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -247,7 +247,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 4
-            name: Dark Gray 1
+            name: Aluminum 1
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -264,7 +264,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 5
-            name: Light Gray 4
+            name: Light Aluminum 1
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -281,7 +281,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 6
-            name: Light Gray 3
+            name: Dark Chocolate
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -298,7 +298,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 7
-            name: Light Gray 2
+            name: Chocolate
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -315,7 +315,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 8
-            name: Light Gray 1
+            name: Light Chocolate
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -332,8 +332,8 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 9
-            name: White
-            state: checked enabled focusable sensitive showing visible
+            name: Dark Plum
+            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
            layer: widget
@@ -349,7 +349,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 10
-            name: Very Dark Brown
+            name: Plum
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -366,7 +366,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 11
-            name: Dark Brown
+            name: Light Plum
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -383,7 +383,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 12
-            name: Brown
+            name: Dark Sky Blue
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -400,7 +400,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 13
-            name: Light Brown
+            name: Sky Blue
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -417,7 +417,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 14
-            name: Very Light Brown
+            name: Light Sky Blue
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -434,7 +434,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 15
-            name: Very Dark Purple
+            name: Dark Chameleon
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -451,7 +451,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 16
-            name: Dark Purple
+            name: Chameleon
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -468,7 +468,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 17
-            name: Purple
+            name: Light Chameleon
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -485,7 +485,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 18
-            name: Light Purple
+            name: Dark Butter
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -502,7 +502,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 19
-            name: Very Light Purple
+            name: Butter
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -519,7 +519,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 20
-            name: Very Dark Red
+            name: Light Butter
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -536,7 +536,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 21
-            name: Dark Red
+            name: Dark Orange
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -553,7 +553,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 22
-            name: Red
+            name: Orange
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -570,7 +570,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 23
-            name: Light Red
+            name: Light Orange
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -587,7 +587,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 24
-            name: Very Light Red
+            name: Dark Scarlet Red
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -604,7 +604,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 25
-            name: Very Dark Orange
+            name: Scarlet Red
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -621,24 +621,7 @@ window1
            "radio button"
            parent: unnamed-GtkContainerAccessible-2
            index: 26
-            name: Dark Orange
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-30
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 27
-            name: Orange
+            name: Light Scarlet Red
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -651,12 +634,21 @@ window1
            action 1 description: Activates the color
            action 2 name: customize
            action 2 description: Customizes the color
+        unnamed-GtkContainerAccessible-30
+          "panel"
+          parent: unnamed-GtkContainerAccessible-1
+          index: 1
+          state: enabled horizontal sensitive showing visible
+          toolkit: gtk
+          <AtkComponent>
+          layer: widget
+          alpha: 1
          unnamed-GtkColorSwatchAccessible-31
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 28
-            name: Light Orange
-            state: enabled focusable sensitive showing visible
+            parent: unnamed-GtkContainerAccessible-30
+            index: 0
+            name: White
+            state: checked enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
            layer: widget
@@ -670,9 +662,9 @@ window1
            action 2 description: Customizes the color
          unnamed-GtkColorSwatchAccessible-32
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 29
-            name: Very Light Orange
+            parent: unnamed-GtkContainerAccessible-30
+            index: 1
+            name: Very Light Gray
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -687,9 +679,9 @@ window1
            action 2 description: Customizes the color
          unnamed-GtkColorSwatchAccessible-33
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 30
-            name: Very Dark Yellow
+            parent: unnamed-GtkContainerAccessible-30
+            index: 2
+            name: Lighter Gray
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -704,9 +696,9 @@ window1
            action 2 description: Customizes the color
          unnamed-GtkColorSwatchAccessible-34
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 31
-            name: Dark Yellow
+            parent: unnamed-GtkContainerAccessible-30
+            index: 3
+            name: Light Gray
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -721,9 +713,9 @@ window1
            action 2 description: Customizes the color
          unnamed-GtkColorSwatchAccessible-35
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 32
-            name: Yellow
+            parent: unnamed-GtkContainerAccessible-30
+            index: 4
+            name: Medium Gray
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -738,9 +730,9 @@ window1
            action 2 description: Customizes the color
          unnamed-GtkColorSwatchAccessible-36
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 33
-            name: Light Yellow
+            parent: unnamed-GtkContainerAccessible-30
+            index: 5
+            name: Dark Gray
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -755,9 +747,9 @@ window1
            action 2 description: Customizes the color
          unnamed-GtkColorSwatchAccessible-37
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 34
-            name: Very Light Yellow
+            parent: unnamed-GtkContainerAccessible-30
+            index: 6
+            name: Darker Gray
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -772,9 +764,9 @@ window1
            action 2 description: Customizes the color
          unnamed-GtkColorSwatchAccessible-38
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 35
-            name: Very Dark Green
+            parent: unnamed-GtkContainerAccessible-30
+            index: 7
+            name: Very Dark Gray
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -789,145 +781,9 @@ window1
            action 2 description: Customizes the color
          unnamed-GtkColorSwatchAccessible-39
            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 36
-            name: Dark Green
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-40
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 37
-            name: Green
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-41
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 38
-            name: Light Green
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-42
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 39
-            name: Very Light Green
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-43
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 40
-            name: Very Dark Blue
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-44
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 41
-            name: Dark Blue
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-45
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 42
-            name: Blue
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-46
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 43
-            name: Light Blue
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            action 0 name: select
-            action 0 description: Selects the color
-            action 1 name: activate
-            action 1 description: Activates the color
-            action 2 name: customize
-            action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-47
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-2
-            index: 44
-            name: Very Light Blue
+            parent: unnamed-GtkContainerAccessible-30
+            index: 8
+            name: Black
            state: enabled focusable sensitive showing visible
            toolkit: gtk
            <AtkComponent>
@@ -943,7 +799,7 @@ window1
        Custom
          "label"
          parent: unnamed-GtkContainerAccessible-1
-          index: 1
+          index: 2
          name: Custom
          state: enabled multi-line sensitive showing visible
          toolkit: gtk
@@ -980,18 +836,18 @@ window1
                              weight: <omitted>
                              wrap-mode: word
          <AtkHypertext>
-        unnamed-GtkContainerAccessible-48
+        unnamed-GtkContainerAccessible-40
          "filler"
          parent: unnamed-GtkContainerAccessible-1
-          index: 2
+          index: 3
          state: enabled horizontal sensitive showing visible
          toolkit: gtk
          <AtkComponent>
          layer: widget
          alpha: 1
-          unnamed-GtkColorSwatchAccessible-49
+          unnamed-GtkColorSwatchAccessible-41
            "push button"
-            parent: unnamed-GtkContainerAccessible-48
+            parent: unnamed-GtkContainerAccessible-40
            index: 0
            name: Custom color
            description: Create a custom color
@@ -1007,7 +863,7 @@ window1
            action 1 description: Activates the color
            action 2 name: customize
            action 2 description: Customizes the color
-      unnamed-GtkContainerAccessible-50
+      unnamed-GtkContainerAccessible-42
        "filler"
        parent: chooser
        index: 1
@@ -1018,7 +874,7 @@ window1
        alpha: 1
        GtkColorEditor
          "filler"
-          parent: unnamed-GtkContainerAccessible-50
+          parent: unnamed-GtkContainerAccessible-42
          index: 0
          state: enabled horizontal sensitive
          toolkit: gtk
@@ -41,7 +41,7 @@ endif
 %.props: $(top_builddir)/win32/vs10/Makefile
 	if test -e $(top_srcdir)/win32/vs10/$@; then \
 		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	elif test -e $(top_builddir)/win32/vs10/$@; then \
+	else \
 		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
 	fi

@@ -56,7 +56,6 @@ GTK_PREPROCESSOR_FLAGS =	\
 	 /I$(PREFIX)\include\gdk-pixbuf-2.0	\
 	 /I$(PREFIX)\include\pango-1.0	\
 	 /I$(PREFIX)\include\atk-1.0	\
-	 /I$(PREFIX)\include\harfbuzz	\
 	 /I$(PREFIX)\include\cairo	\
 	 /I$(PREFIX)\include\gio-win32-2.0	\
 	 /I$(PREFIX)\include\glib-2.0	\
@@ -21,8 +21,6 @@ _HASH=^#
    && ![echo PLAT=Win32 >> vercl.x] \
    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
    && ![echo PLAT=x64 >> vercl.x] \
-    && ![echo $(_HASH)elif defined(_M_ARM64) >> vercl.x] \
-    && ![echo PLAT=arm64 >> vercl.x] \
    && ![echo $(_HASH)endif >> vercl.x] \
    && ![cl -nologo -TC -P vercl.x $(ERRNUL)]
 !include vercl.i
@@ -117,7 +117,7 @@ all:	\

 ..\gtk\gtkdbusgenerated.h ..\gtk\gtkdbusgenerated.c: ..\gtk\gtkdbusinterfaces.xml
 	@echo Generating GTK DBus sources...
-	@$(PYTHON) $(GDBUS_CODEGEN)	\
+	@$(PYTHON) $(PREFIX)\bin\gdbus-codegen	\
 	--interface-prefix org.Gtk. --c-namespace _Gtk	\
 	--generate-c-code gtkdbusgenerated $**	\
 	--output-directory $(@D)
@@ -10,8 +10,7 @@
    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
-    <CommonARM64SystemLibs Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|arm64'">ole32.lib;advapi32.lib;shell32.lib;gdi32.lib</CommonARM64SystemLibs>
-    <GtkGdkCommonLibs>pangowin32-1.0.lib;fribidi.lib;imm32.lib;$(CommonARM64SystemLibs)</GtkGdkCommonLibs>
+    <GtkGdkCommonLibs>pangowin32-1.0.lib;fribidi.lib;imm32.lib</GtkGdkCommonLibs>
    <GdkAdditionalLibs>winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs)</GdkAdditionalLibs>
    <GdkBroadwayAdditionalLibs>ws2_32.lib</GdkBroadwayAdditionalLibs>
    <GtkAdditionalLibs>atk-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs)</GtkAdditionalLibs>
@@ -27,8 +26,8 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\harfbuzz;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;G_ENABLE_DEBUG;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
@@ -44,9 +43,6 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <BuildMacro Include="CommonARM64SystemLibs">
-      <Value>$(CommonARM64SystemLibs)</Value>
-    </BuildMacro>
    <BuildMacro Include="GtkBinaryVersion">
      <Value>$(GtkBinaryVersion)</Value>
    </BuildMacro>
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup Label="Globals">
-    <WindowsTargetPlatformVersion Condition="'$(Platform)' == 'arm64'">10.0.19041.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-</Project>
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl

-EXTRA_DIST_COPIED =	\
+EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
@@ -40,8 +40,7 @@ EXTRA_DIST_COPIED =	\
 	gtk3-install.props	\
 	gtk3-version-paths.props

-DISTCLEANFILES = $(EXTRA_DIST_COPIED)
-EXTRA_DIST += $(EXTRA_DIST_COPIED) Directory.Build.props
+DISTCLEANFILES = $(EXTRA_DIST)

 MSVC_VER = 15
 MSVC_VER_LONG = 15
@@ -50,7 +49,4 @@ MSVC_FORMAT_VER = 12

 include $(top_srcdir)/win32/Makefile-newvs.am

-Directory.Build.props:
-	@true
-
 -include $(top_srcdir)/git.mk
@@ -9,8 +9,8 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\harfbuzz;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_ENABLE_DEBUG;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES"
+		AdditionalIncludeDirectories="..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 		AdditionalOptions="/MP"
 	/>