diff --git a/man/icesh.pod b/man/icesh.pod
index b8095df2..5c2c095e 100644
--- a/man/icesh.pod
+++ b/man/icesh.pod
@@ -591,6 +591,15 @@ This is either Locally, Passive, Globally or NoInput.
 Print the override redirect status for the window, or if either 0 or 1
 is given, then disable or enable the override redirect status.
 
+=item B<tabto> I<label>
+
+Move the windows as tabs to a frame which has C<frame> label I<label>.
+Such a frame is created if needed.
+
+=item B<untab>
+
+Move each window to its own frame, if it is currently tabbed.
+
 =item B<click> I<window-x> I<window-y> I<button>
 
 Send a button press and release event at position (I<window-x>,
@@ -610,6 +619,14 @@ focus, visibility, position, size and all window properties.
 To monitor all of the protocol request messages that client applications
 may send to icewm, also spy on the root window.
 
+=item B<stacking>
+
+Sort the list of windows from topmost to bottom-most.
+
+=item B<reverse>
+
+Reverse the order of the list of windows.
+
 =back
 
 =head2 MANAGER ACTIONS
@@ -937,6 +954,11 @@ which has a WM_ROLE value of C<special>, or start it with B<runonce>.
         elif -u then setWorkspace this sync activate end \
         else runonce roxterm --role=special
 
+Collect all urxvt terminals from the fourth workspace in a single frame
+on the current workspace.
+
+    icesh -W 3 -c urxvt tabto myfunnyname
+
 =head2 ENVIRONMENT
 
 =over
diff --git a/man/icewm-menu-fdo.pod b/man/icewm-menu-fdo.pod
index 6e1d4cb9..735a65b1 100644
--- a/man/icewm-menu-fdo.pod
+++ b/man/icewm-menu-fdo.pod
@@ -59,6 +59,34 @@ Don't nest subcategories in submenus.
 
 Write the output to I<FILE>.
 
+=item B<--flat>
+
+Display apps from all categories in one level with the title containing
+the category information as prefix.
+
+=item B<-F sep>, B<--flat-sep=sep>
+
+When used with C<--flat>, the specified character sequence is used as
+separator between the section titles.
+
+=item B<-m filter>, B<--match=filter>
+
+Specifies a filter to show only apps which contain this as substring
+within their title.
+
+=item B<-M filter>, B<--imatch=filter>
+
+Like C<--match> but applied with any letter case.
+
+=item B<--match-sec>
+
+Apply the filter from C<--match> or C<--imatch> to both, apps and
+section titles.
+
+=item B<--match-osec>
+
+Apply the filter from C<--match> or C<--imatch> to only to section titles.
+
 =item B<-h>, B<--help>
 
 Print a brief usage statement to F<stdout> and exit.
@@ -71,8 +99,6 @@ Print the program version to F<stdout> and exit.
 
 Print copying permissions to F<stdout> for the program and exit.
 
-=back
-
 =head2 USAGE
 
 This utility is not normally used directly. It is used as the
diff --git a/man/icewm.pod b/man/icewm.pod
index 5eb57de6..cc8dae9e 100644
--- a/man/icewm.pod
+++ b/man/icewm.pod
@@ -371,8 +371,8 @@ in the centre of the screen with a list of windows to choose from.
 A narrow band indicates a selection: the candidate window that will
 be activated to receive input focus when the Alt key is released.
 
-The selection can be changed.  By repeatedly pressing the Tab key, one
-can cycle over all windows.  If a Shift key is down, the direction of
+The selection can be changed by repeatedly pressing the Tab key, while
+keeping the Alt key down. If a Shift key is also down, the direction of
 traversal is reversed. Or use the scroll wheel of the mouse.  Or use
 one of the digit keys to select the corresponding window from the list.
 Arrow keys are also supported, as well as the Home and End key.
@@ -387,7 +387,8 @@ workspace with the usual workspace hotkeys.
 
 The QuickSwitch has two distinct modes: vertical and horizontal.
 The window list can include all windows or be limited to the current
-workspace. See the many preferences available for the QuickSwitch.
+workspace. There is an option to raise the selected candidate.
+See the many preferences available for the QuickSwitch.
 
 =head2 WINDOW PLACEMENT
 
@@ -1340,6 +1341,19 @@ See L<icewm-shutdown(5)>.
 
 =over
 
+=item F<cursors>
+
+May contain cursor icons in the XPM image format. These overrule cursors
+provided by a theme. There are 3 direction cursors: F<left.xpm>,
+F<right.xpm>, F<move.xpm>, 8 resize cursors: F<sizeR.xpm>, F<sizeTR.xpm>,
+F<sizeT.xpm>, F<sizeTL.xpm>, F<sizeL.xpm>, F<sizeBL.xpm>, F<sizeB.xpm>,
+F<sizeBR.xpm>, and 4 scroll cursors: F<scrollL.xpm>, F<scrollR.xpm>,
+F<scrollU.xpm>, and F<scrollD.xpm>.
+By default an XPM header defines four dimensions: width, height, colors
+and chars-per-pixel. For cursors this must be extended to six. The last
+two are the I<x-hotspot> and the I<y-hotspot>. These define which point
+in the XPM image is the sensitive point for the mouse pointer.
+
 =item F<icons>
 
 Contains icons which are used to identify applications.  Usually these
diff --git a/po/mk.po b/po/mk.po
index 62cc94aa..32a29267 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: icewm\n"
 "Report-Msgid-Bugs-To: https://github.com/bbidulock/icewm/issues\n"
-"POT-Creation-Date: 2022-10-24 01:39+0200\n"
-"PO-Revision-Date: 2022-08-16 06:13+0000\n"
+"POT-Creation-Date: 2022-10-03 05:53+0200\n"
+"PO-Revision-Date: 2022-10-24 10:13+0000\n"
 "Last-Translator: Kristijan Fremen Velkovski <me@krisfremen.com>\n"
 "Language-Team: Macedonian <https://l10n.opensuse.org/projects/icewm/"
 "icewm-1-4-branch/mk/>\n"
@@ -172,10 +172,8 @@ msgid "layout:"
 msgstr ""
 
 #: src/akeyboard.cc:101
-#, fuzzy
-#| msgid "Bad option: %s"
 msgid "options:"
-msgstr "Лоша опција: %s"
+msgstr "опции:"
 
 #: src/akeyboard.cc:151
 msgid "Keyboard"
@@ -235,9 +233,9 @@ msgid "Error checking mailbox."
 msgstr "Грешка при проверката на пошт. сандаче."
 
 #: src/amailbox.cc:812
-#, fuzzy, c-format
+#, c-format
 msgid "%ld mail message, %ld unread."
-msgstr "%ld е-пошт. порака."
+msgstr "%ld имејли, %ld непрочитани."
 
 #: src/amailbox.cc:813
 #, c-format
@@ -1176,9 +1174,8 @@ msgid "Support"
 msgstr ""
 
 #: src/icehelp.cc:1382
-#, fuzzy
 msgid "Theme Howto"
-msgstr "Автор на темата:"
+msgstr "Инструкции за Темата"
 
 #: src/icehelp.cc:1382 src/iceview.cc:60
 msgid "Ctrl+T"
@@ -1396,10 +1393,9 @@ msgid "Invalid Xinerama: `%s'."
 msgstr "Невалиден аргумент: „%s“."
 
 #: src/icesh.cc:3540 src/icesh.cc:3590 src/icesh.cc:4774
-#, fuzzy, c-format
-#| msgid "Invalid argument: `%s'."
+#, c-format
 msgid "Invalid argument: `%s'"
-msgstr "Невалиден аргумент: „%s“."
+msgstr "Невалиден аргумент: `%s'"
 
 #: src/icesh.cc:3556
 #, c-format
@@ -1412,7 +1408,7 @@ msgid "Invalid expression: `%s'"
 msgstr "Невалиден израз: „%s“"
 
 #: src/icesh.cc:3576 src/icesound.cc:794 src/icewmbg.cc:978 src/icewmhint.cc:37
-#: src/wmapp.cc:1231 src/yxapp.cc:1039
+#: src/wmapp.cc:1231 src/yxapp.cc:1037
 #, c-format
 msgid "Can't open display: %s. X must be running and $DISPLAY set."
 msgstr ""
@@ -1420,13 +1416,13 @@ msgstr ""
 "поставено."
 
 #: src/icesh.cc:3692
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected: `%s'."
-msgstr "Неочекуван клучен збор: %s"
+msgstr "Неочекуванo: `%s'."
 
 #: src/icesh.cc:3721
 msgid "No windows found."
-msgstr ""
+msgstr "Не се најдоа прозорци."
 
 #: src/icesh.cc:3737
 msgid "No actions specified."
@@ -1438,10 +1434,9 @@ msgid "Invalid window identifier: `%s'"
 msgstr "Невалиден ид. на прозорец: „%s“"
 
 #: src/icesh.cc:3901
-#, fuzzy, c-format
-#| msgid "Invalid argument: `%s'."
+#, c-format
 msgid "Invalid PID: `%s'"
-msgstr "Невалиден аргумент: „%s“."
+msgstr "Невалиден PID: `%s'"
 
 #: src/icesh.cc:3937
 #, fuzzy, c-format
@@ -2018,18 +2013,18 @@ msgid "Center"
 msgstr ""
 
 #. TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout
-#: src/wmapp.cc:599 src/wmtaskbar.cc:217 src/wmwinlist.cc:431
-#: src/wmwinlist.cc:464
+#: src/wmapp.cc:599 src/wmtaskbar.cc:217 src/wmwinlist.cc:394
+#: src/wmwinlist.cc:427
 msgid "T_ile Horizontally"
 msgstr "Поплочи _хоризонтално"
 
 #. TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout
-#: src/wmapp.cc:601 src/wmtaskbar.cc:215 src/wmwinlist.cc:430
-#: src/wmwinlist.cc:463
+#: src/wmapp.cc:601 src/wmtaskbar.cc:215 src/wmwinlist.cc:393
+#: src/wmwinlist.cc:426
 msgid "Tile _Vertically"
 msgstr "Поплочи _вертикално"
 
-#: src/wmapp.cc:613 src/wmwinlist.cc:412
+#: src/wmapp.cc:613 src/wmwinlist.cc:375
 msgid "_Restore"
 msgstr "_Обнови"
 
@@ -2041,35 +2036,35 @@ msgstr "Пре_мести"
 msgid "_Size"
 msgstr "Го_лемина"
 
-#: src/wmapp.cc:619 src/wmwinlist.cc:413
+#: src/wmapp.cc:619 src/wmwinlist.cc:376
 msgid "Mi_nimize"
 msgstr "С_мали"
 
-#: src/wmapp.cc:621 src/wmwinlist.cc:414
+#: src/wmapp.cc:621 src/wmwinlist.cc:377
 msgid "Ma_ximize"
 msgstr "_Рашири"
 
-#: src/wmapp.cc:622 src/wmwinlist.cc:415
+#: src/wmapp.cc:622 src/wmwinlist.cc:378
 #, fuzzy
 #| msgid "Maximize"
 msgid "Maximize_Vert"
 msgstr "Рашири"
 
-#: src/wmapp.cc:623 src/wmwinlist.cc:416
+#: src/wmapp.cc:623 src/wmwinlist.cc:379
 #, fuzzy
 #| msgid "Maximize"
 msgid "MaximizeHori_z"
 msgstr "Рашири"
 
-#: src/wmapp.cc:626 src/wmwinlist.cc:417
+#: src/wmapp.cc:626 src/wmwinlist.cc:380
 msgid "_Fullscreen"
 msgstr "Преку _цел екран"
 
-#: src/wmapp.cc:629 src/wmwinlist.cc:419
+#: src/wmapp.cc:629 src/wmwinlist.cc:382
 msgid "_Hide"
 msgstr "С_криј"
 
-#: src/wmapp.cc:631 src/wmwinlist.cc:420
+#: src/wmapp.cc:631 src/wmwinlist.cc:383
 msgid "Roll_up"
 msgstr "Свиткај на_горе"
 
@@ -2077,23 +2072,23 @@ msgstr "Свиткај на_горе"
 msgid "R_aise"
 msgstr "П_одигни"
 
-#: src/wmapp.cc:640 src/wmwinlist.cc:422
+#: src/wmapp.cc:640 src/wmwinlist.cc:385
 msgid "_Lower"
 msgstr "_Спушти"
 
-#: src/wmapp.cc:642 src/wmwinlist.cc:423
+#: src/wmapp.cc:642 src/wmwinlist.cc:386
 msgid "La_yer"
 msgstr "Сл_ој"
 
-#: src/wmapp.cc:645 src/wmwinlist.cc:424
+#: src/wmapp.cc:645 src/wmwinlist.cc:387
 msgid "Tile"
 msgstr ""
 
-#: src/wmapp.cc:649 src/wmwinlist.cc:426
+#: src/wmapp.cc:649 src/wmwinlist.cc:389
 msgid "Move _To"
 msgstr "Премес_ти на"
 
-#: src/wmapp.cc:650 src/wmwinlist.cc:427
+#: src/wmapp.cc:650 src/wmwinlist.cc:390
 msgid "Occupy _All"
 msgstr "Окупир_ај ги сите"
 
@@ -2101,15 +2096,15 @@ msgstr "Окупир_ај ги сите"
 msgid "Limit _Workarea"
 msgstr "Ограничи работна о_бласт"
 
-#: src/wmapp.cc:660 src/wmwinlist.cc:428
+#: src/wmapp.cc:660 src/wmwinlist.cc:391
 msgid "Tray _icon"
 msgstr "_Икона во сис. лента"
 
-#: src/wmapp.cc:665 src/wmwinlist.cc:443 src/wmwinlist.cc:451
+#: src/wmapp.cc:665 src/wmwinlist.cc:406 src/wmwinlist.cc:414
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/wmapp.cc:667 src/wmwinlist.cc:445
+#: src/wmapp.cc:667 src/wmwinlist.cc:408
 msgid "_Kill Client"
 msgstr "_Прекини клиент"
 
@@ -2140,7 +2135,7 @@ msgid ""
 "as a terminal. Proceed?"
 msgstr ""
 
-#: src/wmapp.cc:1232 src/yxapp.cc:1040
+#: src/wmapp.cc:1232 src/yxapp.cc:1038
 msgid "<none>"
 msgstr "<нема>"
 
@@ -2277,7 +2272,7 @@ msgstr "Свиткај надолу"
 msgid "Rollup"
 msgstr "Свиткај нагоре"
 
-#: src/wmclient.cc:457
+#: src/wmclient.cc:451
 #, c-format
 msgid ""
 "Client %s with PID %ld fails to respond.\n"
@@ -2333,7 +2328,7 @@ msgstr "_Рестартирај го icewm"
 msgid "_About"
 msgstr "З_а"
 
-#: src/wmframe.cc:1739
+#: src/wmframe.cc:1705
 msgid ""
 "WARNING! All unsaved changes will be lost when\n"
 "this client is killed. Do you wish to proceed?"
@@ -2341,7 +2336,7 @@ msgstr ""
 "ВНИМАНИЕ! Сите неснимени промени ќе бидат изгубени кога\n"
 "овој клиент ќе биде прекинат. Дали сакате да продолжите?"
 
-#: src/wmframe.cc:1744
+#: src/wmframe.cc:1710
 msgid "Kill Client: "
 msgstr "Прекини клиент: "
 
@@ -2410,20 +2405,20 @@ msgstr ""
 msgid "'%s' produces no output"
 msgstr ""
 
-#: src/wmmgr.cc:3621
+#: src/wmmgr.cc:3463
 msgid "Missing program setxkbmap"
 msgstr ""
 
-#: src/wmmgr.cc:3622
+#: src/wmmgr.cc:3464
 msgid "For keyboard switching, please install setxkbmap."
 msgstr ""
 
-#: src/wmoption.cc:284
+#: src/wmoption.cc:259
 #, c-format
 msgid "Unknown window option: %s"
 msgstr "Непозната опција за прозорец: %s"
 
-#: src/wmoption.cc:356
+#: src/wmoption.cc:331
 #, fuzzy, c-format
 msgid "Syntax error in window options on line %d of %s"
 msgstr "Синтаксичка грешка во опциите за прозорец"
@@ -2518,27 +2513,27 @@ msgid "Session Manager: Unknown line %s"
 msgstr "Менаџер на сесии: Непозната линија %s"
 
 #. TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout
-#: src/wmtaskbar.cc:219 src/wmwinlist.cc:432 src/wmwinlist.cc:465
+#: src/wmtaskbar.cc:219 src/wmwinlist.cc:395 src/wmwinlist.cc:428
 msgid "Ca_scade"
 msgstr "Ка_скадирај"
 
 #. TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout
-#: src/wmtaskbar.cc:221 src/wmwinlist.cc:433 src/wmwinlist.cc:466
+#: src/wmtaskbar.cc:221 src/wmwinlist.cc:396 src/wmwinlist.cc:429
 msgid "_Arrange"
 msgstr "Р_аспореди"
 
 #. TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout
-#: src/wmtaskbar.cc:223 src/wmwinlist.cc:435 src/wmwinlist.cc:467
+#: src/wmtaskbar.cc:223 src/wmwinlist.cc:398 src/wmwinlist.cc:430
 msgid "_Minimize All"
 msgstr "С_мали ги сите"
 
 #. TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout
-#: src/wmtaskbar.cc:225 src/wmwinlist.cc:436 src/wmwinlist.cc:468
+#: src/wmtaskbar.cc:225 src/wmwinlist.cc:399 src/wmwinlist.cc:431
 msgid "_Hide All"
 msgstr "С_криј ги сите"
 
 #. TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout
-#: src/wmtaskbar.cc:227 src/wmwinlist.cc:437 src/wmwinlist.cc:469
+#: src/wmtaskbar.cc:227 src/wmwinlist.cc:400 src/wmwinlist.cc:432
 msgid "_Undo"
 msgstr "_Отповикај"
 
@@ -2580,33 +2575,33 @@ msgstr "Прикажи раб. површина"
 msgid "Show Taskbar"
 msgstr "Лента со задачи"
 
-#: src/wmwinlist.cc:78
+#: src/wmwinlist.cc:47
 msgid "All Workspaces"
 msgstr "Сите работни простори"
 
-#: src/wmwinlist.cc:418
+#: src/wmwinlist.cc:381
 msgid "_Show"
 msgstr "Прик_ажи"
 
-#: src/wmwinlist.cc:421
+#: src/wmwinlist.cc:384
 #, fuzzy
 #| msgid "R_aise"
 msgid "_Raise"
 msgstr "П_одигни"
 
-#: src/wmwinlist.cc:443
+#: src/wmwinlist.cc:406
 msgid "Del"
 msgstr "Del"
 
-#: src/wmwinlist.cc:447
+#: src/wmwinlist.cc:410
 msgid "_Terminate Process"
 msgstr "_Запри процес"
 
-#: src/wmwinlist.cc:448
+#: src/wmwinlist.cc:411
 msgid "Kill _Process"
 msgstr "Прекини _процес"
 
-#: src/wmwinlist.cc:483 src/wmwinlist.cc:484
+#: src/wmwinlist.cc:446 src/wmwinlist.cc:447
 msgid "Window list"
 msgstr "Листа со прозорци"
 
@@ -2768,7 +2763,7 @@ msgstr ""
 msgid "Invalid hex escape in URL at position %d."
 msgstr ""
 
-#: src/yxapp.cc:998
+#: src/yxapp.cc:996
 msgid ""
 "  -d, --display=NAME  NAME of the X server to use.\n"
 "  --sync              Synchronize X11 commands.\n"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 435a7b95..3a2cc9de 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,6 +45,21 @@ macro(do_auto_inc_headers _in_out_var)
     endif()
 endmacro()
 
+macro(pkg_check_or_fail _prefix _what)
+    clear_pkg_config(${_prefix})
+    pkg_check_modules(${_prefix} ${_what})
+    if(NOT ${_prefix}_FOUND)
+        message(FATAL_ERROR ${ARGN})
+    endif()
+endmacro()
+
+# drop remainings variables of pkg_config's work from the current scope
+macro(clear_pkg_config _prefix)
+    foreach(_i "_LIBRARIES" "_LINK_LIBRARIES" "_LIBRARY_DIRS" "_LDFLAGS" "_LDFLAGS_OTHER" "_INCLUDE_DIRS" "_CFLAGS" "_CFLAGS_OTHER")
+        unset("${_prefix}${_i}")
+    endforeach()
+endmacro()
+
 # optimize for release if not defined explicitly, can be overriden with CMAKE_BUILD_TYPE "None"
 if("${CMAKE_BUILD_TYPE}" STREQUAL "" AND ("" STREQUAL "${CMAKE_CXX_FLAGS}"))
     SET(CMAKE_BUILD_TYPE Release)
@@ -77,11 +92,6 @@ else()
     endif()
 endif()
 
-#CHECK_CXX_COMPILER_FLAG(-Wl,-fuse-ld=gold CXX_LINKER_GOLD)
-#if(CXX_LINKER_GOLD)
-#    list(APPEND icewm_libs -Wl,-fuse-ld=gold)
-#endif()
-
 option(CONFIG_IMLIB2 "Imlib2 image loader" on)
 option(CONFIG_LIBPNG "PNGLIB image loader" off)
 option(CONFIG_LIBJPEG "JPEGLIB image loader" off)
@@ -129,7 +139,6 @@ if(ENABLE_LTO AND ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
     else()
         list(APPEND CXXFLAGS_COMMON -flto)
     endif()
-    list(APPEND EXTRA_LINKER_FLAGS -flto)
 endif()
 
 # the only used ones...
@@ -207,11 +216,7 @@ else()
 endif()
 
 if(CONFIG_IMLIB2)
-    pkg_check_modules(libimlib2 imlib2)
-    if(NOT libimlib2_FOUND)
-        message(FATAL_ERROR "IMLIB2 selected but Imlib2 dev files not found."
-                ${HINT_IMG_LOADERS})
-    endif()
+    pkg_check_or_fail(libimlib2 imlib2 "IMLIB2 selected but Imlib2 dev files not found.")
     set(CONFIG_GDK_PIXBUF_XLIB off)
     set(CONFIG_LIBPNG off)
     set(CONFIG_LIBJPEG off)
@@ -219,11 +224,9 @@ if(CONFIG_IMLIB2)
 endif()
 
 if(CONFIG_GDK_PIXBUF_XLIB)
-    pkg_check_modules(pixbuf gdk-pixbuf-xlib-2.0)
-    if(NOT pixbuf_FOUND)
-        message(FATAL_ERROR "GDX-PIXBUF image loader selected but its dev files were not found."
-${HINT_IMG_LOADERS})
-    endif()
+    pkg_check_or_fail(pixbuf gdk-pixbuf-xlib-2.0
+        "GDX-PIXBUF image loader selected but its dev files were not found."
+        ${HINT_IMG_LOADERS})
     set(CONFIG_LIBPNG off)
     set(CONFIG_LIBJPEG off)
     LIST(APPEND icewm_img_libs ${pixbuf_LDFLAGS})
@@ -252,39 +255,26 @@ else()
 endif()
 
 if(CONFIG_XPM)
-    pkg_check_modules(libxpm xpm)
-    if(NOT libxpm_FOUND)
-        message(FATAL_ERROR
-                "XPM image loader selected but libXpm dev files not found."
-                ${HINT_IMG_LOADERS})
-    endif()
+    pkg_check_or_fail(libxpm xpm "XPM image loader selected but libXpm dev files not found."
+        ${HINT_IMG_LOADERS})
     LIST(APPEND icewm_img_libs ${libxpm_LDFLAGS})
 endif()
 
 if(CONFIG_LIBPNG)
-    pkg_check_modules(libpng libpng)
-    if(NOT libpng_FOUND)
-        message(FATAL_ERROR
-                "PNG image loader selected but libpng dev files not found."
-                ${HINT_IMG_LOADERS})
-    endif()
+    pkg_check_or_fail(libpng libpng "PNG image loader selected but libpng dev files not found."
+        ${HINT_IMG_LOADERS})
     LIST(APPEND icewm_img_libs ${libpng_LDFLAGS})
 endif()
 
 if(CONFIG_LIBJPEG)
-    pkg_check_modules(libjpeg libjpeg)
-    if(NOT libjpeg_FOUND)
-        message(FATAL_ERROR
-                "JPEG image loader selected but libjpeg dev files not found."
-                "Please install libjpeg-dev (or similar)."
-                "Otherwise use -DCONFIG_LIBJPEG=off.")
-    endif()
+    pkg_check_or_fail(libjpeg libjpeg "JPEG image loader selected but libjpeg dev files not found."
+        "Please install libjpeg-dev (or similar)."
+        "Otherwise use -DCONFIG_LIBJPEG=off.")
     LIST(APPEND icewm_img_libs ${libjpeg_LDFLAGS})
 endif()
 
 IF(CONFIG_SESSION)
-    LIST(APPEND sm_LIBS SM)
-    LIST(APPEND sm_LIBS ICE)
+    LIST(APPEND sm_LIBS SM ICE)
 ENDIF()
 
 option(CONFIG_SHAPE "Define to enable transparent frame	decoration (titlebar borders), requests X shape extension." on)
@@ -329,26 +319,23 @@ set(ENABLE_OSS off)
 pkg_check_modules(sndfile sndfile)
 if(sndfile_FOUND)
     if(sndfile_FOUND)
-        list(APPEND audio_flags "${sndfile_CFLAGS}")
-        list(APPEND audio_libs ${sndfile_LDFLAGS})
-        list(APPEND audio_libs ${sndfile_LIBS})
+        list(APPEND audio_flags ${sndfile_CFLAGS})
+        list(APPEND audio_libs ${sndfile_LDFLAGS} ${sndfile_LIBS})
     endif()
     if("${ICESOUND}" MATCHES "alsa")
         pkg_check_modules(alsa alsa)
-        set(ENABLE_ALSA "${alsa_FOUND}")
+        set(ENABLE_ALSA ${alsa_FOUND})
         if(alsa_FOUND)
-            list(APPEND audio_flags "${alsa_CFLAGS}")
-            list(APPEND audio_libs ${alsa_LDFLAGS})
-            list(APPEND audio_libs ${alsa_LIBS})
+            list(APPEND audio_flags ${alsa_CFLAGS})
+            list(APPEND audio_libs ${alsa_LDFLAGS} ${alsa_LIBS})
         endif()
     endif()
     if("${ICESOUND}" MATCHES "ao")
         pkg_check_modules(ao ao)
         set(ENABLE_AO "${ao_FOUND}")
         if(ao_FOUND)
-            list(APPEND audio_flags "${ao_CFLAGS}")
-            list(APPEND audio_libs ${ao_LDFLAGS})
-            list(APPEND audio_libs ${ao_LIBS})
+            list(APPEND audio_flags ${ao_CFLAGS})
+            list(APPEND audio_libs ${ao_LDFLAGS} ${ao_LIBS})
         endif()
     endif()
     if("${ICESOUND}" MATCHES "oss")
@@ -374,14 +361,11 @@ if(CONFIG_FRIBIDI)
         set(CONFIG_FRIBIDI off)
     endif()
 endif()
-
 option(CONFIG_FDO_MENUS "Define to support freedesktop.org style menus" on)
 if(CONFIG_FDO_MENUS)
-    pkg_check_modules(gio gio-2.0 gio-unix-2.0)
-    if(NOT gio_FOUND)
-        set(CONFIG_FDO_MENUS off)
-        message(WARNING "Freedesktop style menus not supported (libglib2.0-dev or similar package required)")
-    endif()
+    set(hint "Freedesktop style menus enabled (-DCONFIG_FDO_MENUS=on) but libglib2.0-dev or similar package not found")
+    pkg_check_or_fail(gio gio-2.0 gio-unix-2.0 ${hint})
+    pkg_check_or_fail(gio_unix gio-unix-2.0 ${hint})
 endif()
 
 option(DEBUG "Define if you want to debug IceWM" off)
@@ -487,7 +471,8 @@ endif()
 
 IF(CONFIG_FDO_MENUS)
     ADD_EXECUTABLE(icewm-menu-fdo${EXEEXT} fdomenu.cc ycollections.cc)
-    target_compile_options(icewm-menu-fdo${EXEEXT} PUBLIC ${gio_CFLAGS})
+    target_compile_options(icewm-menu-fdo${EXEEXT} PUBLIC ${gio_CFLAGS_OTHER} ${gio_unix_CFLAGS_OTHER})
+    target_include_directories(icewm-menu-fdo${EXEEXT} PUBLIC ${gio_INCLUDE_DIRS} ${gio_unix_INCLUDE_DIRS})
     TARGET_LINK_LIBRARIES(icewm-menu-fdo${EXEEXT} ice ${x11_LDFLAGS}
                           ${gio_LDFLAGS} ${nls_LIBS})
     INSTALL(TARGETS icewm-menu-fdo${EXEEXT} DESTINATION ${BINDIR})
diff --git a/src/atasks.cc b/src/atasks.cc
index 72d3af48..c359bbdc 100644
--- a/src/atasks.cc
+++ b/src/atasks.cc
@@ -566,12 +566,12 @@ void TaskButton::paint(Graphics& g, const YRect& r) {
 
         for (int dn = 0; dn < count; dn++) {
             if (wmLook != lookFlat) {
-                g.fillArc(x + dn * crumbStep, y - crumbSize,
+                g.fillArc(x + p + dn * crumbStep, y + p - crumbSize,
                           crumbSize, crumbSize, 0, 360 * 64);
             }
             else {
                 // flat people are know to avoid circles
-                g.fillRect(x + dn * crumbStep, y - crumbSize,
+                g.fillRect(x + p + dn * crumbStep, y + p - crumbSize,
                            crumbSize, crumbSize);
             }
         }
@@ -803,7 +803,7 @@ void TaskButton::handleCrossing(const XCrossingEvent& crossing) {
     YWindow::handleCrossing(crossing);
 }
 
-void TaskButton::handleClick(const XButtonEvent& up, int /*count*/) {
+void TaskButton::handleClick(const XButtonEvent& up, int count) {
     if (up.button == Button3 && fActive) {
         getFrame()->popupSystemMenu(this, up.x_root, up.y_root,
                                     YPopupWindow::pfCanFlipVertical |
@@ -817,7 +817,11 @@ void TaskButton::handleClick(const XButtonEvent& up, int /*count*/) {
         fTaskPane->switchToNext();
     }
     else if (up.button == Button1 && getCount() > 1) {
-        popupGroup();
+        if (count == 1 && KEY_MODMASK(up.state) == 0) {
+            popupGroup();
+        } else {
+            fMenu = null;
+        }
     }
 }
 
diff --git a/src/decorate.cc b/src/decorate.cc
index 9797a51b..5d60b97d 100644
--- a/src/decorate.cc
+++ b/src/decorate.cc
@@ -236,7 +236,9 @@ void YFrameWindow::layoutShape() {
         fShapeBorderY != borderY() ||
         fShapeTabCount != tabCount() ||
         fShapeDecors != frameDecors() ||
-        fShapeTitle != getTitle())
+        fShapeTitle != getTitle() ||
+        fShapeLessTabs != lessTabs() ||
+        fShapeMoreTabs != moreTabs())
     {
         fShapeWidth = width();
         fShapeHeight = height();
@@ -246,6 +248,8 @@ void YFrameWindow::layoutShape() {
         fShapeTabCount = tabCount();
         fShapeDecors = frameDecors();
         fShapeTitle = getTitle();
+        fShapeLessTabs = lessTabs();
+        fShapeMoreTabs = moreTabs();
 
         if (shapes.supported &&
             (frameDecors() & fdBorder) &&
diff --git a/src/fdomenu.cc b/src/fdomenu.cc
index da78893d..71abd72a 100644
--- a/src/fdomenu.cc
+++ b/src/fdomenu.cc
@@ -15,6 +15,10 @@
  *  - overhauled program design and menu construction code, added sub-category handling
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include "config.h"
 #include "base.h"
 #include "sysdep.h"
@@ -23,6 +27,11 @@
 #include <ctype.h>
 #include "debug.h"
 
+#include "stdlib.h"
+
+#include <stack>
+#include <string>
+
 char const *ApplicationName(nullptr);
 
 #ifndef LPCSTR // mind the MFC
@@ -44,6 +53,13 @@ bool no_sep_others = false;
 bool no_sub_cats = false;
 bool generic_name = false;
 bool right_to_left = false;
+bool flat_output = false;
+bool match_in_section = false;
+bool match_in_section_only = false;
+
+auto substr_filter = "";
+auto substr_filter_nocase = "";
+auto flat_sep = " / ";
 
 template<typename T, void TFreeFunc(T)>
 struct auto_raii {
@@ -95,7 +111,56 @@ tListMeta* lookup_category(LPCSTR key)
     return ret;
 }
 
+std::stack<std::string> flat_pfxes;
+
+const char* flat_pfx()
+{
+    if (!flat_output || flat_pfxes.empty())
+        return "";
+    return flat_pfxes.top().c_str();
+}
+
+void flat_add_level(const char *name)
+{
+    if (!flat_output)
+        return;
+    if (flat_pfxes.empty())
+        flat_pfxes.push(std::string(name) + flat_sep);
+    else
+        flat_pfxes.push(flat_pfxes.top() + name + flat_sep);
+}
+
+void flat_drop_level()
+{
+    flat_pfxes.pop();
+}
 
+bool filter_matched(const char* title, const char* section_prefix)
+{
+    if (!match_in_section)
+        section_prefix = nullptr;
+    if (match_in_section_only)
+        title = nullptr;
+
+    bool hasFilter(substr_filter && *substr_filter),
+            hasIfilter (substr_filter_nocase && *substr_filter_nocase);
+
+    if (hasFilter) {
+         if(title && strstr(title, substr_filter))
+             return true;
+         if(section_prefix && strstr(section_prefix, substr_filter))
+             return true;
+    }
+#ifdef __GNU_LIBRARY__
+    if (hasIfilter) {
+        if(title && strcasestr(title, substr_filter_nocase))
+            return true;
+        if(section_prefix && strcasestr(section_prefix, substr_filter_nocase))
+            return true;
+    }
+#endif
+    return ! (hasFilter || hasIfilter);
+}
 
 struct t_menu_node;
 extern t_menu_node root;
@@ -116,7 +181,7 @@ struct t_menu_node {
         int count, level;
         t_menu_node* print_separated;
     };
-    static gboolean print_node(gpointer key, gpointer value, gpointer pr_meta) {
+    static gboolean print_node(gpointer /*key*/, gpointer value, gpointer pr_meta) {
         ((t_menu_node*) value)->print((t_print_meta*) pr_meta);
         return FALSE;
     }
@@ -127,20 +192,23 @@ struct t_menu_node {
 
         if (!store)
         {
-            if (title && progCmd) {
+            if (title && progCmd &&
+                    filter_matched(title, flat_pfxes.empty()
+                                   ? nullptr : flat_pfxes.top().c_str()))
+            {
                 if (ctx->count == 0 && add_sep_before)
                     puts("separator");
                 if (nonempty(generic) && !strcasestr(title, generic)) {
                     if (right_to_left) {
-                        printf("prog \"(%s) %s\" %s %s\n",
-                                generic, title, meta->icon, progCmd);
+                        printf("prog \"(%s) %s%s\" %s %s\n",
+                                generic, flat_pfx(), title, meta->icon, progCmd);
                     } else {
-                        printf("prog \"%s (%s)\" %s %s\n",
-                                title, generic, meta->icon, progCmd);
+                        printf("prog \"%s%s (%s)\" %s %s\n",
+                                flat_pfx(), title, generic, meta->icon, progCmd);
                     }
                 }
                 else
-                    printf("prog \"%s\" %s %s\n", title, meta->icon, progCmd);
+                    printf("prog \"%s%s\" %s %s\n", flat_pfx(), title, meta->icon, progCmd);
             }
             ctx->count++;
             return;
@@ -160,23 +228,32 @@ struct t_menu_node {
             if (ctx->count == 0 && add_sep_before)
                 puts("separator");
             ctx->count++;
-            printf("menu \"%s\" %s {\n", title, meta->icon);
+            if (flat_output)
+                flat_add_level(title);
+            else
+                printf("menu \"%s\" %s {\n", title, meta->icon);
         }
         ctx->level++;
         g_tree_foreach(store, print_node, ctx);
         if (ctx->level == 1 && ctx->print_separated)
         {
+            fflush(stdout);
             puts("separator");
             no_sep_others = true;
             ctx->print_separated->print(ctx);
         }
         ctx->level--;
-        if (ctx->level > 0)
+        if (ctx->level > 0) {
+            if (flat_output)
+                flat_drop_level();
+            else {
 #ifndef DEBUG
-            puts("}");
+                puts("}");
 #else
-            printf("# end of menu \"%s\"\n}\n", title);
+                printf("# end of menu \"%s\"\n}\n", title);
 #endif
+            }
+        }
         if (add_sep_after && ctx->level == 0 && ctx->count > 0)
             puts("separator");
 
@@ -682,6 +759,12 @@ static void help(LPCSTR home, LPCSTR dirs, FILE* out, int xit) {
             "--sep-after\tPrint separator only after contents\n"
             "--no-sep-others\tNo separation of the 'Others' menu point\n"
             "--no-sub-cats\tNo additional subcategories, just one level of menues\n"
+            "--flat\tDisplay all apps in one layer with category hints\n"
+            "--flat-sep STR\tCategory separator string used in flat mode (default: ' / ')\n"
+            "--match PAT\tDisplay only apps with title containing PAT\n"
+            "--imatch PAT\tLike --match but ignores the letter case\n"
+            "--match-sec\tApply --match or --imatch to apps AND sections\n"
+            "--match-osec\tApply --match or --imatch only to sections\n"
             "FILENAME\tAny .desktop file to launch its application Exec command\n"
             "This program also listens to environment variables defined by\n"
             "the XDG Base Directory Specification:\n"
@@ -771,6 +854,12 @@ int main(int argc, char** argv) {
             no_sep_others = true;
         else if (is_long_switch(*pArg, "no-sub-cats"))
             no_sub_cats = true;
+        else if (is_long_switch(*pArg, "flat"))
+            flat_output = no_sep_others = true;
+        else if (is_long_switch(*pArg, "match-sec"))
+            match_in_section = true;
+        else if (is_long_switch(*pArg, "match-osec"))
+            match_in_section = match_in_section_only = true;
         else if (is_switch(*pArg, "g", "generic-name"))
             generic_name = true;
         else {
@@ -788,6 +877,12 @@ int main(int argc, char** argv) {
                 if (expand)
                     delete[] expand;
             }
+            else if (GetArgument(value, "m", "match", pArg, argv + argc))
+                substr_filter = value;
+            else if (GetArgument(value, "M", "imatch", pArg, argv + argc))
+                substr_filter_nocase = value;
+            else if (GetArgument(value, "F", "flat-sep", pArg, argv + argc))
+                flat_sep = value;
             else // unknown option
                 help(usershare, sysshare, stderr, EXIT_FAILURE);
         }
diff --git a/src/icesh.cc b/src/icesh.cc
index 5c02d2d3..5e1caa00 100644
--- a/src/icesh.cc
+++ b/src/icesh.cc
@@ -198,6 +198,7 @@ static NAtom ATOM_ICE_DOCKAPPS("_ICEWM_DOCKAPPS");
 static NAtom ATOM_ICE_WINOPT("_ICEWM_WINOPTHINT");
 static NAtom ATOM_MOTIF_HINTS(_XA_MOTIF_WM_HINTS);
 static NAtom ATOM_NET_CLIENT_LIST("_NET_CLIENT_LIST");
+static NAtom ATOM_NET_CLIENT_LIST_STACKING("_NET_CLIENT_LIST_STACKING");
 static NAtom ATOM_NET_CLOSE_WINDOW("_NET_CLOSE_WINDOW");
 static NAtom ATOM_NET_ACTIVE_WINDOW("_NET_ACTIVE_WINDOW");
 static NAtom ATOM_NET_FRAME_EXTENTS("_NET_FRAME_EXTENTS");
@@ -282,6 +283,11 @@ static Time serverTime()
     return now;
 }
 
+static void sendEvent(void* event) {
+    XSendEvent(display, root, False, SubstructureNotifyMask,
+               reinterpret_cast<XEvent *>(event));
+}
+
 static void send(NAtom& typ, Window win, long l0, long l1,
                  long l2 = 0L, long l3 = 0L, long l4 = 0L)
 {
@@ -298,8 +304,7 @@ static void send(NAtom& typ, Window win, long l0, long l1,
     xev.data.l[3] = l3;
     xev.data.l[4] = l4;
 
-    XSendEvent(display, root, False, SubstructureNotifyMask,
-               reinterpret_cast<XEvent *>(&xev));
+    sendEvent(&xev);
 }
 
 /******************************************************************************/
@@ -948,7 +953,7 @@ class YWindowTree {
             : (fChildren.push_back(window), true);
     }
 
-    void query(Window window) {
+    bool query(Window window) {
         release();
         if (window) {
             Window rootw;
@@ -959,6 +964,7 @@ class YWindowTree {
                 XFree(data);
             }
         }
+        return bool(fParent);
     }
 
     void getWindowList(NAtom& property) {
@@ -1112,8 +1118,13 @@ class YWindowTree {
                     }
                 }
                 else if (prop.type() == XA_ATOM) {
-                    if (propertyValue && propertyValue == Atom(*prop)) {
-                        match = true;
+                    if (propertyValue) {
+                        for (long i = 0; i < prop.count(); ++i) {
+                            if (propertyValue == Atom(prop[i])) {
+                                match = true;
+                                break;
+                            }
+                        }
                     }
                 }
             }
@@ -1298,6 +1309,25 @@ class YWindowTree {
         }
     }
 
+    void stacking() {
+        YWindowTree stack;
+        stack.getWindowList(ATOM_NET_CLIENT_LIST_STACKING);
+        if (stack) {
+            std::sort(fChildren.begin(), fChildren.end(),
+                      [&stack](Window &a, Window &b){
+                return
+                    std::find(stack.fChildren.begin(),
+                              stack.fChildren.end(), a) >
+                    std::find(stack.fChildren.begin(),
+                              stack.fChildren.end(), b);
+            });
+        }
+    }
+
+    void reverse() {
+        std::reverse(fChildren.begin(), fChildren.end());
+    }
+
 private:
     Confine fConfine;
     Window fParent;
@@ -1312,6 +1342,8 @@ YTreeLeaf* YTreeIter::operator->() { return fTree.leaf(fIndex); }
 
 #define FOREACH_WINDOW(W) \
     for (YTreeIter W(windowList); W; ++W)
+#define CHANGES_WINDOW(W) \
+    for (YTreeIter W(windowList); use(W); modified(W), ++W)
 
 /******************************************************************************/
 
@@ -1339,7 +1371,7 @@ class IceSh {
     vector<YWindowTree> trees;
     vector<Window> modifications;
 
-    void use(Window w);
+    bool use(Window w);
     void modified(Window w);
     void spy();
     void spyEvent(const XEvent& event);
@@ -1393,12 +1425,14 @@ class IceSh {
     bool setWorkspaceNames();
     void changeState(const char* arg);
     void changeState(int state);
+    void changeState(int state, Window window);
     bool colormaps();
     bool workarea();
     bool current();
     bool runonce();
     void click();
     bool delay();
+    void tabTo(char* arg);
     void monitors();
     bool desktops();
     bool desktop();
@@ -1694,6 +1728,19 @@ static Window getFrameWindow(Window window)
     return None;
 }
 
+static int countTabs(Window frame) {
+    YWindowTree windowList(frame);
+    int count = 0;
+    FOREACH_WINDOW(window)
+        if (window->wmName() == "Container")
+            ++count;
+    return count;
+}
+
+static bool isTabbed(Window client) {
+    return countTabs(getFrameWindow(client)) > 1;
+}
+
 static Window getGroupLeader(Window window) {
     Window lead = None;
     YClient prop(window, ATOM_WM_CLIENT_LEADER);
@@ -1783,13 +1830,14 @@ void IceSh::catcher(int)
     running = false;
 }
 
-void IceSh::use(Window window)
+bool IceSh::use(Window window)
 {
-    if (contains(modifications, window)) {
+    if (window && contains(modifications, window)) {
         sync();
         fsleep(0.1);
         modifications.clear();
     }
+    return window;
 }
 
 void IceSh::modified(Window window)
@@ -2217,7 +2265,7 @@ void IceSh::setWindowType(const char* arg)
                 char buf[99] = "_NET_WM_WINDOW_TYPE_";
                 strlcat(buf, types[i], sizeof buf);
                 NAtom atom(buf);
-                FOREACH_WINDOW(window) {
+                CHANGES_WINDOW(window) {
                     setAtom(window, ATOM_NET_WM_WINDOW_TYPE, atom);
                 }
                 break;
@@ -2416,9 +2464,9 @@ void IceSh::doSync()
 {
     YProperty winp(root, ATOM_WIN_PROTOCOLS, XA_ATOM, 20);
     if (winp) {
-        unsigned char data[3] = { 0, 0, 0, };
         YProperty wopt(root, ATOM_ICE_WINOPT, ATOM_ICE_WINOPT, 20);
         if (wopt == false) {
+            unsigned char data[3] = { 0, 0, 0, };
             wopt.append(data, 3, 8);
         }
         for (int i = 1; i <= 5 && winp && wopt; ++i) {
@@ -2490,9 +2538,15 @@ void IceSh::changeState(const char* arg)
     }
 }
 
+void IceSh::changeState(int state, Window window) {
+    use(window);
+    send(ATOM_WM_CHANGE_STATE, window, state, None);
+    modified(window);
+}
+
 void IceSh::changeState(int state) {
     FOREACH_WINDOW(window) {
-        send(ATOM_WM_CHANGE_STATE, window, state, None);
+        changeState(state, window);
     }
 }
 
@@ -3117,7 +3171,7 @@ void IceSh::motif(Window window, char** args, int count) {
 }
 
 void IceSh::setBorderTitle(int border, int title) {
-    FOREACH_WINDOW(window) {
+    CHANGES_WINDOW(window) {
         YMotifHints hints(window);
         MwmHints mwm;
         if (hints) {
@@ -3383,6 +3437,104 @@ void IceSh::flush()
         throw 1;
 }
 
+static void randomSetup() {
+    static unsigned seed;
+    if (seed == 0) {
+        timeval now = walltime();
+        seed = unsigned((getpid() * now.tv_usec) ^ now.tv_sec);
+        srand(seed);
+    }
+}
+
+static char* randomLabel() {
+    static const char data[] =
+        "abcdefghijklmnopqrstuvwxyz-12345"
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ_67890";
+    const int length = 7;
+    static char label[length + 1];
+    randomSetup();
+    for (int i = 0, r = 0; i < length; ++i) {
+        if (r < 32)
+            r = rand();
+        label[i] = data[r & 63];
+        r >>= 6;
+    }
+    label[length] = '\0';
+    return label;
+}
+
+void IceSh::tabTo(char* defaultLabel)
+{
+    if ( ! windowList && ! selecting) {
+        Window pick = pickWindow();
+        if (pick <= root)
+            throw 1;
+        setWindow(pick);
+        selecting = true;
+    }
+    CHANGES_WINDOW(window) {
+        if (defaultLabel == nullptr && isTabbed(window) == false)
+            continue;
+
+        XClassHint h = { nullptr, nullptr };
+        bool xgot = (XGetClassHint(display, window, &h) == True);
+        YStringProperty role(window, ATOM_WM_WINDOW_ROLE);
+        const char* str1 = nullptr, *str2 = nullptr;
+        if (xgot && h.res_class)
+            str1 = h.res_class, str2 = h.res_name;
+        else if (xgot && h.res_name)
+            str1 = h.res_name, str2 = role ? &role : nullptr;
+        else if (role)
+            str1 = &role;
+        size_t length = (str1 ? strlen(str1) : 0)
+                      + (str2 ? strlen(str2) : 0);
+        XWindowAttributes attr = {};
+        if (length && XGetWindowAttributes(display, window, &attr)) {
+            char* label = defaultLabel ? defaultLabel : randomLabel();
+            size_t size = length + 10 + strlen(label);
+            char* buf = new char[size];
+            if (buf) {
+                int len;
+                if (str2) {
+                    len = snprintf(buf, size, "%s.%s%cframe%c%s",
+                                   str1, str2, '\0', '\0', label);
+                } else {
+                    len = snprintf(buf, size, "%s%cframe%c%s",
+                                   str1, '\0', '\0', label);
+                }
+                XUnmapWindow(display, window);
+                XUnmapEvent unmap = {
+                    UnmapNotify, None, True, display, root, window, False
+                };
+                sendEvent(&unmap);
+                for (;;) {
+                    YWindowTree tree;
+                    tree.getClientList();
+                    if (tree.have(window) == false)
+                        break;
+                    if ( !tree.query(window) || tree.parent() == root)
+                        break;
+                }
+                YProperty wopt(root, ATOM_ICE_WINOPT, ATOM_ICE_WINOPT, 0);
+                wopt.append((unsigned char *) buf, len + 1, 8);
+                doSync();
+                XMapWindow(display, window);
+                for (;;) {
+                    YWindowTree tree;
+                    tree.getClientList();
+                    if (tree.have(window))
+                        break;
+                    if ( !tree.query(window) || tree.parent() != root)
+                        break;
+                }
+                delete[] buf;
+            }
+        }
+        XFree(h.res_name);
+        XFree(h.res_class);
+    }
+}
+
 void IceSh::extendClass()
 {
     if ( ! windowList && ! selecting) {
@@ -4296,8 +4448,10 @@ void IceSh::parseAction()
                 setGeometry(window, geometry);
         }
         else if (isAction("getGeometry", 0)) {
-            FOREACH_WINDOW(window)
+            FOREACH_WINDOW(window) {
+                use(window);
                 getGeometry(window);
+            }
         }
         else if (isAction("resize", 2)) {
             const char* ws = getArg();
@@ -4511,6 +4665,7 @@ void IceSh::parseAction()
         else if (isAction("getWorkspace", 0)) {
             WorkspaceInfo info;
             FOREACH_WINDOW(window) {
+                use(window);
                 int ws = int(getWorkspace(window));
                 const char* name = info ? info[ws] : "";
                 printf("0x%-7lx %d \"%s\"\n", Window(window), ws, name);
@@ -4545,7 +4700,7 @@ void IceSh::parseAction()
             check(layers, layer, argp[-1]);
 
             MSG(("setLayer: %d", layer));
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 setLayer(window, layer);
         }
         else if (isAction("getLayer", 0)) {
@@ -4605,8 +4760,10 @@ void IceSh::parseAction()
                 printf("0x%07lx\n", Window(window));
         }
         else if (isAction("frame", 0)) {
-            FOREACH_WINDOW(window)
+            FOREACH_WINDOW(window) {
+                use(window);
                 printf("0x%07lx\n", getFrameWindow(window));
+            }
         }
         else if (isAction("pid", 0)) {
             FOREACH_WINDOW(window) {
@@ -4626,23 +4783,23 @@ void IceSh::parseAction()
             spy();
         }
         else if (isAction("close", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 closeWindow(window);
         }
         else if (isAction("kill", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 XKillClient(display, window);
         }
         else if (isAction("activate", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 activateWindow(window);
         }
         else if (isAction("raise", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 raiseWindow(window);
         }
         else if (isAction("lower", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 lowerWindow(window);
         }
         else if (isAction("fullscreen", 0)) {
@@ -4660,27 +4817,27 @@ void IceSh::parseAction()
             }
         }
         else if (isAction("minimize", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 YNetState(window) += NetHidden;
         }
         else if (isAction("vertical", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 YNetState(window) += NetVertical;
         }
         else if (isAction("horizontal", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 YNetState(window) += NetHorizontal;
         }
         else if (isAction("rollup", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 YNetState(window) += NetShaded;
         }
         else if (isAction("above", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 YNetState(window) += NetAbove;
         }
         else if (isAction("below", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 YNetState(window) += NetBelow;
         }
         else if (isAction("urgent", 0)) {
@@ -4694,11 +4851,11 @@ void IceSh::parseAction()
             changeState(NormalState);
         }
         else if (isAction("xmap", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 XMapWindow(display, window);
         }
         else if (isAction("xunmap", 0)) {
-            FOREACH_WINDOW(window)
+            CHANGES_WINDOW(window)
                 XUnmapWindow(display, window);
         }
         else if (isAction("xmove", 2)) {
@@ -4876,6 +5033,18 @@ void IceSh::parseAction()
         else if (isAction("monitors", 4)) {
             monitors();
         }
+        else if (isAction("tabto", 1)) {
+            tabTo(getArg());
+        }
+        else if (isAction("untab", 0)) {
+            tabTo(nullptr);
+        }
+        else if (isAction("stacking", 0)) {
+            windowList.stacking();
+        }
+        else if (isAction("reverse", 0)) {
+            windowList.reverse();
+        }
         else {
             msg(_("Unknown action: `%s'"), *argp);
             throw 1;
diff --git a/src/movesize.cc b/src/movesize.cc
index 5313fa56..4dd0f43e 100644
--- a/src/movesize.cc
+++ b/src/movesize.cc
@@ -378,6 +378,20 @@ void YFrameWindow::handleMoveMouse(const XMotionEvent &motion, int &newX, int &n
     }
     newX -= borderX();
     newY -= borderY();
+
+    if (movingWindow && opaqueMove)
+        checkEdgeSwitch(mouseX, mouseY);
+}
+
+void YFrameWindow::checkEdgeSwitch(int mouseX, int mouseY) {
+    if (0 <= manager->edgeWorkspace(mouseX, mouseY)) {
+        if (fEdgeSwitchTimer == nullptr ||
+            fEdgeSwitchTimer->isRunning() == false ||
+            fEdgeSwitchTimer->getTimerListener() != this)
+            fEdgeSwitchTimer->setTimer(edgeSwitchDelay, this, true);
+    }
+    else if (fEdgeSwitchTimer)
+        fEdgeSwitchTimer = null;
 }
 
 void YFrameWindow::handleResizeMouse(const XMotionEvent &motion,
@@ -979,10 +993,6 @@ void YFrameWindow::endMoveSize() {
     xapp->releaseEvents();
     statusMoveSize->end();
 
-    if ((movingWindow && opaqueMove) ||
-        (sizingWindow && opaqueResize))
-        drawMoveSizeFX(x(), y(), width(), height());
-
     movingWindow = false;
     sizingWindow = false;
 
diff --git a/src/wmclient.cc b/src/wmclient.cc
index a5c2ae43..2b94ce63 100644
--- a/src/wmclient.cc
+++ b/src/wmclient.cc
@@ -546,7 +546,8 @@ void YFrameClient::setFrameState(FrameState state) {
         }
     }
     else if (state != fSavedFrameState) {
-        Atom iconic = (state == IconicState && getFrame()->isMinimized()
+        Atom iconic = (state == IconicState && getFrame()
+                       && getFrame()->isMinimized()
                        && getFrame()->getMiniIcon())
                     ? getFrame()->getMiniIcon()->iconWindow() : None;
         Atom arg[2] = { Atom(state), iconic };
@@ -1609,8 +1610,7 @@ bool YFrameClient::getWinTrayHint(int* tray_opt) {
     return false;
 }
 
-void YFrameClient::setStateHint() {
-    int state = getFrame()->getState();
+void YFrameClient::setStateHint(int state) {
     MSG(("set state 0x%8X, saved 0x%8X, win 0x%lx",
           state, fWinStateHint, handle()));
 
diff --git a/src/wmclient.h b/src/wmclient.h
index 4ef8315e..f85a6050 100644
--- a/src/wmclient.h
+++ b/src/wmclient.h
@@ -287,7 +287,7 @@ class YFrameClient: public YDndWindow
     void setWinTrayHint(int tray_opt);
     bool getWinTrayHint(int* tray_opt);
 
-    void setStateHint();
+    void setStateHint(int state);
     void setWinHintsHint(int hints);
     int winHints() const { return fWinHints; }
 
diff --git a/src/wmframe.cc b/src/wmframe.cc
index 2bfb902c..b1bae442 100644
--- a/src/wmframe.cc
+++ b/src/wmframe.cc
@@ -30,6 +30,7 @@ static YColorName inactiveBorderBg(&clrInactiveBorder);
 
 lazy<YTimer> YFrameWindow::fAutoRaiseTimer;
 lazy<YTimer> YFrameWindow::fDelayFocusTimer;
+lazy<YTimer> YFrameWindow::fEdgeSwitchTimer;
 YArray<YFrameWindow::GroupModal> YFrameWindow::groupModals;
 YArray<YFrameWindow*> YFrameWindow::tabbedFrames;
 YArray<YFrameWindow*> YFrameWindow::namedFrames;
@@ -97,6 +98,8 @@ YFrameWindow::YFrameWindow(
     fShapeBorderY(-1),
     fShapeTabCount(0),
     fShapeDecors(0),
+    fShapeLessTabs(false),
+    fShapeMoreTabs(false),
     fHaveStruts(false),
     indicatorsCreated(false),
     fWindowType(wtNormal)
@@ -125,6 +128,8 @@ YFrameWindow::~YFrameWindow() {
         fDelayFocusTimer->disableTimerListener(this);
     if (fAutoRaiseTimer)
         fAutoRaiseTimer->disableTimerListener(this);
+    if (fEdgeSwitchTimer)
+        fEdgeSwitchTimer->disableTimerListener(this);
     if (movingWindow || sizingWindow)
         endMoveSize();
     if (fPopupActive)
@@ -188,13 +193,21 @@ bool YFrameWindow::hasTab(YFrameClient* client) {
     return 0 <= find(fTabs, client);
 }
 
-void YFrameWindow::mergeTabs(YFrameWindow* source) {
-    bool focus = source->focused();
+bool YFrameWindow::lessTabs() {
+    return fClient && fClient != fTabs[0];
+}
+
+bool YFrameWindow::moreTabs() {
+    return fClient && fClient != fTabs.last();
+}
+
+void YFrameWindow::mergeTabs(YFrameWindow* frame) {
+    bool focus = frame->focused();
     if (focus)
-        manager->switchFocusFrom(source);
-    if (1 < source->tabCount())
-        findRemove(tabbedFrames, source);
-    for (YFrameClient* client : source->fTabs) {
+        manager->switchFocusFrom(frame);
+    if (1 < frame->tabCount())
+        findRemove(tabbedFrames, frame);
+    for (YFrameClient* client : frame->fTabs) {
         client->setFrame(nullptr);
         client->hide();
         YClientContainer* conter = client->getContainer();
@@ -206,12 +219,13 @@ void YFrameWindow::mergeTabs(YFrameWindow* source) {
         fTabs.append(client);
         if (tabCount() == 2)
             tabbedFrames.append(this);
+        manager->clientTransfered(client, this);
     }
-    source->fTabs.clear();
-    source->fClient = nullptr;
-    source->fContainer = nullptr;
-    delete source->fTitleBar; source->fTitleBar = nullptr;
-    delete source;
+    frame->fTabs.clear();
+    frame->fClient = nullptr;
+    frame->fContainer = nullptr;
+    delete frame->fTitleBar; frame->fTitleBar = nullptr;
+    delete frame;
     if (fTitleBar)
         layoutShape();
     if (focus)
@@ -248,40 +262,68 @@ void YFrameWindow::selectTab(YFrameClient* tab) {
     if (hasTab(tab) == false || tab == fClient)
         return;
 
+    XSizeHints *sh = client()->sizeHints();
+    int nw = sh ? sh->base_width + normalW * max(1, sh->width_inc) : normalW;
+    int nh = sh ? sh->base_height + normalH * max(1, sh->height_inc) : normalH;
+
     bool focus = hasState(WinStateFocused);
     if (focus) {
         fWinState &= ~WinStateFocused;
-        client()->setStateHint();
-    }
-    if (container())
-        container()->hide();
-    if (client()) {
-        client()->hide();
-        client()->setFrame(nullptr);
+        client()->setStateHint(getState());
     }
+    YClientContainer* formerConter = container();
+    formerConter->lower();
+    YFrameClient* formerClient = client();
+    formerClient->setFrame(nullptr);
+
     fClient = tab;
     fClient->setFrame(this);
     fContainer = tab->getContainer();
     fContainer->raise();
-    updateNormalSize();
-    layoutClient();
-    updateIcon();
+
+    if (client()->getNetWMWindowType(&fWindowType) == false)
+        fWindowType = client()->isTransient() ? wtDialog : wtNormal;
+    getFrameHints();
+
+    client()->constrainSize(nw, nh, YFrameClient::csRound);
+    sh = client()->sizeHints();
+    if (sh && sh->base_width && sh->base_height && !isResizable()) {
+        normalW = normalH = 0;
+    } else if (sh) {
+        int winc = max(1, sh->width_inc);
+        int hinc = max(1, sh->height_inc);
+        normalW = max(0, (nw - sh->base_width + (winc / 2)) / winc);
+        normalH = max(0, (nh - sh->base_height + (hinc / 2)) / hinc);
+    } else {
+        normalW = nw;
+        normalH = nh;
+    }
+
+    updateDerivedSize(getState() & WinStateMaximizedBoth);
+    updateLayout();
     if (focus) {
         fWinState |= WinStateFocused;
         fDelayFocusTimer->setTimer(0, this, true);
     }
-    client()->setStateHint();
+    performLayout();
+    updateIcon();
     if (visible()) {
         client()->show();
         container()->show();
-        if (fTitleBar && manager->notShutting())
+        container()->regrabMouse();
+        if (fTitleBar)
             fTitleBar->repaint();
     }
+    client()->setStateHint(getState());
+
+    formerConter->hide();
+    formerClient->hide();
 }
 
 void YFrameWindow::createTab(YFrameClient* client, int place) {
     YClientContainer* conter = allocateContainer(client);
     manage(client, conter);
+    updateProperties(client);
     if (0 <= place && place <= tabCount())
         fTabs.insert(place, client);
     else
@@ -292,6 +334,8 @@ void YFrameWindow::createTab(YFrameClient* client, int place) {
         layoutShape();
         fTitleBar->repaint();
     }
+    manager->updateClientList();
+    addToWindowList();
 }
 
 void YFrameWindow::removeTab(YFrameClient* client) {
@@ -301,10 +345,13 @@ void YFrameWindow::removeTab(YFrameClient* client) {
         YClientContainer* conter = client->getContainer();
         independer(client);
         delete conter;
-        if (fTitleBar && manager->notShutting())
+        if (fTitleBar && manager->notShutting()) {
+            layoutShape();
             fTitleBar->repaint();
+        }
         if (tabCount() < 2)
             findRemove(tabbedFrames, this);
+        manager->clientDestroyed(client);
     }
 }
 
@@ -324,6 +371,10 @@ void YFrameWindow::untab(YFrameClient* client) {
             manager->manageClient(client);
             if (tabCount() < 2)
                 findRemove(tabbedFrames, this);
+            if (fTitleBar) {
+                layoutShape();
+                fTitleBar->repaint();
+            }
         }
     }
 }
@@ -479,7 +530,7 @@ void YFrameWindow::doManage(YFrameClient *clientw, bool &doActivate, bool &reque
     if (mo)
         setWorkspace(mo->getWorkspace());
 
-    if (isHidden() || isMinimized() || client() == taskBar) {
+    if (isUnmapped() || client() == taskBar) {
         doActivate = false;
         requestFocus = false;
     }
@@ -1077,6 +1128,23 @@ bool YFrameWindow::handleTimer(YTimer *t) {
                 }
             }
         }
+        else if (t == fEdgeSwitchTimer) {
+            int rx, ry;
+            xapp->queryMouse(&rx, &ry);
+            int ws = manager->edgeWorkspace(rx, ry);
+            if (0 <= ws) {
+                if (this == manager->getFocus())
+                    manager->switchToWorkspace(ws, true);
+                else if (isAllWorkspaces())
+                    manager->switchToWorkspace(ws, false);
+                else {
+                    setWorkspace(AllWorkspaces);
+                    manager->switchToWorkspace(ws, false);
+                    setWorkspace(ws);
+                }
+                return edgeContWorkspaceSwitching;
+            }
+        }
     }
     return false;
 }
@@ -1140,6 +1208,8 @@ YFrameWindow *YFrameWindow::findWindow(int flags) {
             goto next;
         if ((flags & fwfWorkspace) && !p->visibleNow())
             goto next;
+        if (p == this && !(flags & fwfSame))
+            goto next;
         if (!p->client()->adopted() || p->client()->destroyed())
             goto next;
 
@@ -1154,9 +1224,13 @@ YFrameWindow *YFrameWindow::findWindow(int flags) {
             if (!(flags & fwfCycle))
                 return nullptr;
             else if (flags & fwfBackward)
-                p = (flags & fwfLayers) ? manager->bottomLayer() : manager->bottom(getActiveLayer());
+                p = (flags & fwfLayers)
+                  ? manager->bottomLayer()
+                  : manager->bottom(getActiveLayer());
             else
-                p = (flags & fwfLayers) ? manager->topLayer() : manager->top(getActiveLayer());
+                p = (flags & fwfLayers)
+                  ? manager->topLayer()
+                  : manager->top(getActiveLayer());
         }
     } while (p != this);
 
@@ -1411,7 +1485,7 @@ void YFrameWindow::wmSetLayer(int layer) {
     int previous = fWinState;
     setRequestedLayer(layer);
     if (hasbit(previous ^ fWinState, WinStateAbove | WinStateBelow)) {
-        client()->setStateHint();
+        client()->setStateHint(getState());
     }
 }
 
@@ -1759,7 +1833,10 @@ void YFrameWindow::wmKill() {
 }
 
 void YFrameWindow::wmPrevWindow() {
-    if (1 < tabCount()) {
+    if (this != manager->getFocus() && manager->getFocus())
+        return manager->getFocus()->wmPrevWindow();
+
+    if (1 < tabCount() && isMapped() && visible()) {
         int i = find(fTabs, client());
         if (0 < i) {
             selectTab(fTabs[i - 1]);
@@ -1777,7 +1854,10 @@ void YFrameWindow::wmPrevWindow() {
 }
 
 void YFrameWindow::wmNextWindow() {
-    if (1 < tabCount()) {
+    if (this != manager->getFocus() && manager->getFocus())
+        return manager->getFocus()->wmNextWindow();
+
+    if (1 < tabCount() && isMapped() && visible()) {
         int i = find(fTabs, client());
         if (0 <= i && i + 1 < tabCount()) {
             selectTab(fTabs[i + 1]);
@@ -2948,7 +3028,7 @@ void YFrameWindow::updateState() {
     if (!isManaged() || !client() || client()->destroyed())
         return ;
 
-    client()->setStateHint();
+    client()->setStateHint(getState());
 
     // some code is probably against the ICCCM.
     // some applications misbehave either way.
@@ -3449,10 +3529,12 @@ ref<YIcon> YFrameWindow::getIcon() const {
     return wmapp->getDefaultAppIcon();
 }
 
-void YFrameWindow::updateProperties() {
-    client()->setWorkspaceHint(fWinWorkspace);
-    client()->setLayerHint(fWinActiveLayer);
-    client()->setStateHint();
+void YFrameWindow::updateProperties(YFrameClient* client) {
+    if (client || (client = fClient) != nullptr) {
+        client->setWorkspaceHint(fWinWorkspace);
+        client->setLayerHint(fWinActiveLayer);
+        client->setStateHint(getState());
+    }
 }
 
 void YFrameWindow::updateTaskBar() {
@@ -3641,10 +3723,10 @@ void YFrameWindow::updateNetWMFullscreenMonitors(int t, int b, int l, int r) {
 }
 
 void YFrameWindow::setWmUrgency(bool wmUrgency) {
-    if ( !frameOption(foIgnoreUrgent)) {
+    if ( !frameOption(foIgnoreUrgent) || !wmUrgency) {
         if (wmUrgency != hasState(WinStateUrgent)) {
             fWinState ^= WinStateUrgent;
-            client()->setStateHint();
+            client()->setStateHint(getState());
             updateTaskBar();
         }
     }
diff --git a/src/wmframe.h b/src/wmframe.h
index bcfd4bbc..6041cc7a 100644
--- a/src/wmframe.h
+++ b/src/wmframe.h
@@ -40,12 +40,14 @@ class YFrameWindow:
 
     void untab(YFrameClient* dest);
     bool hasTab(YFrameClient* dest);
+    bool lessTabs();
+    bool moreTabs();
     void closeTab(YFrameClient* client);
     void removeTab(YFrameClient* client);
     void selectTab(YFrameClient* client);
     void changeTab(int delta);
     void createTab(YFrameClient* client, int place = -1);
-    void mergeTabs(YFrameWindow* source);
+    void mergeTabs(YFrameWindow* frame);
     void independer(YFrameClient* client);
 
     Window createPointerWindow(Cursor cursor, int gravity);
@@ -142,7 +144,7 @@ class YFrameWindow:
     void handleMoveMouse(const XMotionEvent &motion, int &newX, int &newY);
     void handleResizeMouse(const XMotionEvent &motion,
                            int &newX, int &newY, int &newWidth, int &newHeight);
-
+    void checkEdgeSwitch(int mouseX, int mouseY);
     void outlineMove();
     void outlineResize();
 
@@ -327,7 +329,7 @@ class YFrameWindow:
     void performLayout();
 
     void updateMwmHints(XSizeHints* sh);
-    void updateProperties();
+    void updateProperties(YFrameClient* client = nullptr);
     void updateTaskBar();
     void updateAppStatus();
     void removeAppStatus();
@@ -472,6 +474,7 @@ class YFrameWindow:
 
     static lazy<YTimer> fAutoRaiseTimer;
     static lazy<YTimer> fDelayFocusTimer;
+    static lazy<YTimer> fEdgeSwitchTimer;
 
     int fWinWorkspace;
     int fWinRequestedLayer;
@@ -506,6 +509,8 @@ class YFrameWindow:
     int fShapeTabCount;
     unsigned fShapeDecors;
     mstring fShapeTitle;
+    bool fShapeLessTabs;
+    bool fShapeMoreTabs;
 
     bool fHaveStruts;
     bool indicatorsCreated;
diff --git a/src/wmmgr.cc b/src/wmmgr.cc
index 8d8f4280..2babbc76 100644
--- a/src/wmmgr.cc
+++ b/src/wmmgr.cc
@@ -315,7 +315,7 @@ bool YWindowManager::handleTimer(YTimer* timer) {
 
 void YWindowManager::handlePopDown(YPopupWindow* popup) {
     if (popup == fSwitchWindow) {
-        fSwitchDownTimer->setTimer(3000, this, true);
+        fSwitchDownTimer->setTimer(30000, this, true);
     }
 }
 
@@ -1062,7 +1062,9 @@ void YWindowManager::setFocus(YFrameWindow *f, bool canWarp, bool reorder) {
         else
             w = f->handle();
 
-        if (f->getInputFocusHint())
+        if (f->getInputFocusHint() ||
+                ((f->isRollup() || f->isFullscreen())
+                    && !f->avoidFocus()))
             switchFocusTo(f, reorder);
 
         f->setWmUrgency(false);
@@ -1083,7 +1085,9 @@ void YWindowManager::setFocus(YFrameWindow *f, bool canWarp, bool reorder) {
     }
 #endif
 
-    bool focusUnset(fFocusWin == nullptr || fFocusWin->visible() == false);
+    bool focusUnset(fFocusWin == nullptr ||
+                    fFocusWin->visible() == false ||
+                    fFocusWin->isRollup());
     if (w != None) {
         if (f->getInputFocusHint()) {
             XSetInputFocus(xapp->display(), w, RevertToNone,
@@ -1276,7 +1280,10 @@ void YWindowManager::manageClients() {
                                 pos = num + 1;
                             ++num;
                         }
+                        fCreatedUpdated = fLayeredUpdated = true;
                         res->frame->createTab(client, pos);
+                        if (fSwitchWindow)
+                            fSwitchWindow->createdClient(res->frame, client);
                     } else {
                         manageClient(client);
                         if (client->getFrame() == nullptr) {
@@ -1916,7 +1923,7 @@ void YWindowManager::manageClient(YFrameClient* client, bool mapClient) {
             if (requestFocus && frame->avoidFocus() == false)
                 frame->setWmUrgency(true);
         }
-        if (switchWindowVisible())
+        if (fSwitchWindow)
             fSwitchWindow->createdFrame(frame);
     }
 }
@@ -1955,15 +1962,18 @@ void YWindowManager::mapClient(Window win) {
         if (client == nullptr) {
             client = allocateClient(win, true);
         }
-        if (client) {
+        if (client && client->adopted()) {
             const WindowOption* wo = client->getWindowOption();
             if (wo && wo->frame) {
                 for (YFrameWindow* frame : YFrameWindow::fnaming()) {
                     if (frame->getFrameName() == wo->frame) {
                         int place = frame->tabCount();
+                        fCreatedUpdated = fLayeredUpdated = true;
                         frame->createTab(client, place);
                         if (client->activateOnMap())
                             frame->selectTab(client);
+                        if (fSwitchWindow)
+                            fSwitchWindow->createdClient(frame, client);
                         client = nullptr;
                         break;
                     }
@@ -2005,13 +2015,25 @@ void YWindowManager::unmanageClient(YFrameClient* client) {
         if (conter) {
             frame = conter->getFrame();
             frame->removeTab(client);
-            if (switchWindowVisible())
-                fSwitchWindow->destroyedClient(client);
         }
     }
     delete client;
 }
 
+void YWindowManager::clientDestroyed(YFrameClient* client) {
+    fCreatedUpdated = fLayeredUpdated = true;
+    if (notShutting())
+        updateClientList();
+    if (fSwitchWindow)
+        fSwitchWindow->destroyedClient(client);
+}
+
+void YWindowManager::clientTransfered(YFrameClient* client, YFrameWindow* frame) {
+    fLayeredUpdated = true;
+    if (fSwitchWindow)
+        fSwitchWindow->transfer(client, frame);
+}
+
 void YWindowManager::destroyedClient(Window win) {
     YFrameClient* client = findClient(win);
     if (client) {
@@ -3148,7 +3170,8 @@ void YWindowManager::handleProperty(const XPropertyEvent &property) {
                     s[k] = i + (const char *) propdata;
                     while (i < nitems && propdata[i++]);
                 }
-                if (s[0] && s[1] && s[2] && propdata[i - 1] == 0) {
+                if (s[0] && *s[0] && s[1] && *s[1] && s[2] && *s[2] &&
+                    propdata[i - 1] == 0) {
                     hintOptions->setWinOption(s[0], s[1], s[2]);
                 }
             }
@@ -3247,7 +3270,7 @@ void YWindowManager::removeClientFrame(YFrameWindow *frame) {
             setColormapWindow(getFocus());
         if (frame->affectsWorkArea())
             updateWorkArea();
-        if (switchWindowVisible())
+        if (fSwitchWindow)
             fSwitchWindow->destroyedFrame(frame);
     }
 }
@@ -3641,6 +3664,13 @@ void YWindowManager::handleMsgBox(YMsgBox *msgbox, int operation) {
     delete msgbox;
 }
 
+int YWindowManager::edgeWorkspace(int x, int y) {
+    for (auto edge : edges)
+        if (edge->visible() && edge->geometry().contains(x, y))
+            return edge->destination();
+    return -1;
+}
+
 EdgeSwitch::EdgeSwitch(YWindowManager *manager, int delta, bool vertical):
     YDndWindow(desktop),
     fManager(manager),
@@ -3693,10 +3723,7 @@ void EdgeSwitch::handleDNDLeave() {
     }
 }
 
-bool EdgeSwitch::handleTimer(YTimer *t) {
-    if (t != fEdgeSwitchTimer)
-        return false;
-
+int EdgeSwitch::destination() {
     int worksps = workspaceCount;
     int orient  = fManager->layout().orient;
     int columns = min(fManager->layout().columns, worksps);
@@ -3735,7 +3762,8 @@ bool EdgeSwitch::handleTimer(YTimer *t) {
     do {
         if (0 == --end) {
             tlog("inflp");
-            goto end;
+            wsp = -1;
+            break;
         }
 
         col = (col + dx + columns) % columns;
@@ -3743,21 +3771,24 @@ bool EdgeSwitch::handleTimer(YTimer *t) {
         wsp = col + row * columns;
     } while (wsp >= worksps);
 
-    fManager->switchToWorkspace(wsp, false);
-
-    if (warpPointerOnEdgeSwitch) {
-        int dest_x = -fDelta * !fVert * (desktop->width() - 5);
-        int dest_y = -fDelta * fVert * (desktop->height() - 5);
-        XWarpPointer(xapp->display(), None, None, 0, 0, 0, 0,
-                     dest_x, dest_y);
-    }
+    return wsp;
+}
 
-    if (edgeContWorkspaceSwitching) {
-        return true;
+bool EdgeSwitch::handleTimer(YTimer *t) {
+    if (t == fEdgeSwitchTimer) {
+        int ws = destination();
+        if (0 <= ws) {
+            fManager->switchToWorkspace(ws, false);
+            if (warpPointerOnEdgeSwitch) {
+                int dx = -fDelta * !fVert * (desktop->width() - 5);
+                int dy = -fDelta * fVert * (desktop->height() - 5);
+                XWarpPointer(xapp->display(), None, None, 0, 0, 0, 0, dx, dy);
+            }
+            if (edgeContWorkspaceSwitching)
+                return true;
+        }
+        setPointer(YWMApp::leftPointer);
     }
-
-end:
-    setPointer(YWMApp::leftPointer);
     return false;
 }
 
diff --git a/src/wmmgr.h b/src/wmmgr.h
index 6f31cc41..8c790a3b 100644
--- a/src/wmmgr.h
+++ b/src/wmmgr.h
@@ -29,6 +29,7 @@ class EdgeSwitch: public YDndWindow, public YTimerListener {
     virtual void handleDNDEnter();
     virtual void handleDNDLeave();
     void setGeometry();
+    int destination();
 private:
     YWindowManager *fManager;
     Cursor fCursor;
@@ -122,6 +123,8 @@ class YWindowManager:
     YFrameClient *findClient(Window win);
     void manageClient(YFrameClient* client, bool mapClient = false);
     void unmanageClient(YFrameClient *client);
+    void clientDestroyed(YFrameClient* client);
+    void clientTransfered(YFrameClient* client, YFrameWindow* frame);
     void destroyedClient(Window win);
     void mapClient(Window win);
 
@@ -319,6 +322,7 @@ class YWindowManager:
     bool switchWindowVisible() const;
     SwitchWindow* getSwitchWindow();
     Window netActiveWindow() const { return fActiveWindow; }
+    int edgeWorkspace(int x, int y);
 
 private:
     struct WindowPosState {
diff --git a/src/wmoption.cc b/src/wmoption.cc
index b6cdaf78..806b4013 100644
--- a/src/wmoption.cc
+++ b/src/wmoption.cc
@@ -281,7 +281,7 @@ void WindowOptions::setWinOption(mstring n_class_instance,
             }
         }
         if (count <= least) {
-            msg(_("Unknown window option: %s"), opt);
+            tlog(_("Unknown window option: %s"), opt);
         }
         else {
             unsigned bit = options[least].flag;
diff --git a/src/wmswitch.cc b/src/wmswitch.cc
index cb88a1e6..d6c2ca8b 100644
--- a/src/wmswitch.cc
+++ b/src/wmswitch.cc
@@ -26,6 +26,8 @@ struct ZItem {
     void reset() { prio = 0; frame = nullptr; client = nullptr; }
 
     operator bool() const { return frame && client; }
+    bool operator==(YFrameWindow* f) const { return f == frame && f; }
+    bool operator==(YFrameClient* c) const { return c == client && c; }
 
     static int compare(const void* p1, const void* p2) {
         const ZItem* z1 = static_cast<const ZItem*>(p1);
@@ -158,6 +160,7 @@ class WindowItemsCtrlr : public ISwitchItems
     }
 
     void updateList() override;
+    void sort() override;
 
     void displayFocusChange() override {
         if (inrange(zTarget, 0, getCount() - 1))
@@ -193,9 +196,6 @@ class WindowItemsCtrlr : public ISwitchItems
     void accept() override {
         ZItem active = fActiveItem;
         if (active) {
-            fLastItem.reset();
-            fActiveItem.reset();
-            freeList();
             active.frame->activateWindow(true, false);
         } else {
             cancel();
@@ -219,7 +219,7 @@ class WindowItemsCtrlr : public ISwitchItems
         ZItem previous = fActiveItem;
 
         for (int i = getCount(); 0 <= --i; ) {
-            if (zList[i].frame == item || zList[i].client == tab) {
+            if (zList[i] == item || zList[i] == tab) {
                 zList.remove(i);
                 removed = true;
                 if (i <= zTarget && 0 < zTarget)
@@ -227,9 +227,9 @@ class WindowItemsCtrlr : public ISwitchItems
             }
         }
 
-        if (fLastItem.frame == item)
+        if (fLastItem == item || fLastItem == tab)
             fLastItem.reset();
-        if (fActiveItem.frame == item)
+        if (fActiveItem == item || fActiveItem == tab)
             fActiveItem.reset();
 
         setTarget(zTarget);
@@ -241,9 +241,8 @@ class WindowItemsCtrlr : public ISwitchItems
         return removed;
     }
 
-    bool createdItem(YFrameWindow* frame) override
+    bool createdItem(YFrameWindow* frame, YFrameClient* client) override
     {
-        YFrameClient* client = frame->client();
         if (notbit(client->winHints(), WinHintsSkipFocus) &&
             (client->adopted() || frame->visible()) &&
             (frame->isUrgent() || quickSwitchToAllWorkspaces ||
@@ -253,12 +252,20 @@ class WindowItemsCtrlr : public ISwitchItems
             (!frame->isHidden() || quickSwitchToHidden) &&
             (!frame->isMinimized() || quickSwitchToMinimized))
         {
-            zList += ZItem(5, zList.getCount(), frame, frame->client());
+            zList += ZItem(5, zList.getCount(), frame, client);
             return true;
         }
         return false;
     }
 
+    void transfer(YFrameClient* client, YFrameWindow* frame) override {
+        for (int i = 0; i < zList.getCount(); i++) {
+            if (zList[i].client == client) {
+                zList[i].frame = frame;
+            }
+        }
+    }
+
     YFrameWindow* current() const override {
         return fActiveItem.frame;
     }
@@ -315,28 +322,28 @@ void WindowItemsCtrlr::updateList() {
             }
 
             int prio = 0;
-            if (!frame->hasState(WinStateUrgent) && !client->urgencyHint()) {
-                prio = 1 + !quickSwitchToUrgent;
-            }
-            else if (frame == focused) {
+            if (frame == focused) {
                 if (client == fclient)
-                    prio = 2;
+                    prio = 1;
                 else
-                    prio = 3;
+                    prio = 2;
             }
-            else if (frame->avoidFocus()) {
-                prio = 5;
+            else if (quickSwitchToUrgent && frame->isUrgent()) {
+                prio = 3;
+            }
+            else if (frame->isMinimized()) {
+                if (quickSwitchToMinimized)
+                    prio = 6;
             }
             else if (frame->isHidden()) {
                 if (quickSwitchToHidden)
-                    prio = 4;
+                    prio = 7;
             }
-            else if (frame->isMinimized()) {
-                if (quickSwitchToMinimized)
-                    prio = 3;
+            else if (frame->avoidFocus()) {
+                prio = 8;
             }
             else {
-                prio = 2;
+                prio = 4;
             }
             if (prio) {
                 zList += ZItem(prio, index, frame, client);
@@ -344,9 +351,13 @@ void WindowItemsCtrlr::updateList() {
             }
         }
     }
+    sort();
+}
 
-    qsort(&*zList, size_t(index), sizeof(ZItem), ZItem::compare);
+void WindowItemsCtrlr::sort() {
+    qsort(&*zList, size_t(zList.getCount()), sizeof(ZItem), ZItem::compare);
 
+    zTarget = 0;
     if (fActiveItem) {
         int act = lookupClient(fActiveItem.client);
         if (act < 0) {
@@ -354,8 +365,7 @@ void WindowItemsCtrlr::updateList() {
         }
         else if (act) {
             fActiveItem = zList[act];
-            zList.remove(act);
-            zList.insert(0, fActiveItem);
+            zTarget = act;
         }
     }
     if (fLastItem && lookupClient(fLastItem.client) < 0)
@@ -371,6 +381,7 @@ SwitchWindow::SwitchWindow(YWindow *parent, ISwitchItems *items,
     m_hlItemFromMotion(-1),
     m_hintAreaStart(0),
     m_hintAreaStep(1),
+    fWorkspace(WorkspaceInvalid),
     switchFg(&clrQuickSwitchText),
     switchBg(&clrQuickSwitch),
     switchHl(&clrQuickSwitchActive),
@@ -393,12 +404,9 @@ SwitchWindow::SwitchWindow(YWindow *parent, ISwitchItems *items,
     setNetWindowType(_XA_NET_WM_WINDOW_TYPE_DIALOG);
 }
 
-bool SwitchWindow::close() {
-    if (visible()) {
+void SwitchWindow::close() {
+    if (visible())
         cancelPopup();
-        return true;
-    }
-    return false;
 }
 
 void SwitchWindow::cancel() {
@@ -507,7 +515,9 @@ void SwitchWindow::resize(int xiscreen, bool reposition) {
 }
 
 void SwitchWindow::repaint() {
-    GraphicsBuffer(this).paint();
+    if (visible()) {
+        GraphicsBuffer(this).paint();
+    }
 }
 
 void SwitchWindow::paint(Graphics &g, const YRect &/*r*/) {
@@ -761,26 +771,27 @@ void SwitchWindow::begin(bool zdown, unsigned mods, char* wmclass) {
     modsDown = KEY_MODMASK(mods);
     zItems->setWMClass(wmclass);
 
-    if (close())
-        return;
-
     m_oldMenuMouseTracking = menuMouseTracking;
     menuMouseTracking = true;
 
-    zItems->begin(zdown);
+    if (zItems->getCount() == 0 ||
+        (fWorkspace != manager->activeWorkspace() &&
+         !quickSwitchToAllWorkspaces)) {
+        zItems->begin(zdown);
+    } else {
+        zItems->sort();
+        zItems->moveTarget(zdown);
+    }
+    fWorkspace = manager->activeWorkspace();
+
     if (zItems->getCount()) {
-        int xiscreen = manager->getSwitchScreen();
-        resize(xiscreen, true);
-        if (popup(nullptr, nullptr, manager, xiscreen,
-                  YPopupWindow::pfNoPointerChange) && visible()) {
-            Window root, child;
-            int root_x, root_y, win_x, win_y;
-            unsigned mask = 0;
-            if (XQueryPointer(xapp->display(), handle(), &root, &child,
-                              &root_x, &root_y, &win_x, &win_y, &mask)) {
-                if (!modDown(mask))
-                    accept();
-            }
+        int screen = manager->getSwitchScreen();
+        resize(screen, true);
+        if (popup(nullptr, nullptr, manager, screen, pfNoPointerChange)
+            && visible()) {
+            unsigned mask;
+            if (xapp->queryMask(handle(), &mask) && !modDown(mask))
+                accept();
         }
     }
 }
@@ -826,12 +837,20 @@ void SwitchWindow::destroyedClient(YFrameClient* client) {
 }
 
 void SwitchWindow::createdFrame(YFrameWindow *frame) {
-    if (visible() && zItems->createdItem(frame)) {
+    createdClient(frame, frame->client());
+}
+
+void SwitchWindow::createdClient(YFrameWindow* frame, YFrameClient* client) {
+    if (zItems->createdItem(frame, client)) {
         resize(getScreen(), false);
         repaint();
     }
 }
 
+void SwitchWindow::transfer(YFrameClient* client, YFrameWindow* frame) {
+    zItems->transfer(client, frame);
+}
+
 YFrameWindow* SwitchWindow::current() {
     return zItems->current();
 }
@@ -869,7 +888,7 @@ bool SwitchWindow::handleKey(const XKeyEvent &key) {
             accept();
         }
         else if (manager->handleSwitchWorkspaceKey(key, k, vm)) {
-            zItems->updateList();
+            zItems->sort();
             if (zItems->getCount()) {
                 resize(getScreen(), true);
                 repaint();
diff --git a/src/wmswitch.h b/src/wmswitch.h
index 573a359d..8be307cb 100644
--- a/src/wmswitch.h
+++ b/src/wmswitch.h
@@ -35,7 +35,9 @@ class ISwitchItems
     // Manager notification about windows disappearing under the fingers
     virtual bool destroyedItem(YFrameWindow* frame, YFrameClient* client) {
                     return false; }
-    virtual bool createdItem(YFrameWindow* frame) { return false; }
+    virtual bool createdItem(YFrameWindow* frame, YFrameClient* client) {
+                    return false; }
+    virtual void transfer(YFrameClient* client, YFrameWindow* frame) { }
 
     virtual bool isKey(KeySym k, unsigned mod) = 0;
     virtual unsigned modifiers() = 0;
@@ -45,6 +47,7 @@ class ISwitchItems
     virtual char* getWMClass() = 0;
 
     virtual YFrameWindow* current() const { return nullptr; }
+    virtual void sort() { }
 };
 
 class SwitchWindow: public YPopupWindow {
@@ -67,6 +70,8 @@ class SwitchWindow: public YPopupWindow {
     void destroyedClient(YFrameClient* client);
     void destroyedFrame(YFrameWindow* frame);
     void createdFrame(YFrameWindow* frame);
+    void createdClient(YFrameWindow* frame, YFrameClient* client);
+    void transfer(YFrameClient* client, YFrameWindow* frame);
     YFrameWindow* current();
 
 private:
@@ -79,6 +84,7 @@ class SwitchWindow: public YPopupWindow {
     // hints for fast identification of the entry under the cursor
     int m_hintAreaStart, m_hintAreaStep;
 
+    int fWorkspace;
     ref<YImage> fGradient;
 
     YColorName switchFg;
@@ -99,7 +105,7 @@ class SwitchWindow: public YPopupWindow {
     unsigned modifiers();
 
     void cancel();
-    bool close();
+    void close();
     void accept();
     void displayFocus();
     YFrameWindow* nextWindow(bool zdown);
diff --git a/src/wmtitle.cc b/src/wmtitle.cc
index 173489f7..c7d609fc 100644
--- a/src/wmtitle.cc
+++ b/src/wmtitle.cc
@@ -342,6 +342,7 @@ void YFrameTitleBar::handleDrag(const XButtonEvent& down,
                 setPartner(isTabbingModifier(motion.state)
                             ? findPartner() : nullptr);
             }
+            getFrame()->checkEdgeSwitch(fDragX, fDragY);
         }
     }
 }
@@ -537,10 +538,8 @@ void YFrameTitleBar::paint(Graphics &g, const YRect &/*r*/) {
     int rlen = 0;
     if (1 < getFrame()->tabCount()) {
         YFrameWindow* frame = getFrame();
-        YFrameClient* client = frame->client();
-        lstr = 0 < find(frame->clients(), client) ? "... | " : nullptr;
-        rstr = find(frame->clients(), client) < frame->tabCount() - 1
-             ? " | ..." : nullptr;
+        lstr = frame->lessTabs() ? "... | " : nullptr;
+        rstr = frame->moreTabs() ? " | ..." : nullptr;
         llen = lstr && titleFont ? titleFont->textWidth(lstr) : 0;
         rlen = rstr && titleFont ? titleFont->textWidth(rstr) : 0;
         if (onRight - onLeft <= 3 * max(llen, rlen)) {
@@ -798,10 +797,8 @@ void YFrameTitleBar::renderShape(Graphics& g) {
         int rlen = 0;
         if (1 < getFrame()->tabCount()) {
             YFrameWindow* frame = getFrame();
-            YFrameClient* client = frame->client();
-            lstr = 0 < find(frame->clients(), client) ? "... | " : nullptr;
-            rstr = find(frame->clients(), client) < frame->tabCount() - 1
-                 ? " | ..." : nullptr;
+            lstr = frame->lessTabs() ? "... | " : nullptr;
+            rstr = frame->moreTabs() ? " | ..." : nullptr;
             llen = lstr && titleFont ? titleFont->textWidth(lstr) : 0;
             rlen = rstr && titleFont ? titleFont->textWidth(rstr) : 0;
             if (onRight - onLeft <= 3 * max(llen, rlen)) {
diff --git a/src/yxapp.cc b/src/yxapp.cc
index faea6945..91a464ae 100644
--- a/src/yxapp.cc
+++ b/src/yxapp.cc
@@ -1343,6 +1343,21 @@ bool YXApplication::children(Window win, Window** data, unsigned* num) const {
     return XQueryTree(display(), win, &rootw, &paren, data, num);
 }
 
+bool YXApplication::queryMask(Window w, unsigned* mask) {
+    Window root, child;
+    int rx, ry, wx, wy;
+    return XQueryPointer(display(), w, &root, &child, &rx, &ry, &wx, &wy, mask);
+}
+
+void YXApplication::queryMouse(int* x, int* y) {
+    Window root, child;
+    int wx, wy;
+    unsigned mask;
+    if (XQueryPointer(display(), desktop->handle(),
+                      &root, &child, x, y, &wx, &wy, &mask) == False)
+        *x = *y = 0;
+}
+
 void YXPoll::notifyRead() {
     owner()->handleXEvents();
 }
diff --git a/src/yxapp.h b/src/yxapp.h
index a3ff7356..3ab35bb9 100644
--- a/src/yxapp.h
+++ b/src/yxapp.h
@@ -117,6 +117,8 @@ class YXApplication: public YApplication {
     void send(XClientMessageEvent& ev, Window win, long mask = NoEventMask) const;
     Window parent(Window child) const;
     bool children(Window win, Window** data, unsigned* num) const;
+    bool queryMask(Window w, unsigned* mask);
+    void queryMouse(int* x, int* y);
 
     bool hasColormap() const { return fHasColormaps; }
     bool synchronized() const { return synchronizeX11; }