diff --git a/.clang-tidy b/.clang-tidy
index 39acd0183..8f9c80e58 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -60,6 +60,8 @@ Checks: >
   -readability-uppercase-literal-suffix
 WarningsAsErrors: ''
 CheckOptions:
+  - key: readability-implicit-bool-conversion.AllowIntegerConditions
+    value: true
   - key: readability-implicit-bool-conversion.AllowPointerConditions
     value: true
   - key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
diff --git a/.github/workflows/build-auto.yml b/.github/workflows/build-auto.yml
new file mode 100644
index 000000000..01234d340
--- /dev/null
+++ b/.github/workflows/build-auto.yml
@@ -0,0 +1,43 @@
+name: build-auto
+on:
+  push:
+    paths:
+    - '.github/workflows/build-auto.yml'
+    - 'build.sh'
+    - 'laf'
+jobs:
+  build-auto:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-latest, ubuntu-latest]
+        build_type: [RelWithDebInfo, Debug]
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: Install Dependencies
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -y \
+          libpixman-1-dev libfreetype6-dev libharfbuzz-dev zlib1g-dev \
+          libx11-dev libxcursor-dev libxi-dev libgl1-mesa-dev libfontconfig1-dev
+    - uses: aseprite/get-ninja@main
+    - uses: ilammy/msvc-dev-cmd@v1
+      if: runner.os == 'Windows'
+    - name: Building
+      shell: bash
+      run: |
+        bash build.sh --auto --norun
+    - name: Running CLI Tests
+      shell: bash
+      run: |
+        if [[ "${{ runner.os }}" == "Linux" ]] ; then
+          export XVFB=xvfb-run
+        fi
+        export ASEPRITE=$PWD/build/bin/aseprite
+        cd tests
+        $XVFB bash run-tests.sh
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5cd979271..19d7e214f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,16 +34,14 @@ jobs:
       shell: bash
       run: |
         if [[ "${{ runner.os }}" == "Windows" ]] ; then
-          choco install wget -y --no-progress
-          wget https://github.com/aseprite/skia/releases/download/m124-08a5439a6b/Skia-Windows-Release-x64.zip
-          unzip Skia-Windows-Release-x64.zip -d skia
-        elif [[ "${{ runner.os }}" == "macOS" ]] ; then
-          wget https://github.com/aseprite/skia/releases/download/m124-08a5439a6b/Skia-macOS-Release-arm64.zip
-          unzip Skia-macOS-Release-arm64.zip -d skia
+          this_dir=$(cygpath "${{ github.workspace }}")
         else
-          wget https://github.com/aseprite/skia/releases/download/m124-08a5439a6b/Skia-Linux-Release-x64.zip
-          unzip Skia-Linux-Release-x64.zip -d skia
+          this_dir="${{ github.workspace }}"
         fi
+        skia_url=$(source $this_dir/laf/misc/skia-url.sh | xargs)
+        skia_file=$(basename $skia_url)
+        curl --ssl-revoke-best-effort -L -o "$skia_file" "$skia_url"
+        unzip "$skia_file" -d skia
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2.17
       if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
diff --git a/.github/workflows/clang_tidy_post.yml b/.github/workflows/clang_tidy_post.yml
index 5701e336a..d48e36bbe 100644
--- a/.github/workflows/clang_tidy_post.yml
+++ b/.github/workflows/clang_tidy_post.yml
@@ -13,6 +13,6 @@ jobs:
   post-comments:
     runs-on: ubuntu-latest
     steps:
-    - uses: ZedThree/clang-tidy-review/post@v0.20.1
+    - uses: ZedThree/clang-tidy-review/post@v0.21.0
       with:
         token: ${{ secrets.CLANG_TIDY_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 85a86a640..1a52ebe95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,9 @@
 *.res
 .DS_Store
 .vs
+.vscode
 tests/_test*
 build
 .build
+.deps
 CMakeSettings.json
diff --git a/AUTHORS.md b/AUTHORS.md
new file mode 100644
index 000000000..23e00fea9
--- /dev/null
+++ b/AUTHORS.md
@@ -0,0 +1,98 @@
+# Credits
+
+Aseprite is being developed and maintained currently by [Igara Studio](https://igara.com/).
+The active team of developers is:
+
+* [David Capello](https://github.com/dacap)
+* [Gaspar Capello](https://github.com/Gasparoken)
+* [Martín Capello](https://github.com/martincapello)
+* [Christian Kaiser](https://github.com/ckaiser)
+* [Dante Paola](https://github.com/Liebranca)
+
+Previous team members that contributed with code/docs/scripts/graphics:
+
+* [Kacper Woźniak](https://github.com/thkwznk)
+* [Joshua Ogunyinka](https://github.com/iamOgunyinka)
+* [David Campo](https://github.com/dncampo)
+
+## Translations
+
+The translation work of Aseprite is only possible thanks to the
+contribution, help, and good will of several translators coordinated
+through our Weblate project:
+
+* [Translation Credits](strings/README.md)
+
+## Graphics
+
+Aseprite logo was created by David Capello. Graphics used as background
+of [Aseprite home page](https://www.aseprite.org),
+on [Steam Store](https://store.steampowered.com/app/431730/Aseprite/),
+and [social media channels](https://bsky.app/profile/aseprite.org),
+were created by:
+
+* [Ilija Melentijevic](https://ilkke.net/)
+
+## Themes
+
+The default Aseprite font was created by David Capello, and the
+default Aseprite theme was introduced in v0.8, originally created by:
+
+* Ilija Melentijevic
+
+A modified dark version of this theme was introduced in v1.3-beta1, created by:
+
+* [Nicolas Desilets](https://twitter.com/MapleGecko)
+
+These themes are now being maintained by Igara Studio and external
+contributors from time to time.
+
+## Palettes
+
+Aseprite includes color palettes created by:
+
+* [Richard "DawnBringer" Fhager](http://pixeljoint.com/p/23821.htm), [DB16](http://pixeljoint.com/forum/forum_posts.asp?TID=12795), [DB32](http://pixeljoint.com/forum/forum_posts.asp?TID=16247) (default Aseprite color palette)
+* [Arne Niklas Jansson](http://androidarts.com/), [16 colors](http://androidarts.com/palette/16pal.htm), [32 colors](http://wayofthepixel.net/index.php?topic=15824.msg144494)
+* [ENDESGA Studios](https://twitter.com/ENDESGA), [EDG16 and EDG32](https://forums.tigsource.com/index.php?topic=46126.msg1279124#msg1279124), and [other palettes](https://twitter.com/ENDESGA/status/865812366931353600)
+* [Hyohnoo Games](https://twitter.com/Hyohnoo), [mail24](https://twitter.com/Hyohnoo/status/797472587974639616) palette
+* [Davit Masia](https://twitter.com/DavitMasia), [matriax8c](https://twitter.com/DavitMasia/status/834862452164612096) palette
+* [Javier Guerrero](https://twitter.com/Xavier_Gd), [nyx8](https://twitter.com/Xavier_Gd/status/868519467864686594) palette
+* [Adigun A. Polack](https://twitter.com/adigunpolack), [AAP-64](http://pixeljoint.com/pixelart/119466.htm), [AAP-Splendor128](http://pixeljoint.com/pixelart/120714.htm), [SimpleJPC-16](http://pixeljoint.com/pixelart/119844.htm), and [AAP-Micro12](http://pixeljoint.com/pixelart/121151.htm) palette
+* [PineTreePizza](https://twitter.com/PineTreePizza), [Rosy-42](https://twitter.com/PineTreePizza/status/1006536191955623938) palette
+
+## Pixel-art Features
+
+Aseprite tries to replicate some pixel-art algorithms:
+
+* [Shading Ink](https://aseprite.org/docs/shading/): created as a simplification of GrafX2 shade mode, thanks to Ilija Melentijevic for introducing me to this feature in 2009
+* [RotSprite](http://forums.sonicretro.org/index.php?showtopic=8848&st=15&p=159754&#entry159754) by Xenowhirl.
+* [Pixel perfect drawing algorithm](https://deepnight.net/blog/tools/pixel-perfect-drawing/)
+  by [Sébastien Bénard](https://twitter.com/deepnightfr) and
+  [Carduus](https://twitter.com/CarduusHimself/status/420554200737935361).
+
+## Community
+
+A special thanks to @Outlander for helping us moderating our [Discord server](https://discord.gg/Yb2CeX8).
+Thanks to all the people that hung around for such a long time.
+
+## Contributors
+
+Thank you everyone who contributed to Aseprite with ideas, patches,
+code, bug reports, new features, donations, tutorials, videos,
+personal messages, chats, emails, tweets, posts, questions, libraries,
+compilers, and any other tools that made this program possible today.
+
+* Thanks to all [contributors](https://github.com/aseprite/aseprite/graphs/contributors)
+* Thanks to all developers and maintainers behind [other open source projects](docs/LICENSES.md) used by Aseprite
+* Thanks to all early PayPal donors and donors from our Pledgie Campaign (before Aseprite was commercialized)
+* Thanks to every who support our business model: this source-available / sell-binaries combo
+* Thanks to schools and [educational institutions](https://aseprite.org/educational)
+  that are using Aseprite in their classrooms <3
+* Thanks to our family and friends who always support our work
+
+It's been more years than I can remember, sorry if we missed someone,
+please drop me a line to [david@igara.com](mailto:david@igara.com) to
+fix something or say hi. We'll try to keep this updated (for past and
+future contributors).
+
+Sincerely, David.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af562f8d4..70ea11163 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,7 +243,13 @@ if(USE_SHARED_LIBPNG)
   add_definitions(${PNG_DEFINITIONS})
 else()
   set(PNG_FOUND ON)
-  set(PNG_LIBRARY png_static)
+
+  # Skia on Linux includes libpng symbols
+  if(UNIX AND NOT APPLE AND LAF_BACKEND STREQUAL "skia")
+    set(PNG_LIBRARY skia)
+  else()
+    set(PNG_LIBRARY png_static)
+  endif()
   set(PNG_LIBRARIES ${PNG_LIBRARY})
   set(PNG_INCLUDE_DIRS
     ${LIBPNG_DIR}
diff --git a/INSTALL.md b/INSTALL.md
index 45f8501e7..645d35e99 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -6,7 +6,8 @@
   * [Windows dependencies](#windows-dependencies)
   * [macOS dependencies](#macos-dependencies)
   * [Linux dependencies](#linux-dependencies)
-* [Compiling](#compiling)
+* [Automatic Building](#automatic-building)
+* [Manual Building](#manual-building)
   * [Windows details](#windows-details)
     * [MinGW](#mingw)
   * [macOS details](#macos-details)
@@ -17,11 +18,12 @@
 # Platforms
 
 You should be able to compile Aseprite successfully on the following
-platforms:
+platforms (older and newer versions might work):
 
-* Windows 11 + [Visual Studio Community 2022 + Windows 10.0 SDK (the latest version available)](https://imgur.com/a/7zs51IT) (we don't support [MinGW](#mingw))
-* macOS 13.0.1 Ventura + Xcode 14.1 + macOS 11.3 SDK (older version might work)
-* Linux Ubuntu Bionic 18.04 + clang 10.0
+* Windows 11 + [Visual Studio Community 2022 + Windows 11 SDK](https://imgur.com/a/7zs51IT)
+  * *Important*: We don't support [MinGW](#mingw)
+* macOS 15.2 Sequoia + Xcode 16.3 + macOS 15.4 SDK
+* Linux Ubuntu Focal Fossa 20.04 + clang 12
 
 # Get the source code
 
@@ -49,7 +51,7 @@ clone the repository on Windows.
 
 To compile Aseprite you will need:
 
-* The latest version of [CMake](https://cmake.org) (3.16 or greater)
+* The latest version of [CMake](https://cmake.org)
 * [Ninja](https://ninja-build.org) build system
 * And a compiled version of the `aseprite-m124` branch of
   the [Skia library](https://github.com/aseprite/skia#readme).
@@ -59,25 +61,24 @@ To compile Aseprite you will need:
 
 ## Windows dependencies
 
-* Windows 10/11 (we don't support cross-compiling)
+* Windows 11 (we don't support cross-compiling)
 * [Visual Studio Community 2022](https://visualstudio.microsoft.com/downloads/) (we don't support [MinGW](#mingw))
-* The [Desktop development with C++ item + Windows 10.0.18362.0 SDK](https://imgur.com/a/7zs51IT)
-  from the Visual Studio installer
+* The [Desktop development with C++ item + Windows 10.0.26100.0 SDK](https://imgur.com/a/7zs51IT)
+  from Visual Studio installer
 
 ## macOS dependencies
 
-On macOS you will need macOS 11.3 SDK and Xcode 13.1 (older versions
-might work).
+On macOS you will need macOS 15.4 SDK and Xcode 16.3 (older versions might work).
 
 ## Linux dependencies
 
 You will need the following dependencies on Ubuntu/Debian:
 
-    sudo apt-get install -y g++ clang libc++-dev libc++abi-dev cmake ninja-build libx11-dev libxcursor-dev libxi-dev libgl1-mesa-dev libfontconfig1-dev
+    sudo apt-get install -y g++ clang cmake ninja-build libx11-dev libxcursor-dev libxi-dev libgl1-mesa-dev libfontconfig1-dev
 
-Or use clang-10 packages (or newer) in case that clang in your distribution is older than clang 10.0:
+Or use clang-12 packages (or newer) in case that clang in your distribution is older than clang 12.0:
 
-    sudo apt-get install -y clang-10 libc++-10-dev libc++abi-10-dev
+    sudo apt-get install -y clang-12
 
 On Fedora:
 
@@ -85,13 +86,24 @@ On Fedora:
 
 On Arch:
 
-    sudo pacman -S gcc clang libc++ cmake ninja libx11 libxcursor mesa-libgl fontconfig libwebp
+    sudo pacman -S gcc clang cmake ninja libx11 libxcursor mesa-libgl fontconfig libwebp
 
 On SUSE:
 
-    sudo zypper install gcc-c++ clang libc++-devel libc++abi-devel cmake ninja libX11-devel libXcursor-devel libXi-devel Mesa-libGL-devel fontconfig-devel
+    sudo zypper install gcc-c++ clang cmake ninja libX11-devel libXcursor-devel libXi-devel Mesa-libGL-devel fontconfig-devel
 
-# Compiling
+# Automatic Building
+
+We offer a new [build script](build.sh) that automates and help you to
+compile Aseprite following instructions on screen. This will be the
+preferred method for new users and developers to compile Aseprite.
+
+After you get [get Aseprite code](#get-the-source-code) and install
+[its dependencies](#dependencies), you can run [build.cmd](build.cmd)
+file on Windows double-clicking it, or [build.sh](build.sh) on macOS or
+Linux running it from the terminal from the same Aseprite folder.
+
+# Manual Building
 
 1. [Get Aseprite code](#get-the-source-code), put it in a folder like
    `C:\aseprite`, and create a `build` directory inside to leave all
@@ -223,7 +235,9 @@ If you have a Retina display, check the following issue:
 
 ## Linux details
 
-You need to use clang and libc++ to compile Aseprite:
+You can compile Aseprite with gcc or clang. In case that you are using
+the [pre-compiled Skia version](https://github.com/aseprite/skia/releases/),
+you must use libstdc++ to compile Aseprite:
 
     cd aseprite
     mkdir build
@@ -232,8 +246,8 @@ You need to use clang and libc++ to compile Aseprite:
     export CXX=clang++
     cmake \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-      -DCMAKE_CXX_FLAGS:STRING=-stdlib=libc++ \
-      -DCMAKE_EXE_LINKER_FLAGS:STRING=-stdlib=libc++ \
+      -DCMAKE_CXX_FLAGS:STRING=-stdlib=libstdc++ \
+      -DCMAKE_EXE_LINKER_FLAGS:STRING=-stdlib=libstdc++ \
       -DLAF_BACKEND=skia \
       -DSKIA_DIR=$HOME/deps/skia \
       -DSKIA_LIBRARY_DIR=$HOME/deps/skia/out/Release-x64 \
@@ -245,13 +259,6 @@ You need to use clang and libc++ to compile Aseprite:
 In this case, `$HOME/deps/skia` is the directory where Skia was
 compiled or uncompressed.
 
-### GCC compiler
-
-In case that you are using the pre-compiled Skia version, you must use
-the clang compiler and libc++ to compile Aseprite. Only if you compile
-Skia with GCC, you will be able to compile Aseprite with GCC, and this
-is not recommended as you will have a performance penalty doing so.
-
 # Using shared third party libraries
 
 If you don't want to use the embedded code of third party libraries
diff --git a/README.md b/README.md
index 7a54e1bab..724697443 100644
--- a/README.md
+++ b/README.md
@@ -48,45 +48,14 @@ You can ask for help in:
   [YouTube](https://www.youtube.com/user/aseprite),
   [Instagram](https://www.instagram.com/aseprite/).
 
-## Authors
-
-Aseprite is being developed by [Igara Studio](https://igara.com/):
-
-* [David Capello](https://davidcapello.com/)
-* [Gaspar Capello](https://github.com/Gasparoken)
-* [Martín Capello](https://github.com/martincapello)
-
 ## Credits
 
-The default Aseprite theme was introduced in v0.8, created by:
+Aseprite was originally created by [David Capello](https://davidcapello.com/)
+and is now being developed and maintained by [Igara Studio](https://igara.com/)
+and contributors.
 
-* [Ilija Melentijevic](https://ilkke.net/)
-
-A modified dark version of this theme introduced in v1.3-beta1 was created by:
-
-* [Nicolas Desilets](https://twitter.com/MapleGecko)
-* [David Capello](https://twitter.com/davidcapello)
-
-Aseprite includes color palettes created by:
-
-* [Richard "DawnBringer" Fhager](http://pixeljoint.com/p/23821.htm), [16 colors](http://pixeljoint.com/forum/forum_posts.asp?TID=12795),  [32 colors](http://pixeljoint.com/forum/forum_posts.asp?TID=16247).
-* [Arne Niklas Jansson](http://androidarts.com/), [16 colors](http://androidarts.com/palette/16pal.htm), [32 colors](http://wayofthepixel.net/index.php?topic=15824.msg144494).
-* [ENDESGA Studios](https://twitter.com/ENDESGA), [EDG16 and EDG32](https://forums.tigsource.com/index.php?topic=46126.msg1279124#msg1279124), and [other palettes](https://twitter.com/ENDESGA/status/865812366931353600).
-* [Hyohnoo Games](https://twitter.com/Hyohnoo), [mail24](https://twitter.com/Hyohnoo/status/797472587974639616) palette.
-* [Davit Masia](https://twitter.com/DavitMasia), [matriax8c](https://twitter.com/DavitMasia/status/834862452164612096) palette.
-* [Javier Guerrero](https://twitter.com/Xavier_Gd), [nyx8](https://twitter.com/Xavier_Gd/status/868519467864686594) palette.
-* [Adigun A. Polack](https://twitter.com/adigunpolack), [AAP-64](http://pixeljoint.com/pixelart/119466.htm), [AAP-Splendor128](http://pixeljoint.com/pixelart/120714.htm), [SimpleJPC-16](http://pixeljoint.com/pixelart/119844.htm), and [AAP-Micro12](http://pixeljoint.com/pixelart/121151.htm) palette.
-* [PineTreePizza](https://twitter.com/PineTreePizza), [Rosy-42](https://twitter.com/PineTreePizza/status/1006536191955623938) palette.
-
-It tries to replicate some pixel-art algorithms:
-
-* [RotSprite](http://forums.sonicretro.org/index.php?showtopic=8848&st=15&p=159754&#entry159754) by Xenowhirl.
-* [Pixel perfect drawing algorithm](https://deepnight.net/blog/tools/pixel-perfect-drawing/) by [Sébastien Bénard](https://twitter.com/deepnightfr) and [Carduus](https://twitter.com/CarduusHimself/status/420554200737935361).
-
-Thanks to [third-party open source projects](docs/LICENSES.md), to
-[contributors](https://www.aseprite.org/contributors/), and all the
-people who have contributed ideas, patches, bugs report, feature
-requests, donations, and help us to develop Aseprite.
+Check the [AUTHORS](AUTHORS.md) file for details about the active team
+of developers working on Aseprite.
 
 ## License
 
diff --git a/build.sh b/build.sh
index ff5882c8d..5aa5dc469 100755
--- a/build.sh
+++ b/build.sh
@@ -56,31 +56,6 @@ if [ "$1" == "--norun" ] ; then
     norun=1
 fi
 
-# Platform.
-if [[ "$(uname)" =~ "MINGW32" ]] || [[ "$(uname)" =~ "MINGW64" ]] || [[ "$(uname)" =~ "MSYS_NT-10.0" ]] ; then
-    is_win=1
-    cpu=x64
-
-    if ! cl.exe >/dev/null 2>/dev/null ; then
-        echo ""
-        echo "MSVC compiler (cl.exe) not found in PATH"
-        echo ""
-        echo "  PATH=$PATH"
-        echo ""
-        exit 1
-    fi
-elif [[ "$(uname)" == "Linux" ]] ; then
-    is_linux=1
-    cpu=x64
-elif [[ "$(uname)" =~ "Darwin" ]] ; then
-    is_macos=1
-    if [[ $(uname -m) == "arm64" ]]; then
-        cpu=arm64
-    else
-        cpu=x64
-    fi
-fi
-
 # Check utilities.
 if ! cmake --version >/dev/null ; then
     echo ""
@@ -137,6 +112,23 @@ if [ $run_submodule_update ] ; then
     echo "Done"
 fi
 
+# Platform.
+if ! source "$pwd/laf/misc/platform.sh" ; then
+    exit $?
+fi
+
+if [ $is_win ] ; then
+    # Check MSVC compiler.
+    if ! cl.exe >/dev/null 2>/dev/null ; then
+        echo ""
+        echo "MSVC compiler (cl.exe) not found in PATH"
+        echo ""
+        echo "  PATH=$PATH"
+        echo ""
+        exit 1
+    fi
+fi
+
 # Create the directory to store the configuration.
 if [ ! -d "$pwd/.build" ] ; then
     mkdir "$pwd/.build"
@@ -150,25 +142,25 @@ if [ ! -f "$pwd/.build/userkind" ] ; then
         echo "user" > $pwd/.build/userkind
     else
         echo ""
-        echo "Select what kind of user you are (press U or D keys):"
+        echo "Select what kind of user you are (press U or D key and then Enter):"
         echo ""
         echo "  [U]ser: give a try to Aseprite"
         echo "  [D]eveloper: develop/modify Aseprite"
         echo ""
-        read -sN 1 -p "[U/D]? "
-        echo ""
-        if [[ "$REPLY" == "d" || "$REPLY" == "D" ]] ; then
+        read -p "[U/D]? "
+        REPLY=$(echo $REPLY | tr '[:upper:]' '[:lower:]')
+        if [[ "$REPLY" == "d" || "$REPLY" == "dev" || "$REPLY" == "developer" ]] ; then
             echo "developer" > $pwd/.build/userkind
-        elif [[ "$REPLY" == "u" || "$REPLY" == "U" ]] ; then
+        elif [[ "$REPLY" == "u" || "$REPLY" == "user" ]] ; then
             echo "user" > $pwd/.build/userkind
         else
-            echo "Use U or D keys to select kind of user/build process"
+            echo "Use U or D keys (and press Enter) to select kind of user/build process"
             exit 1
         fi
     fi
 fi
 
-userkind=$(echo -n $(cat $pwd/.build/userkind))
+userkind=$(cat $pwd/.build/userkind)
 if [ "$userkind" == "developer" ] ; then
     echo "======================= BUILDING FOR DEVELOPER ======================="
 else
@@ -229,7 +221,7 @@ if [ ! -f "$pwd/.build/builds_dir" ] ; then
     echo "$builds_dir" > "$pwd/.build/builds_dir"
 fi
 # Overwrite $builds_dir variable from the config content.
-builds_dir="$(echo -n $(cat $pwd/.build/builds_dir))"
+builds_dir="$(cat $pwd/.build/builds_dir)"
 
 # List all builds.
 builds_list="$(mktemp)"
@@ -265,7 +257,8 @@ else
     # New build
     if [[ "$build_n" == "n" || "$build_n" == "N" ]] ; then
         read -p "Select build type [RELEASE/debug]? "
-        if [[ "${REPLY,,}" == "debug" ]] ; then
+        REPLY=$(echo $REPLY | tr '[:upper:]' '[:lower:]')
+        if [[ "${REPLY}" == "debug" ]] ; then
             build_type=Debug
             new_build_name=aseprite-debug
         else
@@ -348,10 +341,7 @@ else
     elif git --git-dir="$source_dir/.git" branch --contains "$remote/main" | grep -q "^\* $branch_name\$" ; then
         base_branch_name=main
     else
-        echo ""
-        echo "Error: Branch $branch_name looks like doesn't belong to main or beta"
-        echo ""
-        exit 1
+        base_branch_name=$branch_name
     fi
 fi
 
@@ -366,15 +356,9 @@ else
 fi
 
 # Required Skia for the base branch.
-if [ "$base_branch_name" == "beta" ] ; then
-    skia_tag=m124-08a5439a6b
-    file_skia_dir=beta_skia_dir
-    possible_skia_dir_name=skia-m124
-else
-    skia_tag=m102-861e4743af
-    file_skia_dir=main_skia_dir
-    possible_skia_dir_name=skia
-fi
+skia_tag=$(cat "$pwd/laf/misc/skia-tag.txt")
+possible_skia_dir_name=skia-$(echo $skia_tag | cut -d "-" -f 1)
+file_skia_dir="$base_branch_name"_skia_dir
 
 # Check Skia dependency.
 if [ ! -f "$pwd/.build/$file_skia_dir" ] ; then
@@ -385,23 +369,33 @@ if [ ! -f "$pwd/.build/$file_skia_dir" ] ; then
         skia_dir="$HOME/deps/$possible_skia_dir_name"
     fi
 
+    # Set default location if not found
     if [ ! -d "$skia_dir" ] ; then
-        echo ""
-        echo "Skia directory wasn't found."
-        echo ""
-
-        echo "Select Skia directory to create [$skia_dir]? "
-        if [ ! $auto ] ; then
-            read skia_dir_read
-            if [ "$skia_dir_read" != "" ] ; then
-                skia_dir="$skia_dir_read"
-            fi
+        # Use .deps directory to download Skia for users (which is a
+        # simple setup). In case of developers we'd prefer the shared
+        # directory by default.
+        if [ "$userkind" == "user" ] ; then
+            skia_dir="$pwd/.deps/$possible_skia_dir_name"
+        fi
+
+        if [ ! -d "$skia_dir" ] ; then
+            echo ""
+            echo "Skia directory wasn't found."
+            echo ""
+
+            echo "Select Skia directory to create [$skia_dir]? "
+            if [ ! $auto ] ; then
+                read skia_dir_read
+                if [ "$skia_dir_read" != "" ] ; then
+                    skia_dir="$skia_dir_read"
+                fi
+            fi
+            mkdir -p $skia_dir || exit 1
         fi
-        mkdir -p $skia_dir || exit 1
     fi
     echo $skia_dir > "$pwd/.build/$file_skia_dir"
 fi
-skia_dir=$(echo -n $(cat $pwd/.build/$file_skia_dir))
+skia_dir=$(cat $pwd/.build/$file_skia_dir)
 if [ ! -d "$skia_dir" ] ; then
     mkdir "$skia_dir"
 fi
@@ -421,27 +415,30 @@ if [ ! -d "$skia_library_dir" ] ; then
     echo "Skia library wasn't found."
     echo ""
     if [ ! $auto ] ; then
-        read -sN 1 -p "Download pre-compiled Skia automatically [Y/n]? "
+        read -p "Download pre-compiled Skia automatically [Y/n]? "
+        # Convert the Enter key as the default option: an empty string
+        REPLY=$(echo $REPLY | tr '[:upper:]' '[:lower:]')
     fi
-    if [[ $auto || "$REPLY" == "" || "$REPLY" == "y" || "$REPLY" == "Y" ]] ; then
+    if [[ $auto || "$REPLY" == "" || "$REPLY" == "y" || "$REPLY" == "yes" ]] ; then
         if [[ $is_win && "$build_type" == "Debug" ]] ; then
             skia_build=Debug
         else
             skia_build=Release
         fi
-
-        if [ $is_win ] ; then
-            skia_file=Skia-Windows-$skia_build-$cpu.zip
-        elif [ $is_macos ] ; then
-            skia_file=Skia-macOS-$skia_build-$cpu.zip
-        else
-            skia_file=Skia-Linux-$skia_build-$cpu-libstdc++.zip
-        fi
-        skia_url=https://github.com/aseprite/skia/releases/download/$skia_tag/$skia_file
+        skia_url=$(bash laf/misc/skia-url.sh $skia_build)
+        skia_file=$(basename $skia_url)
         if [ ! -f "$skia_dir/$skia_file" ] ; then
-            curl -L -o "$skia_dir/$skia_file" "$skia_url"
+            if ! command -v curl >/dev/null 2>&1 ; then
+                echo "Error: 'curl' command line tool is not available in PATH"
+                exit 1
+            fi
+            curl --ssl-revoke-best-effort -L -o "$skia_dir/$skia_file" "$skia_url"
         fi
         if [ ! -d "$skia_library_dir" ] ; then
+            if ! command -v unzip >/dev/null 2>&1 ; then
+                echo "Error: 'unzip' command line tool is not available in PATH"
+                exit 1
+            fi
             unzip -n -d "$skia_dir" "$skia_dir/$skia_file"
         fi
     else
@@ -468,7 +465,7 @@ if [ ! -f "$active_build_dir/ninja.build" ] ; then
     echo "This will take some minutes."
     echo ""
     if [ ! $auto ] ; then
-        read -sN 1 -p "Press any key to continue. "
+        read -p "Press Enter to continue."
     fi
 
     if [ $is_macos ] ; then
diff --git a/data/extensions/aseprite-theme/dark/sheet.png b/data/extensions/aseprite-theme/dark/sheet.png
index b35d4a8b5..5496d75ed 100644
Binary files a/data/extensions/aseprite-theme/dark/sheet.png and b/data/extensions/aseprite-theme/dark/sheet.png differ
diff --git a/data/extensions/aseprite-theme/dark/theme.xml b/data/extensions/aseprite-theme/dark/theme.xml
index 76bf663fc..ba0c797a6 100644
--- a/data/extensions/aseprite-theme/dark/theme.xml
+++ b/data/extensions/aseprite-theme/dark/theme.xml
@@ -216,7 +216,7 @@
         <part id="tab_normal" x="2" y="112" w1="4" w2="5" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_active" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_bottom_active" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
-        <part id="tab_bottom_normal" x="2" y="124" w="12" h="5" />
+        <part id="tab_bottom_normal" x="2" y="124" w1="4" w2="5" w3="3" h1="2" h2="1" h3="2" />
         <part id="tab_filler" x="0" y="112" w="2" h="12" />
         <part id="tab_modified_icon_normal" x="32" y="112" w="5" h="5" />
         <part id="tab_modified_icon_active" x="32" y="117" w="5" h="5" />
@@ -374,6 +374,7 @@
         <part id="icon_close" x="152" y="256" w="7" h="7" />
         <part id="icon_search" x="160" y="256" w="8" h="8" />
         <part id="icon_user_data" x="168" y="256" w="8" h="8" />
+        <part id="icon_layout" x="176" y="256" w="5" h="6" />
         <part id="icon_pos" x="144" y="264" w="8" h="8" />
         <part id="icon_size" x="152" y="264" w="8" h="8" />
         <part id="icon_selsize" x="160" y="264" w="8" h="8" />
@@ -485,25 +486,25 @@
             <icon part="window_close_icon" color="button_hot_text" state="mouse" />
             <icon part="window_close_icon" color="button_selected_text" state="selected" />
         </style>
-        <style id="window_center_button" extends="window_button" margin-top="3" margin-right="2">
+        <style id="window_center_button" extends="window_button" margin-top="3" margin-right="1">
             <newlayer />
             <icon part="window_center_icon" color="button_normal_text" />
             <icon part="window_center_icon" color="button_hot_text" state="mouse" />
             <icon part="window_center_icon" color="button_selected_text" state="selected" />
         </style>
-        <style id="window_play_button" extends="window_button" margin-top="3" margin-right="2">
+        <style id="window_play_button" extends="window_button" margin-top="3" margin-right="1">
             <newlayer />
             <icon part="window_play_icon" color="button_normal_text" />
             <icon part="window_play_icon" color="button_hot_text" state="mouse" />
             <icon part="window_play_icon" color="button_selected_text" state="selected" />
         </style>
-        <style id="window_stop_button" extends="window_button" margin-top="3" margin-right="2">
+        <style id="window_stop_button" extends="window_button" margin-top="3" margin-right="1">
             <newlayer />
             <icon part="window_stop_icon" color="button_normal_text" />
             <icon part="window_stop_icon" color="button_hot_text" state="mouse" />
             <icon part="window_stop_icon" color="button_selected_text" state="selected" />
         </style>
-        <style id="window_help_button" extends="window_button" margin-top="3" margin-right="2">
+        <style id="window_help_button" extends="window_button" margin-top="3" margin-right="1">
             <newlayer />
             <icon part="window_help_icon" color="button_normal_text" />
             <icon part="window_help_icon" color="button_hot_text" state="mouse" />
@@ -550,10 +551,13 @@
             <text color="disabled" align="left" state="disabled" />
         </style>
         <style id="mini_label" extends="label" font="mini" />
+        <style id="warning_label" extends="label">
+            <icon part="warning_box" align="right" />
+        </style>
         <style id="list_header_label" padding="2">
             <text color="text" align="left" x="2" />
         </style>
-        <style id="link">
+        <style id="link" padding="1">
             <text color="link_text" align="left" />
             <text color="link_hover" align="left" state="mouse" />
         </style>
@@ -706,10 +710,11 @@
         <style id="workspace_splitter">
             <background color="workspace" />
         </style>
-        <style id="horizontal_separator" border-left="2" border-top="4" border-right="2" border-bottom="0">
+        <style id="horizontal_separator" border="2">
             <background color="window_face" />
             <background-border part="separator_horz" align="middle" />
             <text color="separator_label" x="4" align="left middle" />
+            <text color="disabled" x="4" align="left middle" state="disabled"/>
         </style>
         <style id="menu_separator" extends="horizontal_separator" />
         <style id="separator_in_view" extends="horizontal_separator">
diff --git a/data/extensions/aseprite-theme/sheet.png b/data/extensions/aseprite-theme/sheet.png
index b8a13a6d6..ac3a332f3 100644
Binary files a/data/extensions/aseprite-theme/sheet.png and b/data/extensions/aseprite-theme/sheet.png differ
diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 3763d0279..ba48be8b6 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -212,7 +212,7 @@
         <part id="tab_normal" x="2" y="112" w1="4" w2="5" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_active" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_bottom_active" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
-        <part id="tab_bottom_normal" x="2" y="124" w="12" h="5" />
+        <part id="tab_bottom_normal" x="2" y="124" w1="4" w2="5" w3="3" h1="2" h2="1" h3="2" />
         <part id="tab_filler" x="0" y="112" w="2" h="12" />
         <part id="tab_modified_icon_normal" x="32" y="112" w="5" h="5" />
         <part id="tab_modified_icon_active" x="32" y="117" w="5" h="5" />
@@ -370,6 +370,7 @@
         <part id="icon_close" x="152" y="256" w="7" h="7" />
         <part id="icon_search" x="160" y="256" w="8" h="8" />
         <part id="icon_user_data" x="168" y="256" w="8" h="8" />
+        <part id="icon_layout" x="176" y="256" w="5" h="6" />
         <part id="icon_pos" x="144" y="264" w="8" h="8" />
         <part id="icon_size" x="152" y="264" w="8" h="8" />
         <part id="icon_selsize" x="160" y="264" w="8" h="8" />
@@ -481,25 +482,25 @@
             <icon part="window_close_icon" color="button_hot_text" state="mouse" />
             <icon part="window_close_icon" color="button_selected_text" state="selected" />
         </style>
-        <style id="window_center_button" extends="window_button" margin-top="3" margin-right="2">
+        <style id="window_center_button" extends="window_button" margin-top="3" margin-right="1">
             <newlayer />
             <icon part="window_center_icon" color="button_normal_text" />
             <icon part="window_center_icon" color="button_hot_text" state="mouse" />
             <icon part="window_center_icon" color="button_selected_text" state="selected" />
         </style>
-        <style id="window_play_button" extends="window_button" margin-top="3" margin-right="2">
+        <style id="window_play_button" extends="window_button" margin-top="3" margin-right="1">
             <newlayer />
             <icon part="window_play_icon" color="button_normal_text" />
             <icon part="window_play_icon" color="button_hot_text" state="mouse" />
             <icon part="window_play_icon" color="button_selected_text" state="selected" />
         </style>
-        <style id="window_stop_button" extends="window_button" margin-top="3" margin-right="2">
+        <style id="window_stop_button" extends="window_button" margin-top="3" margin-right="1">
             <newlayer />
             <icon part="window_stop_icon" color="button_normal_text" />
             <icon part="window_stop_icon" color="button_hot_text" state="mouse" />
             <icon part="window_stop_icon" color="button_selected_text" state="selected" />
         </style>
-        <style id="window_help_button" extends="window_button" margin-top="3" margin-right="2">
+        <style id="window_help_button" extends="window_button" margin-top="3" margin-right="1">
             <newlayer />
             <icon part="window_help_icon" color="button_normal_text" />
             <icon part="window_help_icon" color="button_hot_text" state="mouse" />
@@ -543,10 +544,13 @@
             <text color="disabled" align="left" state="disabled" />
         </style>
         <style id="mini_label" extends="label" font="mini" />
+        <style id="warning_label" extends="label">
+            <icon part="warning_box" align="right" />
+        </style>
         <style id="list_header_label" padding="2">
             <text color="text" align="left" x="2" />
         </style>
-        <style id="link">
+        <style id="link" padding="1">
             <text color="link_text" align="left" />
             <text color="link_hover" align="left" state="mouse" />
         </style>
@@ -699,10 +703,11 @@
         <style id="workspace_splitter">
             <background color="workspace" />
         </style>
-        <style id="horizontal_separator" border-left="2" border-top="4" border-right="2" border-bottom="0">
+        <style id="horizontal_separator" border="2">
             <background color="window_face" />
             <background-border part="separator_horz" align="middle" />
             <text color="separator_label" x="4" align="left middle" />
+            <text color="disabled" x="4" align="left middle" state="disabled"/>
         </style>
         <style id="menu_separator" extends="horizontal_separator" />
         <style id="separator_in_view" extends="horizontal_separator">
diff --git a/data/fonts/aseprite_font.png b/data/fonts/aseprite_font.png
index 3041642b4..dc2c8ecf8 100644
Binary files a/data/fonts/aseprite_font.png and b/data/fonts/aseprite_font.png differ
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index d7493c621..7ce9b8353 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -32,14 +32,16 @@
 
   <font name="Aseprite"
         type="spritesheet"
+        descent="2"
         file="aseprite_font.png">
-    <fallback font="Unicode" size="8" />
+    <fallback font="Unicode" size="14" />
   </font>
 
   <font name="Aseprite Mini"
         type="spritesheet"
+        descent="1"
         file="aseprite_mini.png">
-    <fallback font="Unicode" size="6" />
+    <fallback font="Unicode" size="10" />
   </font>
 
 </fonts>
diff --git a/data/gui.xml b/data/gui.xml
index 90cd94b7f..2c0ca8e32 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -175,6 +175,7 @@
         <param name="popup" value="background" />
       </key>
       <key command="ShowExtras" shortcut="Ctrl+H" />
+      <key command="ToggleWorkspaceLayout" shortcut="Shift+W" />
       <!-- Tabs -->
       <key command="GotoNextTab" shortcut="Ctrl+Tab" />
       <key command="GotoPreviousTab" shortcut="Ctrl+Shift+Tab" />
@@ -1002,6 +1003,7 @@
       </menu>
       <menu text="@.view" id="view_menu">
         <item command="DuplicateView" text="@.view_duplicate_view" group="view_new" />
+        <item command="ToggleWorkspaceLayout" text="@.view_workspace_layout" />
         <separator />
         <item command="ShowExtras" text="@.view_show_extras" />
         <menu text="@.view_show" group="view_extras">
diff --git a/data/pref.xml b/data/pref.xml
index ec63ffaee..43f5abdfd 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Aseprite -->
-<!-- Copyright (C) 2018-2024  Igara Studio S.A. -->
+<!-- Copyright (C) 2018-2025  Igara Studio S.A. -->
 <!-- Copyright (C) 2014-2018  David Capello -->
 <preferences>
 
@@ -167,6 +167,7 @@
       <option id="keep_closed_sprite_on_memory_for" type="double" default="15.0" />
       <option id="show_full_path" type="bool" default="true" />
       <option id="edit_full_path" type="bool" default="false" />
+      <option id="workspace_layout" type="std::string" />
       <option id="timeline_position" type="TimelinePosition" default="TimelinePosition::BOTTOM" />
       <option id="timeline_layer_panel_width" type="int" default="100" />
       <option id="show_menu_bar" type="bool" default="true" />
@@ -255,6 +256,7 @@
       <option id="one_finger_as_mouse_movement" type="bool" default="true" />
       <option id="load_wintab_driver" type="bool" default="false" />
       <option id="flash_layer" type="bool" default="false" />
+      <option id="use_selection_tool_loop" type="bool" default="false" />
       <option id="nonactive_layers_opacity" type="int" default="255" />
       <option id="nonactive_layers_opacity_preview" type="int" default="255" />
     </section>
@@ -356,6 +358,7 @@
     <section id="file_selector">
       <option id="current_folder" type="std::string" default="&quot;&lt;empty&gt;&quot;" />
       <option id="zoom" type="double" default="1.0" />
+      <option id="show_hidden" type="bool" default="false" />
     </section>
     <section id="text_tool">
       <option id="font_face" type="std::string" />
@@ -551,6 +554,7 @@
       <option id="enabled" type="bool" default="false" />
       <option id="overlay_enabled" type="bool" default="false" />
       <option id="overlay_size" type="int" default="5" />
+      <option id="scale_up_to_fit" type="bool" default="false" />
     </section>
     <section id="onionskin">
       <option id="active" type="bool" default="false" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index c66eda393..a6a383a8d 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -1,5 +1,5 @@
 # Aseprite
-# Copyright (C) 2018-2024  Igara Studio S.A.
+# Copyright (C) 2018-2025  Igara Studio S.A.
 # Copyright (C) 2016-2018  David Capello
 #
 # This work is licensed under the Creative Commons Attribution 4.0
@@ -43,7 +43,6 @@ locked_layers = There are locked layers
 no_active_layers = There is no active layer
 layer_x_is_hidden = Layer "{}" is hidden
 unmodifiable_reference_layer = Layer "{}" is reference, cannot be modified
-filter_no_unlocked_layer = No unlocked layers to apply filter
 cannot_move_bg_layer = The background layer cannot be moved
 nothing_to_move = Nothing to move
 recovery_task_using_sprite = Sprite is used by a backup/data recovery task
@@ -489,6 +488,7 @@ TilesetDuplicate = Duplicate Tileset
 Undo = Undo
 UndoHistory = Undo History
 UnlinkCel = Unlink Cel
+ToggleWorkspaceLayout = Toggle Workspace Layout
 Zoom = Zoom
 Zoom_In = Zoom In
 Zoom_Out = Zoom Out
@@ -622,6 +622,14 @@ current_layer = Current Layer
 first_ref_layer = First Reference Layer
 pick = Pick:
 sample = Sample:
+position_label = P:
+rotation_label = R:
+position_x = X Position
+position_y = Y Position
+size_width = Width
+size_height = Height
+rotation_angle = Angle
+rotation_skew = Skew
 
 [convolution_matrix]
 reload_stock = &Reload Stock
@@ -766,6 +774,7 @@ pinned_folders = Pinned Folders
 recent_folders = Recent Folders
 all_formats = All formats
 all_files = All files
+show_hidden = Show hidden
 
 [filters]
 selected_cels = Selected
@@ -786,6 +795,11 @@ load = Load External Font
 select_truetype_fonts = Select a Font File
 empty_fonts = No system fonts were found
 
+[font_style]
+antialias = Antialias
+hinting = Hinting
+ligatures = Ligatures
+
 [frame_combo]
 all_frames = All frames
 selected_frames = Selected frames
@@ -813,6 +827,12 @@ opacity = Opacity:
 tolerance = Tolerance:
 show_more = Show more...
 
+[general_text]
+copy = &Copy
+cut = Cu&t
+paste = &Paste
+select_all = Select &All
+
 [gif_options]
 title = GIF Options
 general_options = General Options:
@@ -981,6 +1001,7 @@ visible_layers = Visible layers
 [layer_properties]
 title = Layer Properties
 name = Name:
+uuid = UUID:
 mode = Mode:
 opacity = Opacity:
 tileset_tooltip = Tileset
@@ -1155,6 +1176,7 @@ select_load_from_file = &Load from MSK file
 select_save_to_file = &Save to MSK file
 view = &View
 view_duplicate_view = Duplicate &View
+view_workspace_layout = Workspace &Layout
 view_show_extras = &Extras
 view_show = &Show
 view_show_layer_edges = &Layer Edges
@@ -1196,6 +1218,14 @@ help_twitter = Twitter
 help_enter_license = Enter &License
 help_about = &About
 
+[main_window]
+layout = Workspace Layout
+default_layout = Default
+mirrored_default_layout = Mirrored Default
+timeline = Timeline
+user_layouts = User Layouts
+new_layout = New Layout...
+
 [mask_by_color]
 title = Select Color
 label_color = Color:
@@ -1224,6 +1254,20 @@ name = Name:
 tileset = Tileset:
 default_new_layer_name = New Layer
 
+[new_layout]
+title = New Workspace Layout
+name = Name:
+deleting_layout = Deleting Layout
+deleting_layout_confirmation = Are you sure you want to delete the '{}' layout?
+restoring_layout = Restoring Layout
+restoring_layout_confirmation = Are you sure you want to restore the '{}' layout?
+
+[dock]
+left = Dock Left
+right = Dock Right
+top = Dock Top
+bottom = Dock Bottom
+
 [news_listbox]
 more = More...
 problem_loading = Problems loading news. Please retry.
@@ -1326,7 +1370,7 @@ theme_mode = Theme Mode:
 screen_scaling = Screen Scaling:
 ui_scaling = UI Element Scaling:
 language = Language:
-download_translations = Download Translations
+font_warning = Customize font for this language
 gpu_acceleration = GPU acceleration [DEVMODE/INTERNAL TESTING ONLY]
 gpu_acceleration_tooltip = Check this option to enable hardware acceleration
 show_menu_bar = Show Aseprite menu bar
@@ -1513,6 +1557,12 @@ alpha_range = Alpha Range:
 opacity_range = Opacity Range:
 8bit_value = 0-255
 percentage = 0%-100%
+customize_theme = Customize Theme
+font = Font:
+mini_font = Mini Font:
+preview = Preview:
+font_preview = Font Preview
+mini_font_preview = Mini Font Preview
 available_themes = Available Themes
 extension_themes = Extension Themes
 select_theme = &Select
@@ -1550,11 +1600,13 @@ set_cursor_fix = Set cursor position from stylus location
 set_cursor_fix_tooltip = Sets the mouse position to the pen location when\nyou have two pointers available (e.g. mouse and pen)\n\nUseful to zoom in/out from the pen position and to get the\ncorrect cursor location when screencasting/live streaming.
 wintab_more_info = (More Information)
 flash_selected_layer = Flash layer when it is selected
+use_selection_tool_loop = New selection tools implementation
 non_active_layer_opacity = Opacity for non-active layers:
 cel_content_format = Cel content format:
 cel_format_compressed = Compressed
 cel_format_keep = Keep format as is in file
 cel_format_raw = Raw image
+cel_format_raw_warning = This will increase .aseprite file sizes considerably
 reset_title = Reset Preferences
 reset_default = Reset configuration options available in the Preferences window
 reset_tools = Reset all tool preferences
@@ -1659,6 +1711,11 @@ n_slices_removed = {} slice(s) removed
 x_removed = Layer "{}" removed
 layers_removed = Layers removed
 
+[resource_listbox]
+loading = Loading
+pin = Pin this item
+unpin = Unpin this item
+
 [save_file]
 title = Save File
 save_as = Save As
@@ -1675,7 +1732,8 @@ title = Save Selection (.msk file)
 [script_access]
 title = Security
 script_label = The following script:
-file_label = wants to access to this file:
+file_label = wants to access this file:
+file_write_label = wants to write to this file:
 command_label = wants to execute the following command:
 websocket_label = wants to open a WebSocket connection to this URL:
 clipboard_label = wants to access the system clipboard
@@ -1689,7 +1747,7 @@ allow_load_lib_access = &Allow Load External Library
 give_full_access = Give Script Full &Access
 stop_script = &Stop Script
 
-[select_accelerator]
+[select_shortcut]
 title = Keyboard Shortcut
 key = Key:
 clear = Clear
@@ -1769,6 +1827,8 @@ change_sprite_props = Change Sprite Properties
 tilesets = Tilesets
 delete_tileset = Delete
 duplicate_tileset = Duplicate
+use_uuid_for_layers = Create UUID for layers
+use_uuid_for_layers_tooltip = By checking this an UUID (Universally Unique Identifiers)\nwill be automatically assigned to each layer\nand saved in .aseprite files
 
 [sprite_size]
 title = Sprite Size
@@ -1814,16 +1874,26 @@ pixel_scale = Pixel Scale
 with_vars = Use CSS3 Variables
 generate_html = Generate Sample HTML File
 
+[shape]
+fill = Fill
+stroke = Stroke
+stroke_width = Stroke Width
+
+[text_tool]
+font_family = Font Family
+font_size = Font Size
+bold = Bold
+italic = Italic
+more_options = More Options
+
 [timeline_conf]
 position = Position:
-left = &Left
-right = &Right
-bottom = &Bottom
 frame_header = Frame Header:
 first_frame = First Frame:
 thumbnails = Thumbnails
 thumbnail_size = Thumbnail Size:
 overlay_size = Overlay Size:
+scale_up_to_fit = Scale up to fit
 onion_skin = Onion Skin:
 merge_frames = Merge Frames
 red_blue_tint = Red/Blue Tint
@@ -1836,6 +1906,7 @@ behind_sprite = Behind sprite
 behind_sprite_toolip = Only for transparent layers.\nBackground is not included in this onion skin mode.
 in_front = In front of sprite
 in_front_toolip = For all kind of layers (background and transparent)
+set_as_defaults = Set as Defaults
 
 [tools]
 rectangular_marquee = Rectangular Marquee Tool
@@ -1874,6 +1945,7 @@ timeline_show = Show Timeline
 
 [undo_history]
 title = Undo History
+initial_state = Initial State
 
 [user_data]
 user_data = User Data:
diff --git a/data/widgets/about.xml b/data/widgets/about.xml
index d70f75db9..038986cfe 100644
--- a/data/widgets/about.xml
+++ b/data/widgets/about.xml
@@ -1,29 +1,14 @@
 <!-- Aseprite -->
-<!-- Copyright (C) 2018-2024  Igara Studio S.A. -->
+<!-- Copyright (C) 2018-2025  Igara Studio S.A. -->
 <!-- Copyright (C) 2018  David Capello -->
 <gui i18nwarnings="false">
 <window id="about" text="About Aseprite">
   <vbox>
     <label text="" id="title" />
     <label text="Animated sprite editor &amp;&amp; pixel art tool" />
-    <hbox homogeneous="true">
-      <hbox>
-        <vbox expansive="true">
-          <separator text="Developer Team" horizontal="true" />
-          <link text="David Capello" url="https://twitter.com/davidcapello" />
-          <link text="Gaspar Capello" url="https://twitter.com/Gasparoken" />
-          <link text="Martín Capello" url="https://twitter.com/martincapell0" />
-          <vbox minheight="8" />
-        </vbox>
-        <separator vertical="true" />
-      </hbox>
-      <vbox>
-        <separator text="Credits" horizontal="true" cell_hspan="2" />
-        <link text="Contributors" url="" id="credits" />
-        <link text="Translators" url="" id="i18n_credits" />
-        <link text="Open Source Projects" url="" id="licenses" />
-      </vbox>
-    </hbox>
+    <link text="Authors &amp;&amp; Credits" url="" id="credits" />
+    <link text="Translators" url="" id="i18n_credits" />
+    <link text="Open Source Projects" url="" id="licenses" />
     <separator horizontal="true" />
     <hbox>
       <label text="Copyright (C) 2001-2025" />
diff --git a/data/widgets/file_selector.xml b/data/widgets/file_selector.xml
index c1a2bc056..96d3b2341 100644
--- a/data/widgets/file_selector.xml
+++ b/data/widgets/file_selector.xml
@@ -23,6 +23,7 @@
       <combobox id="location" expansive="true" />
       <button text="" id="refresh_button" style="refresh_button"
                 tooltip="@.refresh_button_tooltip" tooltip_dir="bottom" />
+      <check id="show_hidden_check" text="@.show_hidden" />
     </box>
     <vbox id="file_view_placeholder" expansive="true" />
     <grid columns="2">
diff --git a/data/widgets/font_style.xml b/data/widgets/font_style.xml
new file mode 100644
index 000000000..92284caed
--- /dev/null
+++ b/data/widgets/font_style.xml
@@ -0,0 +1,10 @@
+<!-- Aseprite -->
+<!-- Copyright (C) 2025 by Igara Studio S.A. -->
+<gui>
+  <vbox id="font_style">
+    <check id="antialias" text="@.antialias" />
+    <check id="hinting" text="@.hinting" />
+    <separator horizontal="true" />
+    <check id="ligatures" text="@.ligatures" />
+  </vbox>
+</gui>
diff --git a/data/widgets/layer_properties.xml b/data/widgets/layer_properties.xml
index d0fe56525..6c4ef4115 100644
--- a/data/widgets/layer_properties.xml
+++ b/data/widgets/layer_properties.xml
@@ -15,6 +15,9 @@
 
       <label text="@.opacity" />
       <opacityslider id="opacity" width="128" cell_align="horizontal" cell_hspan="2" />
+
+      <label id="uuid_label" text="@.uuid" visible="false" />
+      <entry id="uuid" readonly="true" maxsize="36" cell_hspan="2" visible="false"/>
     </grid>
   </vbox>
 </window>
diff --git a/data/widgets/main_window.xml b/data/widgets/main_window.xml
deleted file mode 100644
index 9c3098dd9..000000000
--- a/data/widgets/main_window.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Aseprite -->
-<!-- Copyright (C) 2001-2017 by David Capello -->
-<gui>
-  <window id="main_window" noborders="true" desktop="true">
-    <vbox noborders="true" expansive="true">
-      <hbox noborders="true" id="menu_bar_placeholder" />
-      <hbox noborders="true" id="tabs_placeholder" />
-      <splitter id="color_bar_splitter"
-                horizontal="true" expansive="true"
-                by="pixel"
-                style="workspace_splitter">
-        <vbox noborders="true" id="color_bar_placeholder" />
-        <vbox noborders="true" expansive="true">
-          <vbox noborders="true" id="context_bar_placeholder" />
-          <hbox noborders="true" expansive="true">
-            <splitter id="timeline_splitter"
-                      vertical="true" expansive="true"
-                      by="percetage" position="100"
-                      style="workspace_splitter">
-              <hbox noborders="true" id="workspace_placeholder" expansive="true" />
-              <vbox noborders="true" id="timeline_placeholder" expansive="true" />
-            </splitter>
-            <vbox noborders="true" id="tool_bar_placeholder" />
-          </hbox>
-        </vbox>
-      </splitter>
-      <hbox noborders="true" id="status_bar_placeholder" />
-    </vbox>
-  </window>
-</gui>
diff --git a/data/widgets/new_layout.xml b/data/widgets/new_layout.xml
new file mode 100644
index 000000000..d876f0a0a
--- /dev/null
+++ b/data/widgets/new_layout.xml
@@ -0,0 +1,19 @@
+<!-- Aseprite -->
+<!-- Copyright (C) 2025 by Igara Studio S.A. -->
+<gui>
+<window id="new_layout" text="@.title">
+  <vbox>
+    <hbox>
+      <label text="@.name" />
+      <entry maxsize="128" id="name" magnet="true" expansive="true" />
+    </hbox>
+
+    <separator horizontal="true" />
+
+    <hbox homogeneous="true" cell_align="right">
+      <button text="@general.ok" closewindow="true" id="ok" disabled="true" minwidth="60" magnet="true" />
+      <button text="@general.cancel" closewindow="true" />
+    </hbox>
+  </vbox>
+</window>
+</gui>
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index bc94b7c93..d9cbb1011 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -1,5 +1,6 @@
+
 <!-- Aseprite -->
-<!-- Copyright (C) 2018-2024  Igara Studio S.A. -->
+<!-- Copyright (C) 2018-2025  Igara Studio S.A. -->
 <!-- Copyright (C) 2001-2018  David Capello -->
 <gui>
   <window id="options" text="@.title" help="preferences">
@@ -34,7 +35,7 @@
         <!-- General -->
         <vbox id="section_general">
           <separator text="@.section_general" horizontal="true" />
-          <grid columns="3">
+          <grid columns="2">
             <label text="@.ui_windows" />
             <hbox>
               <buttonset columns="2" id="ui_windows">
@@ -45,7 +46,6 @@
                 <label text="@.theme_mode" />
               </hbox>
             </hbox>
-            <boxfiller />
 
             <label text="@.screen_scaling" />
             <combobox id="screen_scale">
@@ -54,7 +54,6 @@
               <listitem text="300%" value="3" />
               <listitem text="400%" value="4" />
             </combobox>
-            <boxfiller />
 
             <label text="@.ui_scaling" />
             <combobox id="ui_scale">
@@ -63,12 +62,14 @@
               <listitem text="300%" value="3" />
               <listitem text="400%" value="4" />
             </combobox>
-            <boxfiller />
 
-            <label text="@.language" />
+            <link text="@.language" url="https://www.aseprite.org/languages/" />
             <combobox id="language" />
-            <link text="@.download_translations" url="https://www.aseprite.org/languages/" />
+
+            <boxfiller id="font_warning_filler" visible="false" />
+            <link text="@.font_warning" id="font_warning" visible="false" />
           </grid>
+          <separator horizontal="true" />
           <check id="gpu_acceleration"
                  text="@.gpu_acceleration"
                  tooltip="@.gpu_acceleration_tooltip" />
@@ -545,6 +546,20 @@
 
         <!-- Theme -->
         <vbox id="section_theme">
+          <separator text="@.customize_theme" horizontal="true" />
+          <grid columns="2">
+            <label text="@.preview" />
+            <vbox cell_align="horizontal" >
+              <label id="font_preview" text="@.font_preview" />
+              <label id="mini_font_preview" text="@.mini_font_preview" />
+            </vbox>
+
+            <check id="custom_theme_font" text="@.font" />
+            <font id="theme_font" cell_align="horizontal" />
+
+            <check id="custom_mini_font" text="@.mini_font" />
+            <font id="theme_mini_font" cell_align="horizontal" />
+          </grid>
           <separator text="@.available_themes" horizontal="true" />
           <view expansive="true" maxsize="true">
             <listbox id="theme_list" />
@@ -581,6 +596,10 @@
               <listitem text="@.cel_format_keep" />
               <listitem text="@.cel_format_raw" />
             </combobox>
+
+            <boxfiller />
+            <label id="cel_format_warning"
+                   text="@.cel_format_raw_warning" style="warning_label" />
           </grid>
         </vbox>
 
@@ -613,6 +632,7 @@
                  text="@.hue_with_sat_value"
                  pref="experimental.hue_with_sat_value_for_color_selector" />
           <check id="flash_layer" text="@.flash_selected_layer" />
+          <check id="use_selection_tool_loop" text="@.use_selection_tool_loop" />
           <hbox>
             <label text="@.non_active_layer_opacity" />
             <slider id="nonactive_layers_opacity" min="0" max="255" width="128" />
diff --git a/data/widgets/select_accelerator.xml b/data/widgets/select_shortcut.xml
similarity index 92%
rename from data/widgets/select_accelerator.xml
rename to data/widgets/select_shortcut.xml
index 4d882fb59..6d5df3ee5 100644
--- a/data/widgets/select_accelerator.xml
+++ b/data/widgets/select_shortcut.xml
@@ -1,7 +1,8 @@
 <!-- Aseprite -->
+<!-- Copyright (C) 2025 by Igara Studio S.A. -->
 <!-- Copyright (C) 2001-2016 by David Capello -->
 <gui>
-  <window id="select_accelerator" text="@.title">
+  <window id="select_shortcut" text="@.title">
     <vbox expansive="true">
       <grid columns="3">
         <label text="@.key" />
diff --git a/data/widgets/sprite_properties.xml b/data/widgets/sprite_properties.xml
index 0732ae3a6..19d4c5553 100644
--- a/data/widgets/sprite_properties.xml
+++ b/data/widgets/sprite_properties.xml
@@ -42,6 +42,8 @@
           <button id="convert_color_profile" text="@.convert" />
         </hbox>
       </hbox>
+
+      <check text="@.use_uuid_for_layers" id="use_uuid_for_layers" tooltip="@.use_uuid_for_layers_tooltip" cell_hspan="2" />
     </grid>
 
     <vbox expansive="true" id="tilesets_placeholder">
diff --git a/data/widgets/timeline_conf.xml b/data/widgets/timeline_conf.xml
index ea5a77894..010d7c7e2 100644
--- a/data/widgets/timeline_conf.xml
+++ b/data/widgets/timeline_conf.xml
@@ -1,17 +1,12 @@
 <!-- Aseprite -->
+<!-- Copyright (C) 2025 Igara Studio S.A. -->
 <!-- Copyright (C) 2014-2018 by David Capello -->
 <gui>
 <vbox id="timeline_conf">
   <hbox>
     <vbox>
       <separator cell_hspan="2" text="@.position" left="true" horizontal="true" />
-      <hbox>
-        <buttonset columns="2" id="position">
-          <item text="@.left" />
-          <item text="@.right" />
-          <item text="@.bottom" hspan="2" />
-        </buttonset>
-      </hbox>
+      <button id="layout" icon="icon_layout" />
     </vbox>
     <vbox>
       <separator text="@.frame_header" left="true" horizontal="true" />
@@ -30,6 +25,7 @@
 
         <check id="thumb_overlay_enabled" text="@.overlay_size"/>
         <slider min="2" max="10" id="thumb_overlay_size" cell_align="horizontal" width="128" />
+        <check id="thumb_scale_up_to_fit" text="@.scale_up_to_fit" cell_hspan="2" />
       </grid>
     </vbox>
   </hbox>
@@ -55,5 +51,11 @@
       <radio group="2" text="@.in_front" id="infront" tooltip="@.in_front_toolip" />
     </hbox>
   </grid>
+
+  <separator horizontal="true" />
+  <hbox>
+    <boxfiller />
+    <button id="defaults" text="@.set_as_defaults" />
+  </hbox>
 </vbox>
 </gui>
diff --git a/docs/LICENSES.md b/docs/LICENSES.md
index 6d7d3f6bf..a2ee55ac7 100644
--- a/docs/LICENSES.md
+++ b/docs/LICENSES.md
@@ -1,5 +1,34 @@
 Aseprite uses the following open source projects:
 
+* [Allegro 4](http://liballeg.org/)
+* [Bresenham algorithm implementations by Alois Zingl](http://members.chello.at/easyfilter/bresenham.html)
+* [cityhash](https://github.com/google/cityhash)
+* [cmark](https://github.com/jgm/cmark)
+* [curl](http://curl.haxx.se/)
+* [fmt](https://github.com/fmtlib/fmt)
+* [FreeType](http://www.freetype.org/)
+* [giflib](http://sourceforge.net/projects/giflib/)
+* [Google Test](https://github.com/google/googletest)
+* [harfbuzz](http://harfbuzz.org)
+* [IXWebSocket](https://github.com/machinezone/IXWebSocket)
+* [json11](https://github.com/dropbox/json11/)
+* [libarchive](http://www.libarchive.org/)
+* [libjpeg-turbo](https://libjpeg-turbo.org/)
+* [libpng](http://www.libpng.org/pub/png/)
+* [libwebp](https://developers.google.com/speed/webp/)
+* [Lua](https://www.lua.org/)
+* [pixman](http://www.pixman.org/)
+* [qoi](https://github.com/phoboslab/qoi)
+* [Sentry](https://sentry.io)
+* [skia](https://skia.org)
+* [simpleini](https://github.com/aseprite/simpleini/)
+* [TinyEXIF](https://github.com/cdcseacave/TinyEXIF)
+* [tinyexpr](https://github.com/codeplea/tinyexpr)
+* [tinyxml2](https://github.com/leethomason/tinyxml2)
+* [ucdn](https://github.com/grigorig/ucdn)
+* [Wintab API](http://www.wacomeng.com/windows/docs/WintabBackground.htm)
+* [zlib](http://www.zlib.net/)
+
 # [Allegro 4](http://liballeg.org/)
 
 ```
diff --git a/docs/ase-file-specs.md b/docs/ase-file-specs.md
index 7b2e8baa5..c72b003a5 100644
--- a/docs/ase-file-specs.md
+++ b/docs/ase-file-specs.md
@@ -79,6 +79,7 @@ A 128-byte header (same as FLC/FLI header, but with other magic number):
                   1 = Layer opacity has valid value
                   2 = Layer blend mode/opacity is valid for groups
                       (composite groups separately first when rendering)
+                  4 = Layers have an UUID
     WORD        Speed (milliseconds between frame, like in FLC files)
                 DEPRECATED: You should use the frame duration field
                 from each frame header
@@ -202,6 +203,8 @@ entire layers layout:
     STRING      Layer name
     + If layer type = 2
       DWORD     Tileset index
+    + If file header flags have bit 4:
+      UUID      Layer's universally unique identifier
 
 ### Cel Chunk (0x2005)
 
diff --git a/laf b/laf
index 339a0fa13..01571537b 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit 339a0fa13584853bda8559de486e715e743a5763
+Subproject commit 01571537bc6002a2e039a66497837365c394d7fa
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a74361e57..ae600d500 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Aseprite
-# Copyright (C) 2019-2024  Igara Studio S.A.
+# Copyright (C) 2019-2025  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 ######################################################################
@@ -152,6 +152,12 @@ add_custom_command(
   MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/../README.md)
 list(APPEND out_data_files ${DATA_OUTPUT_DIR}/README.md)
 
+add_custom_command(
+  OUTPUT ${DATA_OUTPUT_DIR}/AUTHORS.md
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../AUTHORS.md ${DATA_OUTPUT_DIR}/AUTHORS.md
+  MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/../AUTHORS.md)
+list(APPEND out_data_files ${DATA_OUTPUT_DIR}/AUTHORS.md)
+
 add_custom_command(
   OUTPUT ${DATA_OUTPUT_DIR}/EULA.txt
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../EULA.txt ${DATA_OUTPUT_DIR}/EULA.txt
@@ -174,8 +180,8 @@ if(ENABLE_ASEPRITE_EXE)
 
   if(WIN32)
     set(main_resources
-      main/resources_win32.rc
-      main/settings.manifest)
+      main/win/resources_win32.rc
+      main/win/settings.manifest)
   endif()
 
   add_executable(${main_target}
diff --git a/src/README.md b/src/README.md
index 59ddb0155..d444a93ca 100644
--- a/src/README.md
+++ b/src/README.md
@@ -72,6 +72,10 @@ In Debug mode (`_DEBUG`):
 * [`TRACEARGS`](https://github.com/aseprite/laf/blob/f3222bdee2d21556e9da55343e73803c730ecd97/base/debug.h#L40):
   in debug mode, it prints in the terminal/console each given argument
 
+In release mode you can use a similar function:
+
+* `PRINTARGS` prints in the terminal/console each given argument
+
 # Detect Platform
 
 You can check the platform using some `laf` macros:
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 5f0d8d68c..e90a99c66 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Aseprite
-# Copyright (C) 2018-2024  Igara Studio S.A.
+# Copyright (C) 2018-2025  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 # Generate a ui::Widget for each widget in a XML file
@@ -98,17 +98,17 @@ add_library(app-lib ${generated_files})
 # These specific-platform files should be in an external library
 # (e.g. "base" or "os").
 if(WIN32)
-  target_sources(app-lib PRIVATE font_path_win.cpp)
+  target_sources(app-lib PRIVATE fonts/font_path_win.cpp)
 elseif(APPLE)
-  target_sources(app-lib PRIVATE font_path_osx.mm)
+  target_sources(app-lib PRIVATE fonts/font_path_osx.mm)
 else()
-  target_sources(app-lib PRIVATE font_path_unix.cpp)
+  target_sources(app-lib PRIVATE fonts/font_path_unix.cpp)
 endif()
 
 # This defines a specific webp decoding utility function for using
 # in Windows when dragging and dropping images that are stored as
 # webp files (like Chrome does).
-if(WIN32 AND ENABLE_WEBP)
+if(WIN32 AND ENABLE_WEBP AND LAF_BACKEND STREQUAL "skia")
   target_sources(app-lib PRIVATE util/decode_webp.cpp)
 endif()
 
@@ -290,7 +290,6 @@ target_sources(app-lib PRIVATE
   cmd/copy_region.cpp
   cmd/crop_cel.cpp
   cmd/deselect_mask.cpp
-  cmd/drop_on_timeline.cpp
   cmd/flatten_layers.cpp
   cmd/flip_image.cpp
   cmd/flip_mask.cpp
@@ -522,11 +521,13 @@ target_sources(app-lib PRIVATE
   commands/tileset_mode.cpp
   commands/toggle_other_layers_opacity.cpp
   commands/toggle_play_option.cpp
+  commands/toggle_workspace_layout.cpp
   console.cpp
   context.cpp
   context_flags.cpp
   doc.cpp
   doc_api.cpp
+  doc_api_dnd_helper.cpp
   doc_diff.cpp
   doc_exporter.cpp
   doc_range_ops.cpp
@@ -545,8 +546,10 @@ target_sources(app-lib PRIVATE
   file_system.cpp
   filename_formatter.cpp
   flatten.cpp
-  font_info.cpp
-  font_path.cpp
+  fonts/font_data.cpp
+  fonts/font_info.cpp
+  fonts/font_path.cpp
+  fonts/fonts.cpp
   gui_xml.cpp
   i18n/strings.cpp
   i18n/xml_translator.cpp
@@ -608,6 +611,7 @@ target_sources(app-lib PRIVATE
   ui/context_bar.cpp
   ui/dithering_selector.cpp
   ui/doc_view.cpp
+  ui/dock.cpp
   ui/drop_down_button.cpp
   ui/dynamics_popup.cpp
   ui/editor/brush_preview.cpp
@@ -652,6 +656,9 @@ target_sources(app-lib PRIVATE
   ui/input_chain.cpp
   ui/keyboard_shortcuts.cpp
   ui/layer_frame_comboboxes.cpp
+  ui/layout.cpp
+  ui/layouts.cpp
+  ui/layout_selector.cpp
   ui/main_menu_bar.cpp
   ui/main_window.cpp
   ui/mini_help_button.cpp
@@ -668,9 +675,8 @@ target_sources(app-lib PRIVATE
   ui/rgbmap_algorithm_selector.cpp
   ui/sampling_selector.cpp
   ui/search_entry.cpp
-  ui/select_accelerator.cpp
+  ui/select_shortcut.cpp
   ui/selection_mode_field.cpp
-  ui/skin/font_data.cpp
   ui/skin/skin_part.cpp
   ui/skin/skin_property.cpp
   ui/skin/skin_slider_property.cpp
@@ -684,6 +690,7 @@ target_sources(app-lib PRIVATE
   ui/tile_button.cpp
   ui/tileset_selector.cpp
   ui/timeline/ani_controls.cpp
+  ui/timeline/doc_providers.cpp
   ui/timeline/timeline.cpp
   ui/toolbar.cpp
   ui/user_data_view.cpp
@@ -706,6 +713,7 @@ target_sources(app-lib PRIVATE
   util/layer_utils.cpp
   util/msk_file.cpp
   util/new_image_from_mask.cpp
+  util/open_file_job.cpp
   util/pal_ops.cpp
   util/pic_file.cpp
   util/pixel_ratio.cpp
diff --git a/src/app/app.cpp b/src/app/app.cpp
index 235d1f3e5..4232bb261 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -79,7 +79,7 @@
   #include "os/x11/system.h"
 #endif
 
-#if ENABLE_WEBP && LAF_WINDOWS
+#if ENABLE_WEBP && LAF_WINDOWS && LAF_SKIA
   #include "app/util/decode_webp.h"
 #endif
 
@@ -485,7 +485,7 @@ void App::run(const bool runGuiManager)
     // How to interpret one finger on Windows tablets.
     manager->display()->nativeWindow()->setInterpretOneFingerGestureAsMouseMovement(
       preferences().experimental.oneFingerAsMouseMovement());
-  #if ENABLE_WEBP
+  #if ENABLE_WEBP && LAF_SKIA
     // In Windows we use a custom webp decoder for drag & drop operations.
     os::set_decode_webp(util::decode_webp);
   #endif
diff --git a/src/app/app_menus.cpp b/src/app/app_menus.cpp
index f77e52594..cc3b2470c 100644
--- a/src/app/app_menus.cpp
+++ b/src/app/app_menus.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -113,11 +113,11 @@ bool can_call_global_shortcut(const AppMenuItem::Native* native)
     (focus == nullptr || focus->type() != ui::kEntryWidget ||
      !is_text_entry_shortcut(native->shortcut)) &&
     (native->keyContext == KeyContext::Any ||
-     native->keyContext == KeyboardShortcuts::instance()->getCurrentKeyContext());
+     native->keyContext == KeyboardShortcuts::getCurrentKeyContext());
 }
 
-// TODO this should be on "she" library (or we should use
-// os::Shortcut instead of ui::Accelerators)
+// TODO this should be on laf-os library (or we should use
+// os::Shortcut instead of ui::Shortcuts)
 int from_scancode_to_unicode(KeyScancode scancode)
 {
   static int map[] = {
@@ -284,22 +284,21 @@ void destroy_menu_item(ui::Widget* item)
 
 os::Shortcut get_os_shortcut_from_key(const Key* key)
 {
-  if (key && !key->accels().empty()) {
-    const ui::Accelerator& accel = key->accels().front();
+  if (key && !key->shortcuts().empty()) {
+    const ui::Shortcut& shortcut = key->shortcuts().front();
 
 #if LAF_MACOS
     // Shortcuts with spacebar as modifier do not work well in macOS
     // (they will be called when the space bar is unpressed too).
-    if ((accel.modifiers() & ui::kKeySpaceModifier) == ui::kKeySpaceModifier)
+    if ((shortcut.modifiers() & ui::kKeySpaceModifier) == ui::kKeySpaceModifier)
       return os::Shortcut();
 #endif
 
-    return os::Shortcut(
-      (accel.unicodeChar() ? accel.unicodeChar() : from_scancode_to_unicode(accel.scancode())),
-      accel.modifiers());
+    return os::Shortcut((shortcut.unicodeChar() ? shortcut.unicodeChar() :
+                                                  from_scancode_to_unicode(shortcut.scancode())),
+                        shortcut.modifiers());
   }
-  else
-    return os::Shortcut();
+  return {};
 }
 
 AppMenus* AppMenus::s_instance = nullptr;
@@ -719,7 +718,6 @@ Widget* AppMenus::convertXmlelemToMenuitem(XMLElement* elem, Menu* menu)
 {
   const char* id = elem->Attribute("id");
   const char* group = elem->Attribute("group");
-  const char* standard = elem->Attribute("standard");
 
   // is it a <separator>?
   if (strcmp(elem->Value(), "separator") == 0) {
@@ -781,6 +779,7 @@ Widget* AppMenus::convertXmlelemToMenuitem(XMLElement* elem, Menu* menu)
   }
 
 #if LAF_MACOS
+  const char* standard = elem->Attribute("standard");
   if (standard && strcmp(standard, "edit") == 0)
     menuitem->setAsStandardEditMenu();
 #endif
diff --git a/src/app/cmd/clear_rect.cpp b/src/app/cmd/clear_rect.cpp
index 5b3eecfaa..4cc9f208c 100644
--- a/src/app/cmd/clear_rect.cpp
+++ b/src/app/cmd/clear_rect.cpp
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -20,7 +21,20 @@ namespace app { namespace cmd {
 
 using namespace doc;
 
+ClearRect::ClearRect(Cel* cel, const gfx::Rect& bounds, color_t color)
+{
+  ASSERT(cel);
+  initialize(cel, bounds, color);
+}
+
 ClearRect::ClearRect(Cel* cel, const gfx::Rect& bounds)
+{
+  ASSERT(cel);
+  Doc* doc = static_cast<Doc*>(cel->document());
+  initialize(cel, bounds, doc->bgColor(cel->layer()));
+}
+
+void ClearRect::initialize(Cel* cel, const gfx::Rect& bounds, color_t color)
 {
   ASSERT(cel);
 
@@ -37,9 +51,7 @@ ClearRect::ClearRect(Cel* cel, const gfx::Rect& bounds)
     return;
 
   m_dstImage.reset(new WithImage(image));
-
-  Doc* doc = static_cast<Doc*>(cel->document());
-  m_bgcolor = doc->bgColor(cel->layer());
+  m_bgcolor = color;
 
   m_copy.reset(crop_image(image, bounds2.x, bounds2.y, bounds2.w, bounds2.h, m_bgcolor));
 }
diff --git a/src/app/cmd/clear_rect.h b/src/app/cmd/clear_rect.h
index 10f070aa9..ff20a1e07 100644
--- a/src/app/cmd/clear_rect.h
+++ b/src/app/cmd/clear_rect.h
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -26,6 +27,7 @@ using namespace doc;
 class ClearRect : public Cmd {
 public:
   ClearRect(Cel* cel, const gfx::Rect& bounds);
+  ClearRect(Cel* cel, const gfx::Rect& bounds, color_t color);
 
 protected:
   void onExecute() override;
@@ -37,6 +39,7 @@ protected:
   }
 
 private:
+  void initialize(Cel* cel, const gfx::Rect& bounds, color_t color);
   void clear();
   void restore();
 
diff --git a/src/app/cmd/drop_on_timeline.cpp b/src/app/cmd/drop_on_timeline.cpp
deleted file mode 100644
index 02c778c0c..000000000
--- a/src/app/cmd/drop_on_timeline.cpp
+++ /dev/null
@@ -1,397 +0,0 @@
-// Aseprite
-// Copyright (C) 2024  Igara Studio S.A.
-//
-// This program is distributed under the terms of
-// the End-User License Agreement for Aseprite.
-
-#ifdef HAVE_CONFIG_H
-  #include "config.h"
-#endif
-
-#include "app/cmd/drop_on_timeline.h"
-
-#include "app/cmd/add_layer.h"
-#include "app/cmd/move_cel.h"
-#include "app/cmd/set_pixel_format.h"
-#include "app/console.h"
-#include "app/context_flags.h"
-#include "app/doc.h"
-#include "app/doc_event.h"
-#include "app/file/file.h"
-#include "app/tx.h"
-#include "app/util/layer_utils.h"
-#include "app/util/open_file_job.h"
-#include "base/serialization.h"
-#include "doc/layer_io.h"
-#include "doc/layer_list.h"
-#include "doc/subobjects_io.h"
-#include "render/dithering.h"
-
-#include <algorithm>
-
-namespace app { namespace cmd {
-
-using namespace base::serialization::little_endian;
-
-DropOnTimeline::DropOnTimeline(app::Doc* doc,
-                               doc::frame_t frame,
-                               doc::layer_t layerIndex,
-                               InsertionPoint insert,
-                               DroppedOn droppedOn,
-                               const base::paths& paths)
-  : WithDocument(doc)
-  , m_size(0)
-  , m_paths(paths)
-  , m_frame(frame)
-  , m_layerIndex(layerIndex)
-  , m_insert(insert)
-  , m_droppedOn(droppedOn)
-{
-  ASSERT(m_layerIndex >= 0);
-  for (const auto& path : m_paths)
-    m_size += path.size();
-
-  // Zero layers stored.
-  write32(m_stream, 0);
-  m_size += sizeof(uint32_t);
-}
-
-DropOnTimeline::DropOnTimeline(app::Doc* doc,
-                               doc::frame_t frame,
-                               doc::layer_t layerIndex,
-                               InsertionPoint insert,
-                               DroppedOn droppedOn,
-                               const doc::ImageRef& image)
-  : WithDocument(doc)
-  , m_size(0)
-  , m_image(image)
-  , m_frame(frame)
-  , m_layerIndex(layerIndex)
-  , m_insert(insert)
-  , m_droppedOn(droppedOn)
-{
-  ASSERT(m_layerIndex >= 0);
-
-  // Zero layers stored.
-  write32(m_stream, 0);
-  m_size += sizeof(uint32_t);
-}
-
-void DropOnTimeline::onExecute()
-{
-  Doc* destDoc = document();
-  m_previousTotalFrames = destDoc->sprite()->totalFrames();
-
-  int docsProcessed = 0;
-  while (hasPendingWork()) {
-    std::unique_ptr<Doc> srcDoc;
-    if (!getNextDoc(srcDoc))
-      return;
-
-    if (srcDoc) {
-      docsProcessed++;
-      // If source document doesn't match the destination document's color
-      // mode, change it.
-      if (srcDoc->colorMode() != destDoc->colorMode()) {
-        // Execute in a source doc transaction because we don't need undo/redo
-        // this.
-        Tx tx(srcDoc.get());
-        tx(new cmd::SetPixelFormat(srcDoc->sprite(),
-                                   destDoc->sprite()->pixelFormat(),
-                                   render::Dithering(),
-                                   Preferences::instance().quantization.rgbmapAlgorithm(),
-                                   nullptr,
-                                   nullptr,
-                                   FitCriteria::DEFAULT));
-        tx.commit();
-      }
-
-      // If there is only one source document to process and it has a cel that
-      // can be moved, then move the cel from the source doc into the
-      // destination doc's selected frame.
-      const bool isJustOneDoc = (docsProcessed == 1 && !hasPendingWork());
-      if (isJustOneDoc && canMoveCelFrom(srcDoc.get())) {
-        auto* srcLayer = static_cast<LayerImage*>(srcDoc->sprite()->firstLayer());
-        auto* destLayer = static_cast<LayerImage*>(destDoc->sprite()->allLayers()[m_layerIndex]);
-        executeAndAdd(new MoveCel(srcLayer, 0, destLayer, m_frame, false));
-        break;
-      }
-
-      // If there is no room for the source frames, add frames to the
-      // destination sprite.
-      if (m_frame + srcDoc->sprite()->totalFrames() > destDoc->sprite()->totalFrames()) {
-        destDoc->sprite()->setTotalFrames(m_frame + srcDoc->sprite()->totalFrames());
-      }
-
-      // Save dropped layers from source document.
-      saveDroppedLayers(srcDoc->sprite()->root()->layers(), destDoc->sprite());
-    }
-  }
-
-  if (m_droppedLayersIds.empty())
-    return;
-
-  destDoc->sprite()->incrementVersion();
-  destDoc->incrementVersion();
-
-  insertDroppedLayers();
-}
-
-void DropOnTimeline::onUndo()
-{
-  CmdSequence::onUndo();
-
-  if (m_droppedLayersIds.empty()) {
-    notifyGeneralUpdate();
-    return;
-  }
-
-  Doc* doc = document();
-  frame_t currentTotalFrames = doc->sprite()->totalFrames();
-
-  for (auto id : m_droppedLayersIds) {
-    auto* layer = doc::get<Layer>(id);
-    ASSERT(layer);
-    if (layer) {
-      DocEvent ev(doc);
-      ev.sprite(layer->sprite());
-      ev.layer(layer);
-      doc->notify_observers<DocEvent&>(&DocObserver::onBeforeRemoveLayer, ev);
-
-      LayerGroup* group = layer->parent();
-      group->removeLayer(layer);
-      group->incrementVersion();
-      group->sprite()->incrementVersion();
-
-      doc->notify_observers<DocEvent&>(&DocObserver::onAfterRemoveLayer, ev);
-
-      delete layer;
-    }
-  }
-  doc->sprite()->setTotalFrames(m_previousTotalFrames);
-  doc->sprite()->incrementVersion();
-  m_previousTotalFrames = currentTotalFrames;
-}
-
-void DropOnTimeline::onRedo()
-{
-  CmdSequence::onRedo();
-
-  if (m_droppedLayersIds.empty()) {
-    notifyGeneralUpdate();
-    return;
-  }
-
-  Doc* doc = document();
-  frame_t currentTotalFrames = doc->sprite()->totalFrames();
-  doc->sprite()->setTotalFrames(m_previousTotalFrames);
-  doc->sprite()->incrementVersion();
-  m_previousTotalFrames = currentTotalFrames;
-
-  insertDroppedLayers();
-}
-
-void DropOnTimeline::setupInsertionLayer(Layer*& layer, LayerGroup*& group)
-{
-  const LayerList& allLayers = document()->sprite()->allLayers();
-  layer = allLayers[m_layerIndex];
-  if (m_insert == InsertionPoint::BeforeLayer && layer->isGroup()) {
-    group = static_cast<LayerGroup*>(layer);
-    // The user is trying to drop layers into an empty group, so there is no after
-    // nor before layer...
-    if (group->layersCount() == 0) {
-      layer = nullptr;
-      return;
-    }
-    layer = group->lastLayer();
-    m_insert = InsertionPoint::AfterLayer;
-  }
-
-  group = layer->parent();
-}
-
-bool DropOnTimeline::hasPendingWork()
-{
-  return m_image || !m_paths.empty();
-}
-
-bool DropOnTimeline::getNextDocFromImage(std::unique_ptr<Doc>& srcDoc)
-{
-  if (!m_image)
-    return true;
-
-  Sprite* sprite = new Sprite(m_image->spec(), 256);
-  LayerImage* layer = new LayerImage(sprite);
-  sprite->root()->addLayer(layer);
-  Cel* cel = new Cel(0, m_image);
-  layer->addCel(cel);
-  srcDoc = std::make_unique<Doc>(sprite);
-  m_image = nullptr;
-  return true;
-}
-
-bool DropOnTimeline::getNextDocFromPaths(std::unique_ptr<Doc>& srcDoc)
-{
-  Console console;
-  Context* context = document()->context();
-  int flags = FILE_LOAD_DATA_FILE | FILE_LOAD_AVOID_BACKGROUND_LAYER | FILE_LOAD_CREATE_PALETTE |
-              FILE_LOAD_SEQUENCE_YES;
-
-  std::unique_ptr<FileOp> fop(FileOp::createLoadDocumentOperation(context, m_paths.front(), flags));
-  // Remove the path that is currently being processed
-  m_paths.erase(m_paths.begin());
-
-  // Do nothing (the user cancelled or something like that)
-  if (!fop)
-    return false;
-
-  if (fop->hasError()) {
-    console.printf(fop->error().c_str());
-    return true;
-  }
-
-  base::paths fopFilenames;
-  fop->getFilenameList(fopFilenames);
-  // Remove paths that will be loaded by the current file operation.
-  for (const auto& filename : fopFilenames) {
-    auto it = std::find(m_paths.begin(), m_paths.end(), filename);
-    if (it != m_paths.end())
-      m_paths.erase(it);
-  }
-
-  OpenFileJob task(fop.get(), true);
-  task.showProgressWindow();
-
-  // Post-load processing, it is called from the GUI because may require user intervention.
-  fop->postLoad();
-
-  // Show any error
-  if (fop->hasError() && !fop->isStop())
-    console.printf(fop->error().c_str());
-
-  srcDoc.reset(fop->releaseDocument());
-  return true;
-}
-
-bool DropOnTimeline::getNextDoc(std::unique_ptr<Doc>& srcDoc)
-{
-  if (m_image == nullptr && !m_paths.empty())
-    return getNextDocFromPaths(srcDoc);
-
-  return getNextDocFromImage(srcDoc);
-}
-
-void DropOnTimeline::storeDroppedLayerIds(const Layer* layer)
-{
-  if (layer->isGroup()) {
-    const auto* group = static_cast<const LayerGroup*>(layer);
-    for (auto* child : group->layers())
-      storeDroppedLayerIds(child);
-
-    m_droppedLayersIds.push_back(group->id());
-  }
-  else {
-    m_droppedLayersIds.push_back(layer->id());
-  }
-}
-
-void DropOnTimeline::saveDroppedLayers(const LayerList& layers, Sprite* sprite)
-{
-  size_t start = m_stream.tellp();
-
-  // Calculate the new number of layers.
-  m_stream.seekg(0);
-  uint32_t nLayers = read32(m_stream) + layers.size();
-
-  // Flat list of all the dropped layers.
-  LayerList allDroppedLayers;
-  // Write number of layers (at the beginning of the stream).
-  m_stream.seekp(0);
-  write32(m_stream, nLayers);
-  // Move to where we must start writing.
-  m_stream.seekp(start);
-  for (auto it = layers.cbegin(); it != layers.cend(); ++it) {
-    auto* layer = *it;
-    // TODO: If we could "relocate" a layer from the source document to the
-    // destination document we could avoid making a copy here.
-    std::unique_ptr<Layer> layerCopy(copy_layer_with_sprite(layer, sprite));
-    layerCopy->displaceFrames(0, m_frame);
-
-    write_layer(m_stream, layerCopy.get());
-
-    storeDroppedLayerIds(layerCopy.get());
-  }
-  size_t end = m_stream.tellp();
-  m_size += end - start;
-}
-
-void DropOnTimeline::insertDroppedLayers()
-{
-  // Layer used as a reference to determine if the dropped layers will be
-  // inserted after or before it.
-  Layer* refLayer = nullptr;
-  // Parent group of the reference layer layer.
-  LayerGroup* group = nullptr;
-  // Keep track of the current insertion point.
-  InsertionPoint insert = m_insert;
-
-  setupInsertionLayer(refLayer, group);
-
-  SubObjectsFromSprite io(group->sprite());
-  m_stream.seekg(0);
-  auto nLayers = read32(m_stream);
-  for (int i = 0; i < nLayers; ++i) {
-    auto* layer = read_layer(m_stream, &io);
-
-    if (!refLayer) {
-      group->addLayer(layer);
-      refLayer = layer;
-      insert = InsertionPoint::AfterLayer;
-    }
-    else if (insert == InsertionPoint::AfterLayer) {
-      group->insertLayer(layer, refLayer);
-      refLayer = layer;
-    }
-    else if (insert == InsertionPoint::BeforeLayer) {
-      group->insertLayerBefore(layer, refLayer);
-      refLayer = layer;
-      insert = InsertionPoint::AfterLayer;
-    }
-
-    group->incrementVersion();
-    group->sprite()->incrementVersion();
-
-    Doc* doc = static_cast<Doc*>(group->sprite()->document());
-    DocEvent ev(doc);
-    ev.sprite(group->sprite());
-    ev.layer(layer);
-    doc->notify_observers<DocEvent&>(&DocObserver::onAddLayer, ev);
-  }
-}
-
-// Returns true if the document srcDoc has a cel that can be moved.
-// The cel from the srcDoc can be moved only when all of the following
-// conditions are met:
-// * Drop took place in a cel.
-// * Source doc has only one layer with just one frame.
-// * The layer from the source doc and the destination cel's layer are both
-// Image layers.
-// Otherwise this function returns false.
-bool DropOnTimeline::canMoveCelFrom(app::Doc* srcDoc)
-{
-  auto* srcLayer = srcDoc->sprite()->firstLayer();
-  auto* destLayer = document()->sprite()->allLayers()[m_layerIndex];
-  return m_droppedOn == DroppedOn::Cel && srcDoc->sprite()->allLayersCount() == 1 &&
-         srcDoc->sprite()->totalFrames() == 1 && srcLayer->isImage() && destLayer->isImage();
-}
-
-void DropOnTimeline::notifyGeneralUpdate()
-{
-  Doc* doc = document();
-  if (!doc)
-    return;
-
-  doc->notifyGeneralUpdate();
-}
-
-}} // namespace app::cmd
diff --git a/src/app/cmd/drop_on_timeline.h b/src/app/cmd/drop_on_timeline.h
deleted file mode 100644
index e111219fb..000000000
--- a/src/app/cmd/drop_on_timeline.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Aseprite
-// Copyright (C) 2024 Igara Studio S.A.
-//
-// This program is distributed under the terms of
-// the End-User License Agreement for Aseprite.
-
-#ifndef APP_CMD_drop_on_timeline_H_INCLUDED
-#define APP_CMD_drop_on_timeline_H_INCLUDED
-#pragma once
-
-#include "app/cmd/with_document.h"
-#include "app/cmd_sequence.h"
-#include "app/doc_observer.h"
-#include "base/paths.h"
-#include "doc/frame.h"
-#include "doc/image_ref.h"
-#include "doc/layer.h"
-#include "doc/layer_list.h"
-
-namespace app { namespace cmd {
-
-class DropOnTimeline : public CmdSequence,
-                       public WithDocument {
-public:
-  enum class InsertionPoint {
-    BeforeLayer,
-    AfterLayer,
-  };
-
-  enum class DroppedOn {
-    Unspecified,
-    Frame,
-    Layer,
-    Cel,
-  };
-
-  // Inserts the layers and frames of the documents pointed by the specified
-  // paths, at the specified frame and before or after the specified layer index.
-  DropOnTimeline(app::Doc* doc,
-                 doc::frame_t frame,
-                 doc::layer_t layerIndex,
-                 InsertionPoint insert,
-                 DroppedOn droppedOn,
-                 const base::paths& paths);
-
-  // Inserts the image as if it were a document with just one layer and one
-  // frame, at the specified frame and before or after the specified layer index.
-  DropOnTimeline(app::Doc* doc,
-                 doc::frame_t frame,
-                 doc::layer_t layerIndex,
-                 InsertionPoint insert,
-                 DroppedOn droppedOn,
-                 const doc::ImageRef& image);
-
-protected:
-  void onExecute() override;
-  void onUndo() override;
-  void onRedo() override;
-  size_t onMemSize() const override { return sizeof(*this) + m_size; }
-
-private:
-  void setupInsertionLayer(doc::Layer*& layer, doc::LayerGroup*& group);
-  void insertDroppedLayers();
-  bool canMoveCelFrom(app::Doc* srcDoc);
-  void notifyGeneralUpdate();
-  bool hasPendingWork();
-  // Returns the next document to be processed.
-  // Returns false when the user cancelled the process, or true when the
-  // process must go on.
-  bool getNextDoc(std::unique_ptr<Doc>& srcDoc);
-  bool getNextDocFromImage(std::unique_ptr<Doc>& srcDoc);
-  bool getNextDocFromPaths(std::unique_ptr<Doc>& srcDoc);
-
-  void storeDroppedLayerIds(const doc::Layer* layer);
-  void saveDroppedLayers(const doc::LayerList& layers, doc::Sprite* sprite);
-
-  size_t m_size;
-  base::paths m_paths;
-  doc::ImageRef m_image = nullptr;
-  doc::frame_t m_frame;
-  doc::layer_t m_layerIndex;
-  InsertionPoint m_insert;
-  DroppedOn m_droppedOn;
-  // Serialized dropped layers' data. Used for redo operation.
-  std::stringstream m_stream;
-  // Holds the Object IDs of the dropped layers. Used when determining which
-  // layers should be removed in an undo operation.
-  std::vector<doc::ObjectId> m_droppedLayersIds;
-  // Number of frames the doc had before dropping.
-  doc::frame_t m_previousTotalFrames;
-};
-
-}} // namespace app::cmd
-
-#endif
diff --git a/src/app/commands/cmd_about.cpp b/src/app/commands/cmd_about.cpp
index 16c768902..819adb4a2 100644
--- a/src/app/commands/cmd_about.cpp
+++ b/src/app/commands/cmd_about.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -11,12 +11,12 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
-#include "app/modules/gui.h"
 #include "app/ui/main_window.h"
 #include "fmt/format.h"
 #include "ver/info.h"
 
 #include "about.xml.h"
+#include "app/context.h"
 
 namespace app {
 
@@ -27,13 +27,19 @@ public:
   AboutCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   void onExecute(Context* context) override;
 };
 
-AboutCommand::AboutCommand() : Command(CommandId::About(), CmdUIOnlyFlag)
+AboutCommand::AboutCommand() : Command(CommandId::About())
 {
 }
 
+bool AboutCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void AboutCommand::onExecute(Context* context)
 {
   gen::About window;
@@ -44,7 +50,7 @@ void AboutCommand::onExecute(Context* context)
   });
   window.credits()->Click.connect([&window] {
     window.closeWindow(nullptr);
-    App::instance()->mainWindow()->showBrowser("README.md", "Authors");
+    App::instance()->mainWindow()->showBrowser("AUTHORS.md", "Authors");
   });
   window.i18nCredits()->Click.connect([&window] {
     window.closeWindow(nullptr);
diff --git a/src/app/commands/cmd_add_color.cpp b/src/app/commands/cmd_add_color.cpp
index 4ed1bdfa4..2e4f4148c 100644
--- a/src/app/commands/cmd_add_color.cpp
+++ b/src/app/commands/cmd_add_color.cpp
@@ -63,8 +63,7 @@ protected:
   std::string onGetFriendlyName() const override;
 };
 
-AddColorCommand::AddColorCommand()
-  : CommandWithNewParams<AddColorParams>(CommandId::AddColor(), CmdUIOnlyFlag)
+AddColorCommand::AddColorCommand() : CommandWithNewParams<AddColorParams>(CommandId::AddColor())
 {
 }
 
diff --git a/src/app/commands/cmd_advanced_mode.cpp b/src/app/commands/cmd_advanced_mode.cpp
index 7f20bca7c..b93a2cc7b 100644
--- a/src/app/commands/cmd_advanced_mode.cpp
+++ b/src/app/commands/cmd_advanced_mode.cpp
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -16,8 +17,7 @@
 #include "ui/ui.h"
 
 #include "advanced_mode.xml.h"
-
-#include <cstdio>
+#include "app/context.h"
 
 namespace app {
 
@@ -28,13 +28,19 @@ public:
   AdvancedModeCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   void onExecute(Context* context) override;
 };
 
-AdvancedModeCommand::AdvancedModeCommand() : Command(CommandId::AdvancedMode(), CmdUIOnlyFlag)
+AdvancedModeCommand::AdvancedModeCommand() : Command(CommandId::AdvancedMode())
 {
 }
 
+bool AdvancedModeCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void AdvancedModeCommand::onExecute(Context* context)
 {
   // Switch advanced mode.
@@ -54,11 +60,11 @@ void AdvancedModeCommand::onExecute(Context* context)
 
   if (oldMode == MainWindow::NormalMode && pref.advancedMode.showAlert()) {
     KeyPtr key = KeyboardShortcuts::instance()->command(this->id().c_str());
-    if (!key->accels().empty()) {
+    if (!key->shortcuts().empty()) {
       app::gen::AdvancedMode window;
 
       window.warningLabel()->setTextf("You can go back pressing \"%s\" key.",
-                                      key->accels().front().toString().c_str());
+                                      key->shortcuts().front().toString().c_str());
 
       window.openWindowInForeground();
 
diff --git a/src/app/commands/cmd_background_from_layer.cpp b/src/app/commands/cmd_background_from_layer.cpp
index ffce8e933..5442159b4 100644
--- a/src/app/commands/cmd_background_from_layer.cpp
+++ b/src/app/commands/cmd_background_from_layer.cpp
@@ -15,7 +15,6 @@
 #include "app/modules/gui.h"
 #include "app/tx.h"
 #include "doc/layer.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -28,8 +27,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-BackgroundFromLayerCommand::BackgroundFromLayerCommand()
-  : Command(CommandId::BackgroundFromLayer(), CmdRecordableFlag)
+BackgroundFromLayerCommand::BackgroundFromLayerCommand() : Command(CommandId::BackgroundFromLayer())
 {
 }
 
diff --git a/src/app/commands/cmd_cancel.cpp b/src/app/commands/cmd_cancel.cpp
index 18f37a6a3..83f3b15e9 100644
--- a/src/app/commands/cmd_cancel.cpp
+++ b/src/app/commands/cmd_cancel.cpp
@@ -37,7 +37,7 @@ private:
   Type m_type;
 };
 
-CancelCommand::CancelCommand() : Command(CommandId::Cancel(), CmdUIOnlyFlag), m_type(NoOp)
+CancelCommand::CancelCommand() : Command(CommandId::Cancel()), m_type(NoOp)
 {
 }
 
diff --git a/src/app/commands/cmd_canvas_size.cpp b/src/app/commands/cmd_canvas_size.cpp
index 20cce8826..f3ad7ea50 100644
--- a/src/app/commands/cmd_canvas_size.cpp
+++ b/src/app/commands/cmd_canvas_size.cpp
@@ -22,7 +22,6 @@
 #include "app/ui/skin/skin_theme.h"
 #include "app/ui_context.h"
 #include "doc/image.h"
-#include "doc/mask.h"
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
@@ -282,8 +281,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-CanvasSizeCommand::CanvasSizeCommand()
-  : CommandWithNewParams(CommandId::CanvasSize(), CmdRecordableFlag)
+CanvasSizeCommand::CanvasSizeCommand() : CommandWithNewParams(CommandId::CanvasSize())
 {
 }
 
diff --git a/src/app/commands/cmd_cel_opacity.cpp b/src/app/commands/cmd_cel_opacity.cpp
index 5773ea417..8119f0090 100644
--- a/src/app/commands/cmd_cel_opacity.cpp
+++ b/src/app/commands/cmd_cel_opacity.cpp
@@ -20,8 +20,6 @@
 #include "app/tx.h"
 #include "app/ui/timeline/timeline.h"
 #include "doc/cel.h"
-#include "doc/cels_range.h"
-#include "doc/sprite.h"
 
 #include <string>
 
@@ -42,7 +40,7 @@ private:
   int m_opacity;
 };
 
-CelOpacityCommand::CelOpacityCommand() : Command(CommandId::CelOpacity(), CmdUIOnlyFlag)
+CelOpacityCommand::CelOpacityCommand() : Command(CommandId::CelOpacity())
 {
   m_opacity = 255;
 }
diff --git a/src/app/commands/cmd_cel_properties.cpp b/src/app/commands/cmd_cel_properties.cpp
index 140f6ec02..fd7b4f85d 100644
--- a/src/app/commands/cmd_cel_properties.cpp
+++ b/src/app/commands/cmd_cel_properties.cpp
@@ -23,7 +23,6 @@
 #include "app/ui/timeline/timeline.h"
 #include "app/ui/user_data_view.h"
 #include "app/ui_context.h"
-#include "base/mem_utils.h"
 #include "base/scoped_value.h"
 #include "doc/cel.h"
 #include "doc/cels_range.h"
@@ -385,14 +384,14 @@ protected:
   void onExecute(Context* context) override;
 };
 
-CelPropertiesCommand::CelPropertiesCommand() : Command(CommandId::CelProperties(), CmdUIOnlyFlag)
+CelPropertiesCommand::CelPropertiesCommand() : Command(CommandId::CelProperties())
 {
 }
 
 bool CelPropertiesCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
-                             ContextFlags::ActiveLayerIsImage);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
+                                                         ContextFlags::ActiveLayerIsImage);
 }
 
 void CelPropertiesCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_change_brush.cpp b/src/app/commands/cmd_change_brush.cpp
index 71e68d80e..22e570cb5 100644
--- a/src/app/commands/cmd_change_brush.cpp
+++ b/src/app/commands/cmd_change_brush.cpp
@@ -21,7 +21,6 @@
 #include "app/tools/tool.h"
 #include "app/ui/context_bar.h"
 #include "app/ui/main_window.h"
-#include "base/convert_to.h"
 #include "doc/algorithm/flip_image.h"
 #include "doc/brush.h"
 #include "doc/image_ref.h"
@@ -64,7 +63,7 @@ private:
   int m_slot;
 };
 
-ChangeBrushCommand::ChangeBrushCommand() : Command(CommandId::ChangeBrush(), CmdUIOnlyFlag)
+ChangeBrushCommand::ChangeBrushCommand() : Command(CommandId::ChangeBrush())
 {
   m_change = None;
   m_slot = 0;
diff --git a/src/app/commands/cmd_change_color.cpp b/src/app/commands/cmd_change_color.cpp
index f5e4d8c1c..9c475a308 100644
--- a/src/app/commands/cmd_change_color.cpp
+++ b/src/app/commands/cmd_change_color.cpp
@@ -14,6 +14,7 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
+#include "app/context.h"
 #include "app/i18n/strings.h"
 #include "app/modules/palettes.h"
 #include "app/ui/color_bar.h"
@@ -39,18 +40,24 @@ public:
   ChangeColorCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   bool onNeedsParams() const override { return true; }
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
   std::string onGetFriendlyName() const override;
 };
 
-ChangeColorCommand::ChangeColorCommand() : Command(CommandId::ChangeColor(), CmdUIOnlyFlag)
+ChangeColorCommand::ChangeColorCommand() : Command(CommandId::ChangeColor())
 {
   m_background = false;
   m_change = None;
 }
 
+bool ChangeColorCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void ChangeColorCommand::onLoadParams(const Params& params)
 {
   std::string target = params.get("target");
diff --git a/src/app/commands/cmd_change_pixel_format.cpp b/src/app/commands/cmd_change_pixel_format.cpp
index 7f44bf6df..00639e3b6 100644
--- a/src/app/commands/cmd_change_pixel_format.cpp
+++ b/src/app/commands/cmd_change_pixel_format.cpp
@@ -21,9 +21,7 @@
 #include "app/i18n/strings.h"
 #include "app/load_matrix.h"
 #include "app/modules/gui.h"
-#include "app/modules/palettes.h"
 #include "app/sprite_job.h"
-#include "app/transaction.h"
 #include "app/ui/best_fit_criteria_selector.h"
 #include "app/ui/dithering_selector.h"
 #include "app/ui/editor/editor.h"
@@ -37,12 +35,10 @@
 #include "fmt/format.h"
 #include "render/dithering.h"
 #include "render/dithering_algorithm.h"
-#include "render/ordered_dither.h"
 #include "render/quantization.h"
 #include "render/render.h"
 #include "render/task_delegate.h"
 #include "ui/listitem.h"
-#include "ui/paint_event.h"
 #include "ui/size_hint_event.h"
 
 #include "color_mode.xml.h"
@@ -507,7 +503,7 @@ private:
 };
 
 ChangePixelFormatCommand::ChangePixelFormatCommand()
-  : CommandWithNewParams(CommandId::ChangePixelFormat(), CmdUIOnlyFlag)
+  : CommandWithNewParams(CommandId::ChangePixelFormat())
 {
 }
 
diff --git a/src/app/commands/cmd_clear.cpp b/src/app/commands/cmd_clear.cpp
index fefd8b6b4..0f6da332d 100644
--- a/src/app/commands/cmd_clear.cpp
+++ b/src/app/commands/cmd_clear.cpp
@@ -23,7 +23,7 @@ protected:
   void onExecute(Context* ctx) override;
 };
 
-ClearCommand::ClearCommand() : Command(CommandId::Clear(), CmdUIOnlyFlag)
+ClearCommand::ClearCommand() : Command(CommandId::Clear())
 {
 }
 
diff --git a/src/app/commands/cmd_clear_cel.cpp b/src/app/commands/cmd_clear_cel.cpp
index b2061d0f8..7129fb66b 100644
--- a/src/app/commands/cmd_clear_cel.cpp
+++ b/src/app/commands/cmd_clear_cel.cpp
@@ -19,7 +19,6 @@
 #include "app/ui/status_bar.h"
 #include "doc/cel.h"
 #include "doc/layer.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -32,7 +31,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-ClearCelCommand::ClearCelCommand() : Command(CommandId::ClearCel(), CmdRecordableFlag)
+ClearCelCommand::ClearCelCommand() : Command(CommandId::ClearCel())
 {
 }
 
@@ -76,7 +75,7 @@ void ClearCelCommand::onExecute(Context* context)
     tx.commit();
   }
 
-  if (nonEditableLayers)
+  if (context->isUIAvailable() && nonEditableLayers)
     StatusBar::instance()->showTip(1000, Strings::statusbar_tips_locked_layers());
 
   update_screen_for_document(document);
diff --git a/src/app/commands/cmd_clear_recent_files.cpp b/src/app/commands/cmd_clear_recent_files.cpp
index 4c76380c2..06cb44d91 100644
--- a/src/app/commands/cmd_clear_recent_files.cpp
+++ b/src/app/commands/cmd_clear_recent_files.cpp
@@ -23,8 +23,7 @@ protected:
   void onExecute(Context* ctx) override;
 };
 
-ClearRecentFilesCommand::ClearRecentFilesCommand()
-  : Command(CommandId::ClearRecentFiles(), CmdUIOnlyFlag)
+ClearRecentFilesCommand::ClearRecentFilesCommand() : Command(CommandId::ClearRecentFiles())
 {
 }
 
diff --git a/src/app/commands/cmd_close_file.cpp b/src/app/commands/cmd_close_file.cpp
index 57e1ce8e5..48183618d 100644
--- a/src/app/commands/cmd_close_file.cpp
+++ b/src/app/commands/cmd_close_file.cpp
@@ -12,15 +12,9 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/commands.h"
-#include "app/context_access.h"
 #include "app/ui/doc_view.h"
-#include "app/ui/status_bar.h"
 #include "app/ui/workspace.h"
 #include "app/ui_context.h"
-#include "doc/sprite.h"
-#include "ui/ui.h"
-
-#include <memory>
 
 namespace app {
 
@@ -28,7 +22,7 @@ using namespace ui;
 
 class CloseFileCommand : public Command {
 public:
-  CloseFileCommand() : Command(CommandId::CloseFile(), CmdUIOnlyFlag) {}
+  CloseFileCommand() : Command(CommandId::CloseFile()) {}
 
 protected:
   bool onEnabled(Context* context) override
@@ -51,12 +45,15 @@ protected:
 
 class CloseAllFilesCommand : public Command {
 public:
-  CloseAllFilesCommand() : Command(CommandId::CloseAllFiles(), CmdRecordableFlag)
-  {
-    m_quitting = false;
-  }
+  CloseAllFilesCommand() : Command(CommandId::CloseAllFiles()) { m_quitting = false; }
 
 protected:
+  bool onEnabled(Context* context) override
+  {
+    // Null if we are in --batch mode
+    return App::instance()->workspace() != nullptr;
+  }
+
   void onLoadParams(const Params& params) override { m_quitting = params.get_as<bool>("quitting"); }
 
   void onExecute(Context* context) override
diff --git a/src/app/commands/cmd_color_quantization.cpp b/src/app/commands/cmd_color_quantization.cpp
index dbd2d7e7c..ef476ee0d 100644
--- a/src/app/commands/cmd_color_quantization.cpp
+++ b/src/app/commands/cmd_color_quantization.cpp
@@ -21,7 +21,6 @@
 #include "app/transaction.h"
 #include "app/ui/color_bar.h"
 #include "app/ui/rgbmap_algorithm_selector.h"
-#include "app/ui_context.h"
 #include "doc/palette.h"
 #include "doc/sprite.h"
 #include "render/quantization.h"
@@ -71,7 +70,7 @@ protected:
 };
 
 ColorQuantizationCommand::ColorQuantizationCommand()
-  : CommandWithNewParams<ColorQuantizationParams>(CommandId::ColorQuantization(), CmdRecordableFlag)
+  : CommandWithNewParams<ColorQuantizationParams>(CommandId::ColorQuantization())
 {
 }
 
diff --git a/src/app/commands/cmd_contiguous_fill.cpp b/src/app/commands/cmd_contiguous_fill.cpp
index 2a02336bb..7aed7a8f6 100644
--- a/src/app/commands/cmd_contiguous_fill.cpp
+++ b/src/app/commands/cmd_contiguous_fill.cpp
@@ -24,7 +24,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-ContiguousFillCommand::ContiguousFillCommand() : Command(CommandId::ContiguousFill(), CmdUIOnlyFlag)
+ContiguousFillCommand::ContiguousFillCommand() : Command(CommandId::ContiguousFill())
 {
 }
 
diff --git a/src/app/commands/cmd_copy.cpp b/src/app/commands/cmd_copy.cpp
index 3dabf25c5..627104400 100644
--- a/src/app/commands/cmd_copy.cpp
+++ b/src/app/commands/cmd_copy.cpp
@@ -23,7 +23,7 @@ protected:
   void onExecute(Context* ctx) override;
 };
 
-CopyCommand::CopyCommand() : Command(CommandId::Copy(), CmdUIOnlyFlag)
+CopyCommand::CopyCommand() : Command(CommandId::Copy())
 {
 }
 
diff --git a/src/app/commands/cmd_copy_cel.cpp b/src/app/commands/cmd_copy_cel.cpp
index 0b80a02cf..925c7e1e5 100644
--- a/src/app/commands/cmd_copy_cel.cpp
+++ b/src/app/commands/cmd_copy_cel.cpp
@@ -10,9 +10,7 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
-#include "app/context_access.h"
 #include "app/ui/timeline/timeline.h"
-#include "ui/base.h"
 
 namespace app {
 
@@ -25,13 +23,13 @@ protected:
   void onExecute(Context* context) override;
 };
 
-CopyCelCommand::CopyCelCommand() : Command(CommandId::CopyCel(), CmdUIOnlyFlag)
+CopyCelCommand::CopyCelCommand() : Command(CommandId::CopyCel())
 {
 }
 
 bool CopyCelCommand::onEnabled(Context* context)
 {
-  return App::instance()->timeline()->isMovingCel();
+  return App::instance()->timeline() && App::instance()->timeline()->isMovingCel();
 }
 
 void CopyCelCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_copy_merged.cpp b/src/app/commands/cmd_copy_merged.cpp
index 6458a4dca..c70f1e398 100644
--- a/src/app/commands/cmd_copy_merged.cpp
+++ b/src/app/commands/cmd_copy_merged.cpp
@@ -24,7 +24,7 @@ protected:
   void onExecute(Context* ctx) override;
 };
 
-CopyMergedCommand::CopyMergedCommand() : Command(CommandId::CopyMerged(), CmdUIOnlyFlag)
+CopyMergedCommand::CopyMergedCommand() : Command(CommandId::CopyMerged())
 {
 }
 
diff --git a/src/app/commands/cmd_crop.cpp b/src/app/commands/cmd_crop.cpp
index 970472887..070d4b3d3 100644
--- a/src/app/commands/cmd_crop.cpp
+++ b/src/app/commands/cmd_crop.cpp
@@ -16,11 +16,7 @@
 #include "app/modules/gui.h"
 #include "app/tx.h"
 #include "app/ui/color_bar.h"
-#include "app/util/autocrop.h"
-#include "doc/image.h"
-#include "doc/layer.h"
 #include "doc/mask.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -37,7 +33,7 @@ private:
   gfx::Rect m_bounds;
 };
 
-CropSpriteCommand::CropSpriteCommand() : Command(CommandId::CropSprite(), CmdRecordableFlag)
+CropSpriteCommand::CropSpriteCommand() : Command(CommandId::CropSprite())
 {
 }
 
@@ -95,8 +91,7 @@ private:
   bool m_byGrid = false;
 };
 
-AutocropSpriteCommand::AutocropSpriteCommand()
-  : Command(CommandId::AutocropSprite(), CmdRecordableFlag)
+AutocropSpriteCommand::AutocropSpriteCommand() : Command(CommandId::AutocropSprite())
 {
 }
 
diff --git a/src/app/commands/cmd_cut.cpp b/src/app/commands/cmd_cut.cpp
index ec3d370a8..50973c27d 100644
--- a/src/app/commands/cmd_cut.cpp
+++ b/src/app/commands/cmd_cut.cpp
@@ -23,7 +23,7 @@ protected:
   void onExecute(Context* ctx) override;
 };
 
-CutCommand::CutCommand() : Command(CommandId::Cut(), CmdUIOnlyFlag)
+CutCommand::CutCommand() : Command(CommandId::Cut())
 {
 }
 
diff --git a/src/app/commands/cmd_deselect_mask.cpp b/src/app/commands/cmd_deselect_mask.cpp
index 1ce6495e9..530b51f15 100644
--- a/src/app/commands/cmd_deselect_mask.cpp
+++ b/src/app/commands/cmd_deselect_mask.cpp
@@ -14,8 +14,6 @@
 #include "app/context_access.h"
 #include "app/modules/gui.h"
 #include "app/tx.h"
-#include "doc/mask.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -28,7 +26,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-DeselectMaskCommand::DeselectMaskCommand() : Command(CommandId::DeselectMask(), CmdRecordableFlag)
+DeselectMaskCommand::DeselectMaskCommand() : Command(CommandId::DeselectMask())
 {
 }
 
diff --git a/src/app/commands/cmd_developer_console.cpp b/src/app/commands/cmd_developer_console.cpp
index 821e1282e..1489653b2 100644
--- a/src/app/commands/cmd_developer_console.cpp
+++ b/src/app/commands/cmd_developer_console.cpp
@@ -29,8 +29,7 @@ protected:
   void onExecute(Context* context);
 };
 
-DeveloperConsoleCommand::DeveloperConsoleCommand()
-  : Command(CommandId::DeveloperConsole(), CmdUIOnlyFlag)
+DeveloperConsoleCommand::DeveloperConsoleCommand() : Command(CommandId::DeveloperConsole())
 {
 }
 
diff --git a/src/app/commands/cmd_discard_brush.cpp b/src/app/commands/cmd_discard_brush.cpp
index 49a1d45e1..ccbbd78d5 100644
--- a/src/app/commands/cmd_discard_brush.cpp
+++ b/src/app/commands/cmd_discard_brush.cpp
@@ -12,8 +12,6 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/commands.h"
-#include "app/context_access.h"
-#include "app/tools/tool_box.h"
 #include "app/ui/context_bar.h"
 #include "app/ui_context.h"
 
@@ -28,12 +26,15 @@ protected:
   void onExecute(Context* context) override;
 };
 
-DiscardBrushCommand::DiscardBrushCommand() : Command(CommandId::DiscardBrush(), CmdUIOnlyFlag)
+DiscardBrushCommand::DiscardBrushCommand() : Command(CommandId::DiscardBrush())
 {
 }
 
 bool DiscardBrushCommand::onEnabled(Context* context)
 {
+  if (!context->isUIAvailable())
+    return false;
+
   ContextBar* ctxBar = App::instance()->contextBar();
   return (ctxBar->activeBrush()->type() == kImageBrushType);
 }
diff --git a/src/app/commands/cmd_duplicate_layer.cpp b/src/app/commands/cmd_duplicate_layer.cpp
index 140759244..9b5a61bf2 100644
--- a/src/app/commands/cmd_duplicate_layer.cpp
+++ b/src/app/commands/cmd_duplicate_layer.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2018  David Capello
+// Copyright (C) 2001-2025  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -10,16 +10,11 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
-#include "app/console.h"
 #include "app/context_access.h"
 #include "app/doc_api.h"
-#include "app/doc_undo.h"
 #include "app/modules/gui.h"
 #include "app/tx.h"
-#include "app/ui/editor/editor.h"
 #include "doc/layer.h"
-#include "doc/sprite.h"
-#include "ui/ui.h"
 
 namespace app {
 
@@ -32,8 +27,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-DuplicateLayerCommand::DuplicateLayerCommand()
-  : Command(CommandId::DuplicateLayer(), CmdRecordableFlag)
+DuplicateLayerCommand::DuplicateLayerCommand() : Command(CommandId::DuplicateLayer())
 {
 }
 
@@ -51,7 +45,7 @@ void DuplicateLayerCommand::onExecute(Context* context)
     Tx tx(writer, "Layer Duplication");
     LayerImage* sourceLayer = static_cast<LayerImage*>(writer.layer());
     DocApi api = document->getApi(tx);
-    api.duplicateLayerAfter(sourceLayer, sourceLayer->parent(), sourceLayer);
+    api.duplicateLayerAfter(sourceLayer, sourceLayer->parent(), sourceLayer, " Copy");
     tx.commit();
   }
 
diff --git a/src/app/commands/cmd_duplicate_sprite.cpp b/src/app/commands/cmd_duplicate_sprite.cpp
index 3d4047958..e4b025c89 100644
--- a/src/app/commands/cmd_duplicate_sprite.cpp
+++ b/src/app/commands/cmd_duplicate_sprite.cpp
@@ -16,13 +16,10 @@
 #include "app/ini_file.h"
 #include "app/ui_context.h"
 #include "base/fs.h"
-#include "doc/sprite.h"
 #include "ui/ui.h"
 
 #include "duplicate_sprite.xml.h"
 
-#include <cstdio>
-
 namespace app {
 
 using namespace ui;
@@ -43,7 +40,7 @@ protected:
 };
 
 DuplicateSpriteCommand::DuplicateSpriteCommand()
-  : CommandWithNewParams<DuplicateSpriteParams>(CommandId::DuplicateSprite(), CmdRecordableFlag)
+  : CommandWithNewParams<DuplicateSpriteParams>(CommandId::DuplicateSprite())
 {
 }
 
diff --git a/src/app/commands/cmd_duplicate_view.cpp b/src/app/commands/cmd_duplicate_view.cpp
index 4f1ecedff..15c4008d3 100644
--- a/src/app/commands/cmd_duplicate_view.cpp
+++ b/src/app/commands/cmd_duplicate_view.cpp
@@ -13,8 +13,6 @@
 #include "app/commands/command.h"
 #include "app/ui/workspace.h"
 
-#include <cstdio>
-
 namespace app {
 
 // using namespace ui;
@@ -28,7 +26,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-DuplicateViewCommand::DuplicateViewCommand() : Command(CommandId::DuplicateView(), CmdUIOnlyFlag)
+DuplicateViewCommand::DuplicateViewCommand() : Command(CommandId::DuplicateView())
 {
 }
 
diff --git a/src/app/commands/cmd_enter_license.cpp b/src/app/commands/cmd_enter_license.cpp
index 342761c94..3b6fa0e96 100644
--- a/src/app/commands/cmd_enter_license.cpp
+++ b/src/app/commands/cmd_enter_license.cpp
@@ -5,7 +5,6 @@
 // the End-User License Agreement for Aseprite.
 
 #include "app/commands/command.h"
-#include "app/context.h"
 
 #ifdef ENABLE_DRM
   #include "app/ui/enter_license.h"
@@ -24,7 +23,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-EnterLicenseCommand::EnterLicenseCommand() : Command(CommandId::EnterLicense(), CmdUIOnlyFlag)
+EnterLicenseCommand::EnterLicenseCommand() : Command(CommandId::EnterLicense())
 {
 }
 
diff --git a/src/app/commands/cmd_exit.cpp b/src/app/commands/cmd_exit.cpp
index bafd6981a..aa55cb565 100644
--- a/src/app/commands/cmd_exit.cpp
+++ b/src/app/commands/cmd_exit.cpp
@@ -16,7 +16,6 @@
 #include "app/doc.h"
 #include "app/job.h"
 #include "app/ui/main_window.h"
-#include "ui/alert.h"
 
 #ifdef ENABLE_SCRIPTING
   #include "app/commands/debugger.h"
@@ -32,7 +31,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-ExitCommand::ExitCommand() : Command(CommandId::Exit(), CmdUIOnlyFlag)
+ExitCommand::ExitCommand() : Command(CommandId::Exit())
 {
 }
 
diff --git a/src/app/commands/cmd_export_sprite_sheet.cpp b/src/app/commands/cmd_export_sprite_sheet.cpp
index b24dc314e..bb40ec0c2 100644
--- a/src/app/commands/cmd_export_sprite_sheet.cpp
+++ b/src/app/commands/cmd_export_sprite_sheet.cpp
@@ -33,15 +33,12 @@
 #include "app/ui/status_bar.h"
 #include "app/ui/timeline/timeline.h"
 #include "app/util/layer_utils.h"
-#include "base/convert_to.h"
 #include "base/fs.h"
 #include "base/string.h"
 #include "base/thread.h"
 #include "doc/layer.h"
-#include "doc/layer_tilemap.h"
 #include "doc/tag.h"
 #include "doc/tileset.h"
-#include "doc/tilesets.h"
 #include "fmt/format.h"
 #include "ui/message.h"
 #include "ui/system.h"
@@ -1187,8 +1184,7 @@ private:
 
 } // anonymous namespace
 
-ExportSpriteSheetCommand::ExportSpriteSheetCommand(const char* id)
-  : CommandWithNewParams(id, CmdRecordableFlag)
+ExportSpriteSheetCommand::ExportSpriteSheetCommand(const char* id) : CommandWithNewParams(id)
 {
 }
 
diff --git a/src/app/commands/cmd_eyedropper.cpp b/src/app/commands/cmd_eyedropper.cpp
index 330c6c8a7..476f234e8 100644
--- a/src/app/commands/cmd_eyedropper.cpp
+++ b/src/app/commands/cmd_eyedropper.cpp
@@ -17,7 +17,6 @@
 #include "app/context.h"
 #include "app/pref/preferences.h"
 #include "app/site.h"
-#include "app/tools/tool.h"
 #include "app/tools/tool_box.h"
 #include "app/ui/color_bar.h"
 #include "app/ui/editor/editor.h"
@@ -28,7 +27,7 @@ namespace app {
 
 using namespace ui;
 
-EyedropperCommand::EyedropperCommand() : Command(CommandId::Eyedropper(), CmdUIOnlyFlag)
+EyedropperCommand::EyedropperCommand() : Command(CommandId::Eyedropper())
 {
   m_background = false;
 }
diff --git a/src/app/commands/cmd_fill_and_stroke.cpp b/src/app/commands/cmd_fill_and_stroke.cpp
index 95c3cd4b3..c617c1e7a 100644
--- a/src/app/commands/cmd_fill_and_stroke.cpp
+++ b/src/app/commands/cmd_fill_and_stroke.cpp
@@ -39,7 +39,7 @@ private:
 };
 
 FillCommand::FillCommand(Type type)
-  : Command(type == Stroke ? CommandId::Stroke() : CommandId::Fill(), CmdUIOnlyFlag)
+  : Command(type == Stroke ? CommandId::Stroke() : CommandId::Fill())
   , m_type(type)
 {
 }
diff --git a/src/app/commands/cmd_fit_screen.cpp b/src/app/commands/cmd_fit_screen.cpp
index cc9072e20..bd09bf7de 100644
--- a/src/app/commands/cmd_fit_screen.cpp
+++ b/src/app/commands/cmd_fit_screen.cpp
@@ -11,7 +11,6 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
-#include "app/context_access.h"
 #include "app/ui/editor/editor.h"
 
 namespace app {
@@ -25,7 +24,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-FitScreenCommand::FitScreenCommand() : Command(CommandId::FitScreen(), CmdUIOnlyFlag)
+FitScreenCommand::FitScreenCommand() : Command(CommandId::FitScreen())
 {
 }
 
diff --git a/src/app/commands/cmd_flatten_layers.cpp b/src/app/commands/cmd_flatten_layers.cpp
index 6f53390c8..3680d2568 100644
--- a/src/app/commands/cmd_flatten_layers.cpp
+++ b/src/app/commands/cmd_flatten_layers.cpp
@@ -36,7 +36,7 @@ protected:
   bool m_visibleOnly;
 };
 
-FlattenLayersCommand::FlattenLayersCommand() : Command(CommandId::FlattenLayers(), CmdUIOnlyFlag)
+FlattenLayersCommand::FlattenLayersCommand() : Command(CommandId::FlattenLayers())
 {
   m_visibleOnly = false;
 }
diff --git a/src/app/commands/cmd_flip.cpp b/src/app/commands/cmd_flip.cpp
index 8dc8d5a21..0bd14833f 100644
--- a/src/app/commands/cmd_flip.cpp
+++ b/src/app/commands/cmd_flip.cpp
@@ -20,7 +20,6 @@
 #include "app/commands/params.h"
 #include "app/context_access.h"
 #include "app/doc_api.h"
-#include "app/doc_range.h"
 #include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/tools/tool_box.h"
@@ -38,11 +37,10 @@
 #include "doc/layer.h"
 #include "doc/mask.h"
 #include "doc/sprite.h"
-#include "gfx/size.h"
 
 namespace app {
 
-FlipCommand::FlipCommand() : Command(CommandId::Flip(), CmdRecordableFlag)
+FlipCommand::FlipCommand() : Command(CommandId::Flip())
 {
   m_flipMask = false;
   m_flipType = doc::algorithm::FlipHorizontal;
diff --git a/src/app/commands/cmd_frame_properties.cpp b/src/app/commands/cmd_frame_properties.cpp
index 32a5ebc26..d6c24efb1 100644
--- a/src/app/commands/cmd_frame_properties.cpp
+++ b/src/app/commands/cmd_frame_properties.cpp
@@ -44,12 +44,11 @@ private:
 
   // Frame to be shown. It can be ALL_FRAMES, CURRENT_RANGE, or a
   // number indicating a specific frame (1 is the first frame).
-  Target m_target;
-  frame_t m_frame;
+  Target m_target = CURRENT_RANGE;
+  frame_t m_frame = 1;
 };
 
-FramePropertiesCommand::FramePropertiesCommand()
-  : Command(CommandId::FrameProperties(), CmdUIOnlyFlag)
+FramePropertiesCommand::FramePropertiesCommand() : Command(CommandId::FrameProperties())
 {
 }
 
@@ -59,7 +58,7 @@ void FramePropertiesCommand::onLoadParams(const Params& params)
   if (frame == "all") {
     m_target = ALL_FRAMES;
   }
-  else if (frame == "current") {
+  else if (frame == "current" || !params.has_param("frame")) {
     m_target = CURRENT_RANGE;
   }
   else {
@@ -70,7 +69,7 @@ void FramePropertiesCommand::onLoadParams(const Params& params)
 
 bool FramePropertiesCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
 }
 
 void FramePropertiesCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_frame_tag_properties.cpp b/src/app/commands/cmd_frame_tag_properties.cpp
index 0dfad1bd4..52e974f69 100644
--- a/src/app/commands/cmd_frame_tag_properties.cpp
+++ b/src/app/commands/cmd_frame_tag_properties.cpp
@@ -15,7 +15,6 @@
 #include "app/cmd/set_tag_range.h"
 #include "app/cmd/set_tag_repeat.h"
 #include "app/cmd/set_user_data.h"
-#include "app/color.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
 #include "app/context_access.h"
@@ -48,7 +47,7 @@ private:
 };
 
 FrameTagPropertiesCommand::FrameTagPropertiesCommand()
-  : Command(CommandId::FrameTagProperties(), CmdUIOnlyFlag)
+  : Command(CommandId::FrameTagProperties())
   , m_tagId(NullId)
 {
 }
@@ -66,7 +65,7 @@ void FrameTagPropertiesCommand::onLoadParams(const Params& params)
 
 bool FrameTagPropertiesCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
 }
 
 void FrameTagPropertiesCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_fullscreen_mode.cpp b/src/app/commands/cmd_fullscreen_mode.cpp
index 96c724514..6da63f8c1 100644
--- a/src/app/commands/cmd_fullscreen_mode.cpp
+++ b/src/app/commands/cmd_fullscreen_mode.cpp
@@ -27,7 +27,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-FullscreenModeCommand::FullscreenModeCommand() : Command(CommandId::FullscreenMode(), CmdUIOnlyFlag)
+FullscreenModeCommand::FullscreenModeCommand() : Command(CommandId::FullscreenMode())
 {
 }
 
diff --git a/src/app/commands/cmd_fullscreen_preview.cpp b/src/app/commands/cmd_fullscreen_preview.cpp
index 96874c23a..eea755197 100644
--- a/src/app/commands/cmd_fullscreen_preview.cpp
+++ b/src/app/commands/cmd_fullscreen_preview.cpp
@@ -23,10 +23,7 @@
 #include "app/ui/main_window.h"
 #include "app/ui/preview_editor.h"
 #include "app/ui/status_bar.h"
-#include "app/util/conversion_to_surface.h"
-#include "doc/image.h"
 #include "doc/palette.h"
-#include "doc/primitives.h"
 #include "doc/sprite.h"
 #include "gfx/matrix.h"
 #include "os/surface.h"
@@ -308,8 +305,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-FullscreenPreviewCommand::FullscreenPreviewCommand()
-  : Command(CommandId::FullscreenPreview(), CmdUIOnlyFlag)
+FullscreenPreviewCommand::FullscreenPreviewCommand() : Command(CommandId::FullscreenPreview())
 {
 }
 
diff --git a/src/app/commands/cmd_goto_frame.cpp b/src/app/commands/cmd_goto_frame.cpp
index b82ae136b..ea3cd7827 100644
--- a/src/app/commands/cmd_goto_frame.cpp
+++ b/src/app/commands/cmd_goto_frame.cpp
@@ -31,7 +31,7 @@ using namespace doc;
 
 class GotoCommand : public Command {
 protected:
-  GotoCommand(const char* id) : Command(id, CmdRecordableFlag) {}
+  GotoCommand(const char* id) : Command(id) {}
 
   bool onEnabled(Context* context) override { return (Editor::activeEditor() != nullptr); }
 
diff --git a/src/app/commands/cmd_goto_layer.cpp b/src/app/commands/cmd_goto_layer.cpp
index 55a15911a..ec74629d8 100644
--- a/src/app/commands/cmd_goto_layer.cpp
+++ b/src/app/commands/cmd_goto_layer.cpp
@@ -24,11 +24,7 @@ namespace app {
 
 class GotoLayerCommand : public Command {
 public:
-  GotoLayerCommand(int offset, const char* id, CommandFlags flags)
-    : Command(id, flags)
-    , m_offset(offset)
-  {
-  }
+  GotoLayerCommand(int offset, const char* id) : Command(id), m_offset(offset) {}
 
 protected:
   bool onEnabled(Context* context) override
@@ -88,12 +84,12 @@ private:
 
 class GotoPreviousLayerCommand : public GotoLayerCommand {
 public:
-  GotoPreviousLayerCommand() : GotoLayerCommand(-1, "GotoPreviousLayer", CmdUIOnlyFlag) {}
+  GotoPreviousLayerCommand() : GotoLayerCommand(-1, CommandId::GotoPreviousLayer()) {}
 };
 
 class GotoNextLayerCommand : public GotoLayerCommand {
 public:
-  GotoNextLayerCommand() : GotoLayerCommand(+1, "GotoNextLayer", CmdUIOnlyFlag) {}
+  GotoNextLayerCommand() : GotoLayerCommand(+1, CommandId::GotoNextLayer()) {}
 };
 
 Command* CommandFactory::createGotoPreviousLayerCommand()
diff --git a/src/app/commands/cmd_goto_tab.cpp b/src/app/commands/cmd_goto_tab.cpp
index 1c8da8a02..1178ff460 100644
--- a/src/app/commands/cmd_goto_tab.cpp
+++ b/src/app/commands/cmd_goto_tab.cpp
@@ -24,7 +24,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-GotoNextTabCommand::GotoNextTabCommand() : Command(CommandId::GotoNextTab(), CmdUIOnlyFlag)
+GotoNextTabCommand::GotoNextTabCommand() : Command(CommandId::GotoNextTab())
 {
 }
 
@@ -50,8 +50,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-GotoPreviousTabCommand::GotoPreviousTabCommand()
-  : Command(CommandId::GotoPreviousTab(), CmdRecordableFlag)
+GotoPreviousTabCommand::GotoPreviousTabCommand() : Command(CommandId::GotoPreviousTab())
 {
 }
 
diff --git a/src/app/commands/cmd_grid.cpp b/src/app/commands/cmd_grid.cpp
index 44da7eff7..9973f0022 100644
--- a/src/app/commands/cmd_grid.cpp
+++ b/src/app/commands/cmd_grid.cpp
@@ -16,13 +16,9 @@
 #include "app/context.h"
 #include "app/context_access.h"
 #include "app/doc.h"
-#include "app/find_widget.h"
-#include "app/load_widget.h"
 #include "app/pref/preferences.h"
 #include "app/tx.h"
 #include "app/ui/status_bar.h"
-#include "app/ui_context.h"
-#include "doc/document.h"
 #include "doc/mask.h"
 #include "ui/window.h"
 
@@ -37,7 +33,7 @@ using namespace gfx;
 
 class SnapToGridCommand : public Command {
 public:
-  SnapToGridCommand() : Command(CommandId::SnapToGrid(), CmdUIOnlyFlag) {}
+  SnapToGridCommand() : Command(CommandId::SnapToGrid()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -52,13 +48,14 @@ protected:
     bool newValue = !docPref.grid.snap();
     docPref.grid.snap(newValue);
 
-    StatusBar::instance()->showSnapToGridWarning(newValue);
+    if (ctx->isUIAvailable())
+      StatusBar::instance()->showSnapToGridWarning(newValue);
   }
 };
 
 class SelectionAsGridCommand : public Command {
 public:
-  SelectionAsGridCommand() : Command(CommandId::SelectionAsGrid(), CmdUIOnlyFlag) {}
+  SelectionAsGridCommand() : Command(CommandId::SelectionAsGrid()) {}
 
 protected:
   bool onEnabled(Context* ctx) override
@@ -93,13 +90,13 @@ protected:
   void onExecute(Context* context) override;
 };
 
-GridSettingsCommand::GridSettingsCommand() : Command(CommandId::GridSettings(), CmdUIOnlyFlag)
+GridSettingsCommand::GridSettingsCommand() : Command(CommandId::GridSettings())
 {
 }
 
 bool GridSettingsCommand::onEnabled(Context* context)
 {
-  return true;
+  return context->isUIAvailable();
 }
 
 void GridSettingsCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_home.cpp b/src/app/commands/cmd_home.cpp
index 2bd528178..91a91e520 100644
--- a/src/app/commands/cmd_home.cpp
+++ b/src/app/commands/cmd_home.cpp
@@ -10,6 +10,7 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
+#include "app/context.h"
 #include "app/ui/main_window.h"
 
 namespace app {
@@ -26,7 +27,7 @@ protected:
   bool onEnabled(Context* context) override;
 };
 
-HomeCommand::HomeCommand() : Command(CommandId::Home(), CmdUIOnlyFlag)
+HomeCommand::HomeCommand() : Command(CommandId::Home())
 {
 }
 
@@ -41,7 +42,7 @@ void HomeCommand::onExecute(Context* context)
 
 bool HomeCommand::onEnabled(Context* context)
 {
-  return !App::instance()->mainWindow()->isHomeSelected();
+  return context->isUIAvailable() && !App::instance()->mainWindow()->isHomeSelected();
 }
 
 Command* CommandFactory::createHomeCommand()
diff --git a/src/app/commands/cmd_import_sprite_sheet.cpp b/src/app/commands/cmd_import_sprite_sheet.cpp
index 05e12bb76..78cae93f0 100644
--- a/src/app/commands/cmd_import_sprite_sheet.cpp
+++ b/src/app/commands/cmd_import_sprite_sheet.cpp
@@ -20,20 +20,14 @@
 #include "app/doc_api.h"
 #include "app/i18n/strings.h"
 #include "app/modules/gui.h"
-#include "app/modules/palettes.h"
 #include "app/pref/preferences.h"
 #include "app/tx.h"
-#include "app/ui/drop_down_button.h"
 #include "app/ui/editor/editor.h"
-#include "app/ui/editor/editor_decorator.h"
 #include "app/ui/editor/select_box_state.h"
-#include "app/ui/editor/standby_state.h"
 #include "app/ui/workspace.h"
 #include "doc/cel.h"
 #include "doc/image.h"
 #include "doc/layer.h"
-#include "doc/palette.h"
-#include "doc/primitives.h"
 #include "doc/sprite.h"
 #include "render/render.h"
 #include "ui/ui.h"
@@ -518,7 +512,7 @@ protected:
 };
 
 ImportSpriteSheetCommand::ImportSpriteSheetCommand()
-  : CommandWithNewParams(CommandId::ImportSpriteSheet(), CmdRecordableFlag)
+  : CommandWithNewParams(CommandId::ImportSpriteSheet())
 {
 }
 
diff --git a/src/app/commands/cmd_invert_mask.cpp b/src/app/commands/cmd_invert_mask.cpp
index c240b4d2a..d630903a2 100644
--- a/src/app/commands/cmd_invert_mask.cpp
+++ b/src/app/commands/cmd_invert_mask.cpp
@@ -31,7 +31,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-InvertMaskCommand::InvertMaskCommand() : Command(CommandId::InvertMask(), CmdRecordableFlag)
+InvertMaskCommand::InvertMaskCommand() : Command(CommandId::InvertMask())
 {
 }
 
diff --git a/src/app/commands/cmd_keyboard_shortcuts.cpp b/src/app/commands/cmd_keyboard_shortcuts.cpp
index 6b79d4761..c85fcc9d7 100644
--- a/src/app/commands/cmd_keyboard_shortcuts.cpp
+++ b/src/app/commands/cmd_keyboard_shortcuts.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -23,25 +23,20 @@
 #include "app/ui/app_menuitem.h"
 #include "app/ui/keyboard_shortcuts.h"
 #include "app/ui/search_entry.h"
-#include "app/ui/select_accelerator.h"
+#include "app/ui/select_shortcut.h"
 #include "app/ui/separator_in_view.h"
 #include "app/ui/skin/skin_theme.h"
-#include "base/fs.h"
 #include "base/pi.h"
 #include "base/scoped_value.h"
-#include "base/split_string.h"
-#include "base/string.h"
 #include "ui/alert.h"
 #include "ui/fit_bounds.h"
 #include "ui/graphics.h"
 #include "ui/listitem.h"
 #include "ui/message.h"
 #include "ui/paint_event.h"
-#include "ui/resize_event.h"
 #include "ui/separator.h"
 #include "ui/size_hint_event.h"
 #include "ui/splitter.h"
-#include "ui/system.h"
 
 #include "keyboard_shortcuts.xml.h"
 
@@ -151,7 +146,7 @@ public:
     , m_keyOrig(key ? new Key(*key) : nullptr)
     , m_menuitem(menuitem)
     , m_level(level)
-    , m_hotAccel(-1)
+    , m_hotShortcut(-1)
     , m_lockButtons(false)
     , m_headerItem(headerItem)
   {
@@ -204,45 +199,45 @@ public:
   }
 
 private:
-  void onChangeAccel(int index)
+  void onChangeShortcut(int index)
   {
     LockButtons lock(this);
-    Accelerator origAccel = m_key->accels()[index];
-    SelectAccelerator window(origAccel, m_key->keycontext(), m_keys);
+    Shortcut origShortcut = m_key->shortcuts()[index];
+    SelectShortcut window(origShortcut, m_key->keycontext(), m_keys);
     window.openWindowInForeground();
 
     if (window.isModified()) {
-      m_key->disableAccel(origAccel, KeySource::UserDefined);
-      if (!window.accel().isEmpty())
-        m_key->add(window.accel(), KeySource::UserDefined, m_keys);
+      m_key->disableShortcut(origShortcut, KeySource::UserDefined);
+      if (!window.shortcut().isEmpty())
+        m_key->add(window.shortcut(), KeySource::UserDefined, m_keys);
     }
 
     this->window()->layout();
   }
 
-  void onDeleteAccel(int index)
+  void onDeleteShortcut(int index)
   {
     LockButtons lock(this);
-    // We need to create a copy of the accelerator because
-    // Key::disableAccel() will modify the accels() collection itself.
-    ui::Accelerator accel = m_key->accels()[index];
+    // We need to create a copy of the shortcut because
+    // Key::disableShortcut() will modify the shortcuts() collection itself.
+    ui::Shortcut shortcut = m_key->shortcuts()[index];
 
-    if (ui::Alert::show(Strings::alerts_delete_shortcut(accel.toString())) != 1)
+    if (ui::Alert::show(Strings::alerts_delete_shortcut(shortcut.toString())) != 1)
       return;
 
-    m_key->disableAccel(accel, KeySource::UserDefined);
+    m_key->disableShortcut(shortcut, KeySource::UserDefined);
     window()->layout();
   }
 
-  void onAddAccel()
+  void onAddShortcut()
   {
     LockButtons lock(this);
-    ui::Accelerator accel;
-    SelectAccelerator window(accel, m_key ? m_key->keycontext() : KeyContext::Any, m_keys);
+    ui::Shortcut shortcut;
+    SelectShortcut window(shortcut, m_key ? m_key->keycontext() : KeyContext::Any, m_keys);
     window.openWindowInForeground();
 
     if ((window.isModified()) ||
-        // We can assign a "None" accelerator to mouse wheel actions
+        // We can assign a "None" shortcut to mouse wheel actions
         (m_key && m_key->type() == KeyType::WheelAction && window.isOK())) {
       if (!m_key) {
         ASSERT(m_menuitem);
@@ -256,7 +251,7 @@ private:
         m_menuKeys[m_menuitem] = m_key;
       }
 
-      m_key->add(window.accel(), KeySource::UserDefined, m_keys);
+      m_key->add(window.shortcut(), KeySource::UserDefined, m_keys);
     }
 
     this->window()->layout();
@@ -273,8 +268,8 @@ private:
       size.w = std::max(size.w, w);
     }
 
-    if (m_key && !m_key->accels().empty()) {
-      size_t combos = m_key->accels().size();
+    if (m_key && !m_key->shortcuts().empty()) {
+      size_t combos = m_key->shortcuts().size();
       if (combos > 1)
         size.h *= combos;
     }
@@ -315,7 +310,7 @@ private:
       }
     }
 
-    if (m_key && !m_key->accels().empty()) {
+    if (m_key && !m_key->shortcuts().empty()) {
       if (m_key->keycontext() != KeyContext::Any) {
         g->drawText(convertKeyContextToUserFriendlyString(m_key->keycontext()),
                     fg,
@@ -324,13 +319,14 @@ private:
       }
 
       const int dh = th + 4 * guiscale();
-      IntersectClip clip(g,
-                         gfx::Rect(keyXPos, y, contextXPos - keyXPos, dh * m_key->accels().size()));
+      IntersectClip clip(
+        g,
+        gfx::Rect(keyXPos, y, contextXPos - keyXPos, dh * m_key->shortcuts().size()));
       if (clip) {
         int i = 0;
-        for (const Accelerator& accel : m_key->accels()) {
-          if (i != m_hotAccel || !m_changeButton) {
-            g->drawText(getAccelText(accel), fg, bg, gfx::Point(keyXPos, y));
+        for (const Shortcut& shortcut : m_key->shortcuts()) {
+          if (i != m_hotShortcut || !m_changeButton) {
+            g->drawText(getShortcutText(shortcut), fg, bg, gfx::Point(keyXPos, y));
           }
           y += dh;
           ++i;
@@ -361,40 +357,41 @@ private:
         gfx::Rect bounds = this->bounds();
         MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
 
-        const Accelerators* accels = (m_key ? &m_key->accels() : NULL);
+        const Shortcuts* shortcuts = (m_key ? &m_key->shortcuts() : NULL);
         int y = bounds.y;
         int dh = textSize().h + 4 * guiscale();
-        int maxi = (accels && accels->size() > 1 ? accels->size() : 1);
+        int maxi = (shortcuts && shortcuts->size() > 1 ? shortcuts->size() : 1);
 
-        auto theme = SkinTheme::get(this);
+        auto* theme = SkinTheme::get(this);
 
         for (int i = 0; i < maxi; ++i, y += dh) {
-          int w = font()->textLength(
-            (accels && i < (int)accels->size() ? getAccelText((*accels)[i]) : std::string()));
+          int w = font()->textLength((shortcuts && i < (int)shortcuts->size() ?
+                                        getShortcutText((*shortcuts)[i]) :
+                                        std::string()));
           gfx::Rect itemBounds(bounds.x + m_headerItem->keyXPos(), y, w, dh);
           itemBounds = itemBounds.enlarge(
             gfx::Border(4 * guiscale(), 0, 6 * guiscale(), 1 * guiscale()));
 
-          if (accels && i < (int)accels->size() && mouseMsg->position().y >= itemBounds.y &&
+          if (shortcuts && i < (int)shortcuts->size() && mouseMsg->position().y >= itemBounds.y &&
               mouseMsg->position().y < itemBounds.y + itemBounds.h) {
-            if (m_hotAccel != i) {
-              m_hotAccel = i;
+            if (m_hotShortcut != i) {
+              m_hotShortcut = i;
 
               m_changeConn = obs::connection();
               m_changeButton.reset(new Button(""));
-              m_changeConn = m_changeButton->Click.connect([this, i] { onChangeAccel(i); });
+              m_changeConn = m_changeButton->Click.connect([this, i] { onChangeShortcut(i); });
               m_changeButton->setStyle(theme->styles.miniButton());
               addChild(m_changeButton.get());
 
               m_deleteConn = obs::connection();
               m_deleteButton.reset(new Button(""));
-              m_deleteConn = m_deleteButton->Click.connect([this, i] { onDeleteAccel(i); });
+              m_deleteConn = m_deleteButton->Click.connect([this, i] { onDeleteShortcut(i); });
               m_deleteButton->setStyle(theme->styles.miniButton());
               addChild(m_deleteButton.get());
 
               m_changeButton->setBgColor(gfx::ColorNone);
               m_changeButton->setBounds(itemBounds);
-              m_changeButton->setText(getAccelText((*accels)[i]));
+              m_changeButton->setText(getShortcutText((*shortcuts)[i]));
 
               const char* label = "x";
               m_deleteButton->setBgColor(gfx::ColorNone);
@@ -411,7 +408,7 @@ private:
           if (i == 0 && !m_addButton && (!m_menuitem || m_menuitem->getCommand())) {
             m_addConn = obs::connection();
             m_addButton.reset(new Button(""));
-            m_addConn = m_addButton->Click.connect([this] { onAddAccel(); });
+            m_addConn = m_addButton->Click.connect([this] { onAddShortcut(); });
             m_addButton->setStyle(theme->styles.miniButton());
             addChild(m_addButton.get());
 
@@ -452,17 +449,15 @@ private:
         m_addButton->setVisible(false);
     }
 
-    m_hotAccel = -1;
+    m_hotShortcut = -1;
   }
 
-  std::string getAccelText(const Accelerator& accel) const
+  std::string getShortcutText(const Shortcut& shortcut) const
   {
-    if (m_key && m_key->type() == KeyType::WheelAction && accel.isEmpty()) {
+    if (m_key && m_key->type() == KeyType::WheelAction && shortcut.isEmpty()) {
       return Strings::keyboard_shortcuts_default_action();
     }
-    else {
-      return accel.toString();
-    }
+    return shortcut.toString();
   }
 
   KeyboardShortcuts& m_keys;
@@ -471,14 +466,14 @@ private:
   KeyPtr m_keyOrig;
   AppMenuItem* m_menuitem;
   int m_level;
-  ui::Accelerators m_newAccels;
+  ui::Shortcuts m_newShortcuts;
   std::shared_ptr<ui::Button> m_changeButton;
   std::shared_ptr<ui::Button> m_deleteButton;
   std::shared_ptr<ui::Button> m_addButton;
   obs::scoped_connection m_changeConn;
   obs::scoped_connection m_deleteConn;
   obs::scoped_connection m_addConn;
-  int m_hotAccel;
+  int m_hotShortcut;
   bool m_lockButtons;
   HeaderItem* m_headerItem;
 };
@@ -977,6 +972,7 @@ public:
   KeyboardShortcutsCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
 
@@ -986,11 +982,15 @@ private:
   std::string m_search;
 };
 
-KeyboardShortcutsCommand::KeyboardShortcutsCommand()
-  : Command(CommandId::KeyboardShortcuts(), CmdUIOnlyFlag)
+KeyboardShortcutsCommand::KeyboardShortcutsCommand() : Command(CommandId::KeyboardShortcuts())
 {
 }
 
+bool KeyboardShortcutsCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void KeyboardShortcutsCommand::onLoadParams(const Params& params)
 {
   m_search = params.get("search");
diff --git a/src/app/commands/cmd_launch.cpp b/src/app/commands/cmd_launch.cpp
index b9046eb7f..17382c1c4 100644
--- a/src/app/commands/cmd_launch.cpp
+++ b/src/app/commands/cmd_launch.cpp
@@ -34,10 +34,7 @@ private:
   std::string m_path;
 };
 
-LaunchCommand::LaunchCommand()
-  : Command(CommandId::Launch(), CmdUIOnlyFlag)
-  , m_type(Url)
-  , m_path("")
+LaunchCommand::LaunchCommand() : Command(CommandId::Launch()), m_type(Url), m_path("")
 {
 }
 
diff --git a/src/app/commands/cmd_layer_from_background.cpp b/src/app/commands/cmd_layer_from_background.cpp
index 987d7ae61..38a9f6df5 100644
--- a/src/app/commands/cmd_layer_from_background.cpp
+++ b/src/app/commands/cmd_layer_from_background.cpp
@@ -14,8 +14,6 @@
 #include "app/context_access.h"
 #include "app/modules/gui.h"
 #include "app/tx.h"
-#include "doc/layer.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -28,8 +26,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-LayerFromBackgroundCommand::LayerFromBackgroundCommand()
-  : Command(CommandId::LayerFromBackground(), CmdRecordableFlag)
+LayerFromBackgroundCommand::LayerFromBackgroundCommand() : Command(CommandId::LayerFromBackground())
 {
 }
 
diff --git a/src/app/commands/cmd_layer_lock.cpp b/src/app/commands/cmd_layer_lock.cpp
index 672ca599a..cc6f421b6 100644
--- a/src/app/commands/cmd_layer_lock.cpp
+++ b/src/app/commands/cmd_layer_lock.cpp
@@ -9,11 +9,9 @@
   #include "config.h"
 #endif
 
-#include "app/app.h"
 #include "app/commands/command.h"
 #include "app/context_access.h"
 #include "app/modules/gui.h"
-#include "doc/image.h"
 #include "doc/layer.h"
 
 namespace app {
@@ -30,7 +28,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-LayerLockCommand::LayerLockCommand() : Command(CommandId::LayerLock(), CmdRecordableFlag)
+LayerLockCommand::LayerLockCommand() : Command(CommandId::LayerLock())
 {
 }
 
diff --git a/src/app/commands/cmd_layer_opacity.cpp b/src/app/commands/cmd_layer_opacity.cpp
index 60aeb92c3..92c5aeec4 100644
--- a/src/app/commands/cmd_layer_opacity.cpp
+++ b/src/app/commands/cmd_layer_opacity.cpp
@@ -9,7 +9,6 @@
   #include "config.h"
 #endif
 
-#include "app/app.h"
 #include "app/cmd/set_layer_opacity.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
@@ -40,7 +39,7 @@ private:
   int m_opacity;
 };
 
-LayerOpacityCommand::LayerOpacityCommand() : Command(CommandId::LayerOpacity(), CmdUIOnlyFlag)
+LayerOpacityCommand::LayerOpacityCommand() : Command(CommandId::LayerOpacity())
 {
   m_opacity = 255;
 }
diff --git a/src/app/commands/cmd_layer_properties.cpp b/src/app/commands/cmd_layer_properties.cpp
index 81e0768b1..869a9b897 100644
--- a/src/app/commands/cmd_layer_properties.cpp
+++ b/src/app/commands/cmd_layer_properties.cpp
@@ -32,8 +32,8 @@
 #include "app/ui/timeline/timeline.h"
 #include "app/ui/user_data_view.h"
 #include "app/ui_context.h"
+#include "base/convert_to.h"
 #include "base/scoped_value.h"
-#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
 #include "doc/sprite.h"
@@ -134,8 +134,16 @@ public:
 
     remapWindow();
     centerWindow();
+
+    gfx::Rect originalBounds = bounds();
+
     load_window_pos(this, "LayerProperties");
 
+    // Queue a remap for after the user data view is configured
+    // if the window size has been reset and user data is visible
+    if (originalBounds == bounds() && Preferences::instance().layers.userDataVisibility())
+      m_remapAfterConfigure = true;
+
     UIContext::instance()->add_observer(this);
   }
 
@@ -158,6 +166,11 @@ public:
 
     if (countLayers() > 0) {
       m_userDataView.configureAndSet(m_layer->userData(), g_window->propertiesGrid());
+      if (m_remapAfterConfigure) {
+        remapWindow();
+        centerWindow();
+        m_remapAfterConfigure = false;
+      }
     }
 
     updateFromLayer();
@@ -463,6 +476,13 @@ private:
       m_userDataView.setVisible(false, false);
     }
 
+    bool uuidVisible = m_document && m_document->sprite() && m_document->sprite()->useLayerUuids();
+    uuidLabel()->setVisible(uuidVisible);
+    uuid()->setVisible(uuidVisible);
+
+    if (uuidVisible)
+      uuid()->setText(m_layer ? base::convert_to<std::string>(m_layer->uuid()) : std::string());
+
     if (tileset()->isVisible() != tilemapVisibility) {
       tileset()->setVisible(tilemapVisibility);
       tileset()->parent()->layout();
@@ -476,16 +496,17 @@ private:
   view::RealRange m_range;
   bool m_selfUpdate = false;
   UserDataView m_userDataView;
+  bool m_remapAfterConfigure = false;
 };
 
-LayerPropertiesCommand::LayerPropertiesCommand()
-  : Command(CommandId::LayerProperties(), CmdRecordableFlag)
+LayerPropertiesCommand::LayerPropertiesCommand() : Command(CommandId::LayerProperties())
 {
 }
 
 bool LayerPropertiesCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable | ContextFlags::HasActiveLayer);
+  return context->isUIAvailable() &&
+         context->checkFlags(ContextFlags::ActiveDocumentIsWritable | ContextFlags::HasActiveLayer);
 }
 
 void LayerPropertiesCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_layer_visibility.cpp b/src/app/commands/cmd_layer_visibility.cpp
index e9572966b..c812b03b1 100644
--- a/src/app/commands/cmd_layer_visibility.cpp
+++ b/src/app/commands/cmd_layer_visibility.cpp
@@ -12,7 +12,6 @@
 #include "app/commands/command.h"
 #include "app/context_access.h"
 #include "app/modules/gui.h"
-#include "doc/image.h"
 #include "doc/layer.h"
 
 namespace app {
@@ -29,8 +28,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-LayerVisibilityCommand::LayerVisibilityCommand()
-  : Command(CommandId::LayerVisibility(), CmdRecordableFlag)
+LayerVisibilityCommand::LayerVisibilityCommand() : Command(CommandId::LayerVisibility())
 {
 }
 
diff --git a/src/app/commands/cmd_link_cels.cpp b/src/app/commands/cmd_link_cels.cpp
index 1baaef7a8..4d46093d9 100644
--- a/src/app/commands/cmd_link_cels.cpp
+++ b/src/app/commands/cmd_link_cels.cpp
@@ -18,7 +18,6 @@
 #include "app/ui/status_bar.h"
 #include "doc/cel.h"
 #include "doc/layer.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -31,7 +30,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-LinkCelsCommand::LinkCelsCommand() : Command(CommandId::LinkCels(), CmdRecordableFlag)
+LinkCelsCommand::LinkCelsCommand() : Command(CommandId::LinkCels())
 {
 }
 
@@ -88,7 +87,7 @@ void LinkCelsCommand::onExecute(Context* context)
     tx.commit();
   }
 
-  if (nonEditableLayers)
+  if (context->isUIAvailable() && nonEditableLayers)
     StatusBar::instance()->showTip(1000, Strings::statusbar_tips_locked_layers());
 
   update_screen_for_document(document);
diff --git a/src/app/commands/cmd_load_mask.cpp b/src/app/commands/cmd_load_mask.cpp
index 077ced661..387c766c8 100644
--- a/src/app/commands/cmd_load_mask.cpp
+++ b/src/app/commands/cmd_load_mask.cpp
@@ -26,6 +26,7 @@ namespace app {
 
 class LoadMaskCommand : public Command {
   std::string m_filename;
+  bool m_ui = true;
 
 public:
   LoadMaskCommand();
@@ -36,13 +37,16 @@ protected:
   void onExecute(Context* context) override;
 };
 
-LoadMaskCommand::LoadMaskCommand() : Command(CommandId::LoadMask(), CmdRecordableFlag)
+LoadMaskCommand::LoadMaskCommand() : Command(CommandId::LoadMask())
 {
-  m_filename = "";
 }
 
 void LoadMaskCommand::onLoadParams(const Params& params)
 {
+  if (params.has_param("ui"))
+    m_ui = params.get_as<bool>("ui");
+  else
+    m_ui = true;
   m_filename = params.get("filename");
 }
 
@@ -55,7 +59,7 @@ void LoadMaskCommand::onExecute(Context* context)
 {
   const ContextReader reader(context);
 
-  if (context->isUIAvailable()) {
+  if (context->isUIAvailable() && m_ui) {
     base::paths exts = { "msk" };
     base::paths selectedFilename;
     if (!app::show_file_selector(Strings::load_selection_title(),
@@ -70,7 +74,8 @@ void LoadMaskCommand::onExecute(Context* context)
 
   std::unique_ptr<Mask> mask(load_msk_file(m_filename.c_str()));
   if (!mask) {
-    ui::Alert::show(Strings::alerts_error_loading_file(m_filename));
+    if (context->isUIAvailable())
+      ui::Alert::show(Strings::alerts_error_loading_file(m_filename));
     return;
   }
 
diff --git a/src/app/commands/cmd_load_palette.cpp b/src/app/commands/cmd_load_palette.cpp
index 6d42d7174..f346aa701 100644
--- a/src/app/commands/cmd_load_palette.cpp
+++ b/src/app/commands/cmd_load_palette.cpp
@@ -37,14 +37,19 @@ protected:
 private:
   std::string m_preset;
   std::string m_filename;
+  bool m_ui = true;
 };
 
-LoadPaletteCommand::LoadPaletteCommand() : Command(CommandId::LoadPalette(), CmdRecordableFlag)
+LoadPaletteCommand::LoadPaletteCommand() : Command(CommandId::LoadPalette())
 {
 }
 
 void LoadPaletteCommand::onLoadParams(const Params& params)
 {
+  if (params.has_param("ui"))
+    m_ui = params.get_as<bool>("ui");
+  else
+    m_ui = true;
   m_preset = params.get("preset");
   m_filename = params.get("filename");
 }
@@ -58,20 +63,20 @@ void LoadPaletteCommand::onExecute(Context* context)
     if (!base::is_file(filename))
       filename = get_preset_palette_filename(m_preset, ".gpl");
   }
-  else if (!m_filename.empty()) {
-    filename = m_filename;
-  }
-  else if (context->isUIAvailable()) {
-    base::paths exts = get_readable_palette_extensions();
+  else if (context->isUIAvailable() && m_ui) {
+    const base::paths exts = get_readable_palette_extensions();
     base::paths filenames;
     if (app::show_file_selector(Strings::load_palette_title(),
-                                "",
+                                m_filename,
                                 exts,
                                 FileSelectorType::Open,
                                 filenames)) {
       filename = filenames.front();
     }
   }
+  else if (!m_filename.empty()) {
+    filename = m_filename;
+  }
 
   // Do nothing
   if (filename.empty())
diff --git a/src/app/commands/cmd_mask_all.cpp b/src/app/commands/cmd_mask_all.cpp
index 8dba4d296..c5876ed45 100644
--- a/src/app/commands/cmd_mask_all.cpp
+++ b/src/app/commands/cmd_mask_all.cpp
@@ -29,7 +29,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-MaskAllCommand::MaskAllCommand() : Command(CommandId::MaskAll(), CmdRecordableFlag)
+MaskAllCommand::MaskAllCommand() : Command(CommandId::MaskAll())
 {
 }
 
diff --git a/src/app/commands/cmd_mask_by_color.cpp b/src/app/commands/cmd_mask_by_color.cpp
index b3290ec3b..ff94ef176 100644
--- a/src/app/commands/cmd_mask_by_color.cpp
+++ b/src/app/commands/cmd_mask_by_color.cpp
@@ -15,7 +15,6 @@
 #include "app/color_utils.h"
 #include "app/commands/command.h"
 #include "app/commands/new_params.h"
-#include "app/console.h"
 #include "app/context.h"
 #include "app/context_access.h"
 #include "app/doc.h"
@@ -26,9 +25,6 @@
 #include "app/ui/color_bar.h"
 #include "app/ui/color_button.h"
 #include "app/ui/selection_mode_field.h"
-#include "base/chrono.h"
-#include "base/convert_to.h"
-#include "base/scoped_value.h"
 #include "doc/image.h"
 #include "doc/mask.h"
 #include "doc/sprite.h"
@@ -203,8 +199,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-MaskByColorCommand::MaskByColorCommand()
-  : CommandWithNewParams(CommandId::MaskByColor(), CmdUIOnlyFlag)
+MaskByColorCommand::MaskByColorCommand() : CommandWithNewParams(CommandId::MaskByColor())
 {
 }
 
diff --git a/src/app/commands/cmd_mask_content.cpp b/src/app/commands/cmd_mask_content.cpp
index d6ba1fd0c..fca54afb5 100644
--- a/src/app/commands/cmd_mask_content.cpp
+++ b/src/app/commands/cmd_mask_content.cpp
@@ -25,7 +25,6 @@
 #include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/mask.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -38,7 +37,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-MaskContentCommand::MaskContentCommand() : Command(CommandId::MaskContent(), CmdRecordableFlag)
+MaskContentCommand::MaskContentCommand() : Command(CommandId::MaskContent())
 {
 }
 
@@ -87,9 +86,11 @@ void MaskContentCommand::onExecute(Context* context)
   }
 
   // Select marquee tool
-  if (tools::Tool* tool = App::instance()->toolBox()->getToolById(
-        tools::WellKnownTools::RectangularMarquee)) {
-    ToolBar::instance()->selectTool(tool);
+  if (context->isUIAvailable()) {
+    if (tools::Tool* tool = App::instance()->toolBox()->getToolById(
+          tools::WellKnownTools::RectangularMarquee)) {
+      ToolBar::instance()->selectTool(tool);
+    }
   }
 
   update_screen_for_document(document);
diff --git a/src/app/commands/cmd_merge_down_layer.cpp b/src/app/commands/cmd_merge_down_layer.cpp
index e05c95ab1..a86933f88 100644
--- a/src/app/commands/cmd_merge_down_layer.cpp
+++ b/src/app/commands/cmd_merge_down_layer.cpp
@@ -13,16 +13,12 @@
 #include "app/cmd/flatten_layers.h"
 #include "app/commands/command.h"
 #include "app/context_access.h"
-#include "app/doc.h"
-#include "app/doc_api.h"
 #include "app/doc_range.h"
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
 #include "app/tx.h"
-#include "doc/blend_internals.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
-#include "ui/ui.h"
 
 namespace app {
 
@@ -35,8 +31,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-MergeDownLayerCommand::MergeDownLayerCommand()
-  : Command(CommandId::MergeDownLayer(), CmdRecordableFlag)
+MergeDownLayerCommand::MergeDownLayerCommand() : Command(CommandId::MergeDownLayer())
 {
 }
 
diff --git a/src/app/commands/cmd_modify_selection.cpp b/src/app/commands/cmd_modify_selection.cpp
index 6d70fb546..6c45c3821 100644
--- a/src/app/commands/cmd_modify_selection.cpp
+++ b/src/app/commands/cmd_modify_selection.cpp
@@ -18,16 +18,12 @@
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
 #include "app/tx.h"
-#include "base/convert_to.h"
 #include "doc/algorithm/modify_selection.h"
 #include "doc/brush_type.h"
 #include "doc/mask.h"
-#include "filters/neighboring_pixels.h"
 
 #include "modify_selection.xml.h"
 
-#include <limits>
-
 namespace app {
 
 using namespace doc;
@@ -52,13 +48,15 @@ private:
   Modifier m_modifier;
   int m_quantity;
   doc::BrushType m_brushType;
+  bool m_ui;
 };
 
 ModifySelectionCommand::ModifySelectionCommand()
-  : Command(CommandId::ModifySelection(), CmdRecordableFlag)
+  : Command(CommandId::ModifySelection())
   , m_modifier(Modifier::Expand)
   , m_quantity(0)
   , m_brushType(doc::kCircleBrushType)
+  , m_ui(true)
 {
 }
 
@@ -80,6 +78,11 @@ void ModifySelectionCommand::onLoadParams(const Params& params)
     m_brushType = doc::kCircleBrushType;
   else if (brush == "square")
     m_brushType = doc::kSquareBrushType;
+
+  if (params.has_param("ui"))
+    m_ui = params.get_as<bool>("ui");
+  else
+    m_ui = true;
 }
 
 bool ModifySelectionCommand::onEnabled(Context* context)
@@ -92,7 +95,7 @@ void ModifySelectionCommand::onExecute(Context* context)
   int quantity = m_quantity;
   doc::BrushType brush = m_brushType;
 
-  if (quantity == 0) {
+  if (quantity == 0 && m_ui && context->isUIAvailable()) {
     Preferences& pref = Preferences::instance();
     ModifySelectionWindow window;
 
diff --git a/src/app/commands/cmd_move_cel.cpp b/src/app/commands/cmd_move_cel.cpp
index 7324ec51a..deef6f985 100644
--- a/src/app/commands/cmd_move_cel.cpp
+++ b/src/app/commands/cmd_move_cel.cpp
@@ -12,7 +12,6 @@
 #include "app/commands/command.h"
 #include "app/context_access.h"
 #include "app/ui/timeline/timeline.h"
-#include "ui/base.h"
 
 namespace app {
 
@@ -25,13 +24,13 @@ protected:
   void onExecute(Context* context) override;
 };
 
-MoveCelCommand::MoveCelCommand() : Command(CommandId::MoveCel(), CmdUIOnlyFlag)
+MoveCelCommand::MoveCelCommand() : Command(CommandId::MoveCel())
 {
 }
 
 bool MoveCelCommand::onEnabled(Context* context)
 {
-  return App::instance()->timeline()->isMovingCel();
+  return context->isUIAvailable() && App::instance()->timeline()->isMovingCel();
 }
 
 void MoveCelCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_move_mask.cpp b/src/app/commands/cmd_move_mask.cpp
index 55292cb6f..d78822511 100644
--- a/src/app/commands/cmd_move_mask.cpp
+++ b/src/app/commands/cmd_move_mask.cpp
@@ -18,19 +18,15 @@
 #include "app/doc_api.h"
 #include "app/i18n/strings.h"
 #include "app/modules/gui.h"
-#include "app/pref/preferences.h"
 #include "app/tx.h"
 #include "app/ui/doc_view.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui_context.h"
-#include "base/convert_to.h"
 #include "doc/mask.h"
-#include "doc/sprite.h"
-#include "ui/view.h"
 
 namespace app {
 
-MoveMaskCommand::MoveMaskCommand() : Command(CommandId::MoveMask(), CmdRecordableFlag)
+MoveMaskCommand::MoveMaskCommand() : Command(CommandId::MoveMask())
 {
 }
 
diff --git a/src/app/commands/cmd_new_brush.cpp b/src/app/commands/cmd_new_brush.cpp
index 1018e57b4..50994ddb3 100644
--- a/src/app/commands/cmd_new_brush.cpp
+++ b/src/app/commands/cmd_new_brush.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -52,13 +52,13 @@ private:
   void selectPencilTool();
 };
 
-NewBrushCommand::NewBrushCommand() : Command(CommandId::NewBrush(), CmdUIOnlyFlag)
+NewBrushCommand::NewBrushCommand() : Command(CommandId::NewBrush())
 {
 }
 
 bool NewBrushCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
 }
 
 void NewBrushCommand::onExecute(Context* context)
@@ -164,10 +164,10 @@ void NewBrushCommand::createBrush(const Site& site, const Mask* mask)
   params.set("change", "custom");
   params.set("slot", base::convert_to<std::string>(slot).c_str());
   KeyPtr key = KeyboardShortcuts::instance()->command(CommandId::ChangeBrush(), params);
-  if (key && !key->accels().empty()) {
+  if (key && !key->shortcuts().empty()) {
     std::string tooltip;
     tooltip += Strings::new_brush_shortcut() + " ";
-    tooltip += key->accels().front().toString();
+    tooltip += key->shortcuts().front().toString();
     StatusBar::instance()->showTip(2000, tooltip);
   }
 }
diff --git a/src/app/commands/cmd_new_file.cpp b/src/app/commands/cmd_new_file.cpp
index ea4fabfa8..4b2421d0d 100644
--- a/src/app/commands/cmd_new_file.cpp
+++ b/src/app/commands/cmd_new_file.cpp
@@ -64,7 +64,7 @@ protected:
 // static
 int NewFileCommand::g_spriteCounter = 0;
 
-NewFileCommand::NewFileCommand() : CommandWithNewParams(CommandId::NewFile(), CmdRecordableFlag)
+NewFileCommand::NewFileCommand() : CommandWithNewParams(CommandId::NewFile())
 {
 }
 
diff --git a/src/app/commands/cmd_new_frame.cpp b/src/app/commands/cmd_new_frame.cpp
index 58af3358c..a9714b2f4 100644
--- a/src/app/commands/cmd_new_frame.cpp
+++ b/src/app/commands/cmd_new_frame.cpp
@@ -10,28 +10,18 @@
 #endif
 
 #include "app/app.h"
-#include "app/color.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
-#include "app/console.h"
 #include "app/context_access.h"
 #include "app/doc_api.h"
 #include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/tx.h"
-#include "app/ui/doc_view.h"
-#include "app/ui/editor/editor.h"
 #include "app/ui/main_window.h"
 #include "app/ui/status_bar.h"
 #include "app/ui/timeline/timeline.h"
-#include "app/ui_context.h"
-#include "doc/cel.h"
-#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
-#include "ui/ui.h"
-
-#include <stdexcept>
 
 namespace app {
 
@@ -57,7 +47,7 @@ private:
   Content m_content;
 };
 
-NewFrameCommand::NewFrameCommand() : Command(CommandId::NewFrame(), CmdRecordableFlag)
+NewFrameCommand::NewFrameCommand() : Command(CommandId::NewFrame())
 {
 }
 
diff --git a/src/app/commands/cmd_new_frame_tag.cpp b/src/app/commands/cmd_new_frame_tag.cpp
index a107ad8ba..9d84e09f6 100644
--- a/src/app/commands/cmd_new_frame_tag.cpp
+++ b/src/app/commands/cmd_new_frame_tag.cpp
@@ -9,7 +9,6 @@
   #include "config.h"
 #endif
 
-#include "app/app.h"
 #include "app/cmd/add_tag.h"
 #include "app/commands/command.h"
 #include "app/context.h"
@@ -18,8 +17,6 @@
 #include "app/ui/tag_window.h"
 #include "doc/tag.h"
 
-#include <stdexcept>
-
 namespace app {
 
 using namespace doc;
@@ -33,14 +30,14 @@ protected:
   void onExecute(Context* context) override;
 };
 
-NewFrameTagCommand::NewFrameTagCommand() : Command(CommandId::NewFrameTag(), CmdRecordableFlag)
+NewFrameTagCommand::NewFrameTagCommand() : Command(CommandId::NewFrameTag())
 {
 }
 
 bool NewFrameTagCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
-                             ContextFlags::HasActiveSprite);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
+                                                         ContextFlags::HasActiveSprite);
 }
 
 void NewFrameTagCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_new_layer.cpp b/src/app/commands/cmd_new_layer.cpp
index 14593487e..2a610996f 100644
--- a/src/app/commands/cmd_new_layer.cpp
+++ b/src/app/commands/cmd_new_layer.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -21,9 +21,7 @@
 #include "app/console.h"
 #include "app/context_access.h"
 #include "app/doc_api.h"
-#include "app/find_widget.h"
 #include "app/i18n/strings.h"
-#include "app/load_widget.h"
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
 #include "app/restore_visible_layers.h"
@@ -48,7 +46,6 @@
 #include "new_layer.xml.h"
 
 #include <algorithm>
-#include <cstdlib>
 #include <cstring>
 #include <string>
 
@@ -99,7 +96,7 @@ private:
   Place m_place;
 };
 
-NewLayerCommand::NewLayerCommand() : CommandWithNewParams(CommandId::NewLayer(), CmdRecordableFlag)
+NewLayerCommand::NewLayerCommand() : CommandWithNewParams(CommandId::NewLayer())
 {
 }
 
@@ -268,11 +265,15 @@ void NewLayerCommand::onExecute(Context* context)
 
     switch (m_type) {
       case Type::Layer:
-        layer = api.newLayer(parent, name);
-        if (m_place == Place::BeforeActiveLayer)
+
+        if (m_place == Place::BeforeActiveLayer) {
+          layer = api.newLayer(parent, name);
           api.restackLayerBefore(layer, parent, activeLayer);
+        }
+        else
+          layer = api.newLayerAfter(parent, name, activeLayer);
         break;
-      case Type::Group: layer = api.newGroup(parent, name); break;
+      case Type::Group: layer = api.newGroupAfter(parent, name, activeLayer); break;
       case Type::ReferenceLayer:
         layer = api.newLayer(parent, name);
         if (layer)
@@ -296,9 +297,7 @@ void NewLayerCommand::onExecute(Context* context)
           tsi = tilesetInfo.tsi;
         }
 
-        layer = new LayerTilemap(sprite, tsi);
-        layer->setName(name);
-        api.addLayer(parent, layer, parent->lastLayer());
+        layer = api.newTilemapAfter(parent, name, tsi, activeLayer);
         break;
       }
     }
@@ -320,10 +319,6 @@ void NewLayerCommand::onExecute(Context* context)
           api.restackLayerBefore(layer, sprite->root(), first);
       }
     }
-    // Move the layer above the active one.
-    else if (activeLayer && m_place == Place::AfterActiveLayer) {
-      api.restackLayerAfter(layer, activeLayer->parent(), activeLayer);
-    }
 
     // Put all selected layers inside the group
     if (m_type == Type::Group && site.inTimeline()) {
diff --git a/src/app/commands/cmd_new_sprite_from_selection.cpp b/src/app/commands/cmd_new_sprite_from_selection.cpp
index 880cb2633..7d84008de 100644
--- a/src/app/commands/cmd_new_sprite_from_selection.cpp
+++ b/src/app/commands/cmd_new_sprite_from_selection.cpp
@@ -23,8 +23,6 @@
 #include "doc/sprite.h"
 #include "fmt/format.h"
 
-#include <cstdio>
-
 namespace app {
 
 using namespace doc;
@@ -39,7 +37,7 @@ protected:
 };
 
 NewSpriteFromSelectionCommand::NewSpriteFromSelectionCommand()
-  : Command(CommandId::NewSpriteFromSelection(), CmdUIOnlyFlag)
+  : Command(CommandId::NewSpriteFromSelection())
 {
 }
 
diff --git a/src/app/commands/cmd_onionskin.cpp b/src/app/commands/cmd_onionskin.cpp
index a417f5f91..6721896d3 100644
--- a/src/app/commands/cmd_onionskin.cpp
+++ b/src/app/commands/cmd_onionskin.cpp
@@ -8,7 +8,6 @@
   #include "config.h"
 #endif
 
-#include "app/app.h"
 #include "app/commands/command.h"
 #include "app/context.h"
 #include "app/doc.h"
@@ -20,7 +19,7 @@ using namespace gfx;
 
 class ShowOnionSkinCommand : public Command {
 public:
-  ShowOnionSkinCommand() : Command(CommandId::ShowOnionSkin(), CmdUIOnlyFlag) {}
+  ShowOnionSkinCommand() : Command(CommandId::ShowOnionSkin()) {}
 
 protected:
   bool onChecked(Context* context) override
diff --git a/src/app/commands/cmd_open_browser.cpp b/src/app/commands/cmd_open_browser.cpp
index 596a25183..0fff12365 100644
--- a/src/app/commands/cmd_open_browser.cpp
+++ b/src/app/commands/cmd_open_browser.cpp
@@ -22,6 +22,7 @@ public:
   OpenBrowserCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
   std::string onGetFriendlyName() const override;
@@ -31,10 +32,15 @@ private:
   std::string m_filename;
 };
 
-OpenBrowserCommand::OpenBrowserCommand() : Command(CommandId::OpenBrowser(), CmdUIOnlyFlag)
+OpenBrowserCommand::OpenBrowserCommand() : Command(CommandId::OpenBrowser())
 {
 }
 
+bool OpenBrowserCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void OpenBrowserCommand::onLoadParams(const Params& params)
 {
   m_filename = params.get("filename");
diff --git a/src/app/commands/cmd_open_file.cpp b/src/app/commands/cmd_open_file.cpp
index 73fc54d0d..101134ec0 100644
--- a/src/app/commands/cmd_open_file.cpp
+++ b/src/app/commands/cmd_open_file.cpp
@@ -19,14 +19,12 @@
 #include "app/file/file.h"
 #include "app/file_selector.h"
 #include "app/i18n/strings.h"
-#include "app/modules/gui.h"
 #include "app/pref/preferences.h"
 #include "app/recent_files.h"
 #include "app/ui/status_bar.h"
 #include "app/ui_context.h"
 #include "app/util/open_file_job.h"
 #include "base/fs.h"
-#include "base/thread.h"
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
@@ -35,7 +33,7 @@
 namespace app {
 
 OpenFileCommand::OpenFileCommand()
-  : Command(CommandId::OpenFile(), CmdRecordableFlag)
+  : Command(CommandId::OpenFile())
   , m_ui(true)
   , m_repeatCheckbox(false)
   , m_oneFrame(false)
diff --git a/src/app/commands/cmd_open_group.cpp b/src/app/commands/cmd_open_group.cpp
index b6cea415e..b24bf5750 100644
--- a/src/app/commands/cmd_open_group.cpp
+++ b/src/app/commands/cmd_open_group.cpp
@@ -32,7 +32,7 @@ protected:
   // std::string onGetFriendlyName() const override;
 };
 
-OpenGroupCommand::OpenGroupCommand() : Command(CommandId::OpenGroup(), CmdRecordableFlag)
+OpenGroupCommand::OpenGroupCommand() : Command(CommandId::OpenGroup())
 {
 }
 
diff --git a/src/app/commands/cmd_open_in_folder.cpp b/src/app/commands/cmd_open_in_folder.cpp
index b9dd732c9..cfc800a2e 100644
--- a/src/app/commands/cmd_open_in_folder.cpp
+++ b/src/app/commands/cmd_open_in_folder.cpp
@@ -25,7 +25,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-OpenInFolderCommand::OpenInFolderCommand() : Command(CommandId::OpenInFolder(), CmdUIOnlyFlag)
+OpenInFolderCommand::OpenInFolderCommand() : Command(CommandId::OpenInFolder())
 {
 }
 
diff --git a/src/app/commands/cmd_open_script_folder.cpp b/src/app/commands/cmd_open_script_folder.cpp
index 38135939f..c6bfec94a 100644
--- a/src/app/commands/cmd_open_script_folder.cpp
+++ b/src/app/commands/cmd_open_script_folder.cpp
@@ -33,8 +33,7 @@ protected:
   void onExecute(Context* context);
 };
 
-OpenScriptFolderCommand::OpenScriptFolderCommand()
-  : Command(CommandId::OpenScriptFolder(), CmdUIOnlyFlag)
+OpenScriptFolderCommand::OpenScriptFolderCommand() : Command(CommandId::OpenScriptFolder())
 {
 }
 
diff --git a/src/app/commands/cmd_open_with_app.cpp b/src/app/commands/cmd_open_with_app.cpp
index ff1b908a4..73f2bc43d 100644
--- a/src/app/commands/cmd_open_with_app.cpp
+++ b/src/app/commands/cmd_open_with_app.cpp
@@ -25,7 +25,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-OpenWithAppCommand::OpenWithAppCommand() : Command(CommandId::OpenWithApp(), CmdUIOnlyFlag)
+OpenWithAppCommand::OpenWithAppCommand() : Command(CommandId::OpenWithApp())
 {
 }
 
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 5d2d89d8e..c54890b72 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -19,6 +19,8 @@
 #include "app/extensions.h"
 #include "app/file/file.h"
 #include "app/file_selector.h"
+#include "app/fonts/font_data.h"
+#include "app/fonts/fonts.h"
 #include "app/i18n/strings.h"
 #include "app/ini_file.h"
 #include "app/launcher.h"
@@ -162,7 +164,11 @@ class OptionsWindow : public app::gen::Options {
 
   class LangItem : public ListItem {
   public:
-    LangItem(const LangInfo& langInfo) : ListItem(langInfo.displayName), m_langInfo(langInfo) {}
+    LangItem(const LangInfo& langInfo)
+      : ListItem(fmt::format("{} ({})", langInfo.displayName, langInfo.id))
+      , m_langInfo(langInfo)
+    {
+    }
     const std::string& langId() const { return m_langInfo.id; }
 
   private:
@@ -268,8 +274,21 @@ public:
   {
     sectionListbox()->Change.connect([this] { onChangeSection(); });
 
-    // Theme variants
+    // Theme variants/fonts.
     fillThemeVariants();
+    fillThemeFonts();
+    updateFontPreviews();
+
+    // Language change
+    language()->Change.connect([this] { onLanguageChange(); });
+    fontWarning()->Click.connect([this] {
+      for (auto item : sectionListbox()->children()) {
+        if (static_cast<ListItem*>(item)->getValue() == kSectionThemeId) {
+          sectionListbox()->selectChild(item);
+          break;
+        }
+      }
+    });
 
     // Recent files
     clearRecentFiles()->Click.connect([this] { onClearRecentFiles(); });
@@ -441,6 +460,18 @@ public:
     // Undo preferences
     limitUndo()->Click.connect([this] { onLimitUndoCheck(); });
 
+    // Theme Custom Font
+    customThemeFont()->Click.connect([this] {
+      auto* theme = skin::SkinTheme::get(this);
+      onSwitchCustomFontCheckBox(customThemeFont(), themeFont(), theme->getDefaultFontInfo());
+    });
+    customMiniFont()->Click.connect([this] {
+      auto* theme = skin::SkinTheme::get(this);
+      onSwitchCustomFontCheckBox(customMiniFont(), themeMiniFont(), theme->getMiniFontInfo());
+    });
+    themeFont()->FontChange.connect([this] { updateFontPreviews(); });
+    themeMiniFont()->FontChange.connect([this] { updateFontPreviews(); });
+
     // Theme buttons
     themeList()->Change.connect([this] { onThemeChange(); });
     themeList()->DoubleClickItem.connect([this] { onSelectTheme(); });
@@ -454,6 +485,9 @@ public:
     uninstallExtension()->Click.connect([this] { onUninstallExtension(); });
     openExtensionFolder()->Click.connect([this] { onOpenExtensionFolder(); });
 
+    // Aseprite Format preferences
+    celFormat()->Change.connect([this] { onCelFormatChange(); });
+
     // Reset checkboxes
 
     // Prevent the user from clicking "Reset" if they don't have anything selected.
@@ -621,6 +655,7 @@ public:
     }
 #endif
 
+    useSelectionToolLoop()->setSelected(m_pref.experimental.useSelectionToolLoop());
     flashLayer()->setSelected(m_pref.experimental.flashLayer());
     nonactiveLayersOpacity()->setValue(m_pref.experimental.nonactiveLayersOpacity());
 
@@ -662,10 +697,10 @@ public:
 
     onChangeBgScope();
     onChangeGridScope();
-    sectionListbox()->selectIndex(m_curSection);
 
     // Aseprite format preferences
     celFormat()->setSelectedItemIndex(int(m_pref.asepriteFormat.celFormat()));
+    onCelFormatChange();
   }
 
   bool ok() { return (closer() == buttonOk()); }
@@ -860,6 +895,7 @@ public:
     m_pref.asepriteFormat.celFormat(gen::CelContentFormat(celFormat()->getSelectedItemIndex()));
 
     // Experimental features
+    m_pref.experimental.useSelectionToolLoop(useSelectionToolLoop()->isSelected());
     m_pref.experimental.flashLayer(flashLayer()->isSelected());
     m_pref.experimental.nonactiveLayersOpacity(nonactiveLayersOpacity()->getValue());
     m_pref.quantization.rgbmapAlgorithm(m_rgbmapAlgorithmSelector.algorithm());
@@ -902,6 +938,25 @@ public:
     ui::set_use_native_cursors(m_pref.cursor.useNativeCursor());
     ui::set_mouse_cursor_scale(m_pref.cursor.cursorScale());
 
+    // Change theme font
+    bool reset_theme = false;
+    {
+      const FontInfo fontInfo = (customThemeFont()->isSelected() ? themeFont()->info() :
+                                                                   FontInfo());
+      const FontInfo miniFontInfo = (customMiniFont()->isSelected() ? themeMiniFont()->info() :
+                                                                      FontInfo());
+
+      auto fontStr = base::convert_to<std::string>(fontInfo);
+      auto miniFontStr = base::convert_to<std::string>(miniFontInfo);
+
+      if (m_pref.theme.font() != fontStr || m_pref.theme.miniFont() != miniFontStr) {
+        m_pref.theme.font(fontStr);
+        m_pref.theme.miniFont(miniFontStr);
+
+        reset_theme = true;
+      }
+    }
+
     bool reset_screen = false;
     const int newScreenScale = base::convert_to<int>(screenScale()->getValue());
     if (newScreenScale != m_pref.general.screenScale()) {
@@ -912,10 +967,13 @@ public:
     const int newUIScale = base::convert_to<int>(uiScale()->getValue());
     if (newUIScale != m_pref.general.uiScale()) {
       m_pref.general.uiScale(newUIScale);
-      ui::set_theme(ui::get_theme(), newUIScale);
+      reset_theme = true;
       reset_screen = true;
     }
 
+    if (reset_theme)
+      ui::set_theme(ui::get_theme(), newUIScale);
+
 #ifdef ENABLE_DEVMODE
     const bool newGpuAccel = gpuAcceleration()->isSelected();
     if (newGpuAccel != m_pref.general.gpuAcceleration()) {
@@ -997,7 +1055,22 @@ public:
     return true;
   }
 
+protected:
+  void onOpen(Event& evt) override
+  {
+    sectionListbox()->selectIndex(m_curSection);
+    app::gen::Options::onOpen(evt);
+  }
+
 private:
+  void onInitTheme(InitThemeEvent& ev) override
+  {
+    app::gen::Options::onInitTheme(ev);
+
+    fontPreview()->setFont(m_font);
+    miniFontPreview()->setFont(m_miniFont);
+  }
+
   void fillThemeVariants()
   {
     ButtonSet* list = nullptr;
@@ -1036,6 +1109,41 @@ private:
     themeVariants()->initTheme();
   }
 
+  void fillThemeFonts()
+  {
+    auto& pref = Preferences::instance();
+    const FontInfo fontInfo = base::convert_to<FontInfo>(pref.theme.font());
+    const FontInfo miniInfo = base::convert_to<FontInfo>(pref.theme.miniFont());
+
+    customThemeFont()->setSelected(fontInfo.isValid());
+    customMiniFont()->setSelected(miniInfo.isValid());
+
+    themeFont()->setEnabled(fontInfo.isValid());
+    themeMiniFont()->setEnabled(miniInfo.isValid());
+
+    themeFont()->setInfo(fontInfo, FontEntry::From::Init);
+    themeMiniFont()->setInfo(miniInfo, FontEntry::From::Init);
+  }
+
+  void onSwitchCustomFontCheckBox(CheckBox* fontCheckBox, FontEntry* fontEntry, const FontInfo& fi)
+  {
+    const bool state = fontCheckBox->isSelected();
+    fontEntry->setEnabled(state);
+    fontEntry->setInfo(fi, FontEntry::From::Init);
+  }
+
+  void updateFontPreviews()
+  {
+    m_font = Fonts::instance()->fontFromInfo(themeFont()->info());
+    m_miniFont = Fonts::instance()->fontFromInfo(themeMiniFont()->info());
+    if (!m_miniFont)
+      m_miniFont = skin::SkinTheme::get(this)->getMiniFont();
+
+    fontPreview()->setFont(m_font);
+    miniFontPreview()->setFont(m_miniFont);
+    layout();
+  }
+
   void fillExtensionsCombobox(ui::ComboBox* combobox, const std::string& defExt)
   {
     base::paths exts = get_writable_extensions();
@@ -1268,6 +1376,19 @@ private:
     panel()->showChild(findChild(item->getValue().c_str()));
   }
 
+  void onLanguageChange()
+  {
+    auto* item = dynamic_cast<const LangItem*>(language()->getSelectedItem());
+    if (!item)
+      return;
+    const std::string lang = item->langId();
+    const bool state = (lang == "ar" || lang == "ja" || lang == "ko" || lang == "th" ||
+                        lang == "yue_Hant" || lang == "zh_Hans" || lang == "zh_Hant");
+    fontWarningFiller()->setVisible(state);
+    fontWarning()->setVisible(state);
+    layout();
+  }
+
   void onClearRecentFiles() { App::instance()->recentFiles()->clear(); }
 
   void onColorManagement()
@@ -1922,6 +2043,13 @@ private:
       item->openFolder();
   }
 
+  void onCelFormatChange()
+  {
+    auto format = gen::CelContentFormat(celFormat()->getSelectedItemIndex());
+    celFormatWarning()->setVisible(format == gen::CelContentFormat::RAW_IMAGE);
+    layout();
+  }
+
   void onCursorColorType()
   {
     switch (cursorColorType()->getSelectedItemIndex()) {
@@ -2060,6 +2188,8 @@ private:
   BestFitCriteriaSelector m_bestFitCriteriaSelector;
   ButtonSet* m_themeVars = nullptr;
   SamplingSelector* m_samplingSelector = nullptr;
+  text::FontRef m_font;
+  text::FontRef m_miniFont;
 };
 
 class OptionsCommand : public Command {
@@ -2074,7 +2204,7 @@ private:
   std::string m_installExtensionFilename;
 };
 
-OptionsCommand::OptionsCommand() : Command(CommandId::Options(), CmdUIOnlyFlag)
+OptionsCommand::OptionsCommand() : Command(CommandId::Options())
 {
   Preferences& preferences = Preferences::instance();
 
diff --git a/src/app/commands/cmd_palette_editor.cpp b/src/app/commands/cmd_palette_editor.cpp
index 3c2eb3fa1..91047cbb3 100644
--- a/src/app/commands/cmd_palette_editor.cpp
+++ b/src/app/commands/cmd_palette_editor.cpp
@@ -11,6 +11,7 @@
 
 #include "app/commands/command.h"
 #include "app/commands/params.h"
+#include "app/context.h"
 #include "app/i18n/strings.h"
 #include "app/ui/color_bar.h"
 #include "base/replace_string.h"
@@ -23,6 +24,7 @@ public:
   PaletteEditorCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   void onLoadParams(const Params& params) override;
   bool onChecked(Context* context) override;
   void onExecute(Context* context) override;
@@ -34,14 +36,18 @@ private:
   bool m_background;
 };
 
-PaletteEditorCommand::PaletteEditorCommand()
-  : Command(CommandId::PaletteEditor(), CmdRecordableFlag)
+PaletteEditorCommand::PaletteEditorCommand() : Command(CommandId::PaletteEditor())
 {
   m_edit = true;
   m_popup = false;
   m_background = false;
 }
 
+bool PaletteEditorCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void PaletteEditorCommand::onLoadParams(const Params& params)
 {
   m_edit = (params.empty() || params.get("edit") == "switch" ||
diff --git a/src/app/commands/cmd_palette_size.cpp b/src/app/commands/cmd_palette_size.cpp
index 86e0e7a0b..79e2966ef 100644
--- a/src/app/commands/cmd_palette_size.cpp
+++ b/src/app/commands/cmd_palette_size.cpp
@@ -15,7 +15,6 @@
 #include "app/context_access.h"
 #include "app/tx.h"
 #include "doc/palette.h"
-#include "doc/sprite.h"
 
 #include "palette_size.xml.h"
 
@@ -33,17 +32,21 @@ protected:
   void onExecute(Context* context) override;
 
 private:
-  int m_size;
+  int m_size = 0;
+  bool m_ui = true;
 };
 
-PaletteSizeCommand::PaletteSizeCommand() : Command(CommandId::PaletteSize(), CmdRecordableFlag)
+PaletteSizeCommand::PaletteSizeCommand() : Command(CommandId::PaletteSize())
 {
-  m_size = 0;
 }
 
 void PaletteSizeCommand::onLoadParams(const Params& params)
 {
   m_size = params.get_as<int>("size");
+  if (params.has_param("ui"))
+    m_ui = params.get_as<bool>("ui");
+  else
+    m_ui = true;
 }
 
 bool PaletteSizeCommand::onEnabled(Context* context)
@@ -59,7 +62,7 @@ void PaletteSizeCommand::onExecute(Context* context)
   Palette palette(*reader.palette());
   int ncolors = (m_size != 0 ? m_size : palette.size());
 
-  if (m_size == 0 && context->isUIAvailable()) {
+  if (m_size == 0 && m_ui && context->isUIAvailable()) {
     app::gen::PaletteSize window;
     window.colors()->setTextf("%d", ncolors);
     window.openWindowInForeground();
diff --git a/src/app/commands/cmd_paste.cpp b/src/app/commands/cmd_paste.cpp
index 77762e78b..0604a5ebf 100644
--- a/src/app/commands/cmd_paste.cpp
+++ b/src/app/commands/cmd_paste.cpp
@@ -31,7 +31,7 @@ private:
   std::unique_ptr<gfx::Point> m_position;
 };
 
-PasteCommand::PasteCommand() : Command(CommandId::Paste(), CmdUIOnlyFlag)
+PasteCommand::PasteCommand() : Command(CommandId::Paste())
 {
 }
 
diff --git a/src/app/commands/cmd_paste_text.cpp b/src/app/commands/cmd_paste_text.cpp
index d67175657..d39f03c52 100644
--- a/src/app/commands/cmd_paste_text.cpp
+++ b/src/app/commands/cmd_paste_text.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -10,21 +10,27 @@
 #endif
 
 #include "app/app.h"
+#include "app/cmd/copy_region.h"
+#include "app/cmd/patch_cel.h"
+#include "app/color_utils.h"
 #include "app/commands/command.h"
+#include "app/commands/commands.h"
+#include "app/commands/new_params.h"
 #include "app/console.h"
 #include "app/context.h"
+#include "app/context_access.h"
 #include "app/pref/preferences.h"
-#include "app/ui/drop_down_button.h"
+#include "app/site.h"
+#include "app/tx.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/timeline/timeline.h"
 #include "app/util/render_text.h"
-#include "base/fs.h"
-#include "base/string.h"
 #include "doc/image.h"
 #include "doc/image_ref.h"
 #include "render/dithering.h"
-#include "render/ordered_dither.h"
 #include "render/quantization.h"
+#include "render/rasterize.h"
+#include "render/render.h"
 #include "ui/manager.h"
 
 #include "paste_text.xml.h"
@@ -33,7 +39,17 @@ namespace app {
 
 static std::string last_text_used;
 
-class PasteTextCommand : public Command {
+struct PasteTextParams : public NewParams {
+  Param<bool> ui{ this, true, "ui" };
+  Param<app::Color> color{ this, app::Color::fromMask(), "color" };
+  Param<std::string> text{ this, "", "text" };
+  Param<std::string> fontName{ this, "Aseprite", "fontName" };
+  Param<double> fontSize{ this, 6, "fontSize" };
+  Param<int> x{ this, 0, "x" };
+  Param<int> y{ this, 0, "y" };
+};
+
+class PasteTextCommand : public CommandWithNewParams<PasteTextParams> {
 public:
   PasteTextCommand();
 
@@ -42,7 +58,7 @@ protected:
   void onExecute(Context* ctx) override;
 };
 
-PasteTextCommand::PasteTextCommand() : Command(CommandId::PasteText(), CmdUIOnlyFlag)
+PasteTextCommand::PasteTextCommand() : CommandWithNewParams(CommandId::PasteText())
 {
 }
 
@@ -65,55 +81,104 @@ public:
 
 void PasteTextCommand::onExecute(Context* ctx)
 {
-  auto editor = Editor::activeEditor();
-  if (editor == nullptr)
-    return;
+  const bool ui = params().ui() && ctx->isUIAvailable();
 
-  Preferences& pref = Preferences::instance();
   FontInfo fontInfo = FontInfo::getFromPreferences();
-  PasteTextWindow window(fontInfo, pref.colorBar.fgColor());
+  Preferences& pref = Preferences::instance();
 
-  window.userText()->setText(last_text_used);
+  std::string text;
+  app::Color color;
+  ui::Paint paint;
 
-  window.openWindowInForeground();
-  if (window.closer() != window.ok())
-    return;
+  if (ui) {
+    PasteTextWindow window(fontInfo, pref.colorBar.fgColor());
 
-  last_text_used = window.userText()->text();
+    window.userText()->setText(params().text().empty() ? last_text_used : params().text());
 
-  fontInfo = window.fontInfo();
-  fontInfo.updatePreferences();
+    window.openWindowInForeground();
+    if (window.closer() != window.ok())
+      return;
+
+    text = window.userText()->text();
+    last_text_used = text;
+    color = window.fontColor()->getColor();
+    paint = window.fontFace()->paint();
+
+    fontInfo = window.fontInfo();
+    fontInfo.updatePreferences();
+  }
+  else {
+    text = params().text();
+    color = params().color.isSet() ? params().color() : pref.colorBar.fgColor();
+
+    FontInfo info(FontInfo::Type::Unknown, params().fontName(), params().fontSize());
+    fontInfo = info;
+  }
 
   try {
-    std::string text = window.userText()->text();
-    app::Color color = window.fontColor()->getColor();
+    paint.color(color_utils::color_for_ui(color));
 
-    doc::ImageRef image = render_text(
-      fontInfo,
-      text,
-      gfx::rgba(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()));
-    if (image) {
-      Sprite* sprite = editor->sprite();
-      if (image->pixelFormat() != sprite->pixelFormat()) {
-        RgbMap* rgbmap = sprite->rgbMap(editor->frame());
-        image.reset(render::convert_pixel_format(image.get(),
-                                                 NULL,
-                                                 sprite->pixelFormat(),
-                                                 render::Dithering(),
-                                                 rgbmap,
-                                                 sprite->palette(editor->frame()),
-                                                 false,
-                                                 sprite->transparentColor()));
-      }
+    doc::ImageRef image = render_text(fontInfo, text, paint);
+    if (!image)
+      return;
 
-      // TODO we don't support pasting text in multiple cels at the
-      //      moment, so we clear the range here (same as in
-      //      clipboard::paste())
-      if (auto timeline = App::instance()->timeline())
-        timeline->clearAndInvalidateRange();
-
-      editor->pasteImage(image.get());
+    auto site = ctx->activeSite();
+    Sprite* sprite = site.sprite();
+    if (image->pixelFormat() != sprite->pixelFormat()) {
+      RgbMap* rgbmap = sprite->rgbMap(site.frame());
+      image.reset(render::convert_pixel_format(image.get(),
+                                               NULL,
+                                               sprite->pixelFormat(),
+                                               render::Dithering(),
+                                               rgbmap,
+                                               sprite->palette(site.frame()),
+                                               false,
+                                               sprite->transparentColor()));
     }
+
+    // TODO we don't support pasting text in multiple cels at the
+    //      moment, so we clear the range here (same as in
+    //      clipboard::paste())
+    if (auto timeline = App::instance()->timeline())
+      timeline->clearAndInvalidateRange();
+
+    auto point = sprite->bounds().center() - gfx::Point(image->size().w / 2, image->size().h / 2);
+    if (params().x.isSet())
+      point.x = params().x();
+    if (params().y.isSet())
+      point.y = params().y();
+
+    if (ui) {
+      // TODO: Do we want to make this selectable result available when not using UI?
+      Editor::activeEditor()->pasteImage(image.get(), nullptr, &point);
+      return;
+    }
+
+    ContextWriter writer(ctx);
+    Tx tx(writer, "Paste Text");
+    ImageRef finalImage = image;
+    if (writer.cel()->image()) {
+      gfx::Rect celRect(point, image->size());
+      ASSERT(!celRect.isEmpty() && celRect.x >= 0 && celRect.y >= 0);
+      finalImage.reset(
+        doc::crop_image(writer.cel()->image(), celRect, writer.cel()->image()->maskColor()));
+      render::Render render;
+      render.setNewBlend(pref.experimental.newBlend());
+      render.setBgOptions(render::BgOptions::MakeTransparent());
+      render.renderImage(finalImage.get(),
+                         image.get(),
+                         writer.palette(),
+                         0,
+                         0,
+                         255,
+                         doc::BlendMode::NORMAL);
+    }
+
+    tx(new cmd::CopyRegion(writer.cel()->image(),
+                           finalImage.get(),
+                           gfx::Region(finalImage->bounds()),
+                           point));
+    tx.commit();
   }
   catch (const std::exception& ex) {
     Console::showException(ex);
diff --git a/src/app/commands/cmd_pixel_perfect_mode.cpp b/src/app/commands/cmd_pixel_perfect_mode.cpp
index 7ed76ea6d..38ea1c9ac 100644
--- a/src/app/commands/cmd_pixel_perfect_mode.cpp
+++ b/src/app/commands/cmd_pixel_perfect_mode.cpp
@@ -10,8 +10,6 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
-#include "app/commands/params.h"
-#include "app/context.h"
 #include "app/pref/preferences.h"
 #include "app/tools/freehand_algorithm.h"
 #include "app/tools/tool.h"
@@ -28,8 +26,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-PixelPerfectModeCommand::PixelPerfectModeCommand()
-  : Command(CommandId::PixelPerfectMode(), CmdUIOnlyFlag)
+PixelPerfectModeCommand::PixelPerfectModeCommand() : Command(CommandId::PixelPerfectMode())
 {
 }
 
diff --git a/src/app/commands/cmd_play_animation.cpp b/src/app/commands/cmd_play_animation.cpp
index e085d63f9..b9f479c1a 100644
--- a/src/app/commands/cmd_play_animation.cpp
+++ b/src/app/commands/cmd_play_animation.cpp
@@ -34,13 +34,14 @@ protected:
   void onExecute(Context* ctx) override;
 };
 
-PlayAnimationCommand::PlayAnimationCommand() : Command(CommandId::PlayAnimation(), CmdUIOnlyFlag)
+PlayAnimationCommand::PlayAnimationCommand() : Command(CommandId::PlayAnimation())
 {
 }
 
 bool PlayAnimationCommand::onEnabled(Context* ctx)
 {
-  return ctx->checkFlags(ContextFlags::ActiveDocumentIsReadable | ContextFlags::HasActiveSprite);
+  return ctx->isUIAvailable() &&
+         ctx->checkFlags(ContextFlags::ActiveDocumentIsReadable | ContextFlags::HasActiveSprite);
 }
 
 bool PlayAnimationCommand::onChecked(Context* ctx)
@@ -85,13 +86,14 @@ protected:
 };
 
 PlayPreviewAnimationCommand::PlayPreviewAnimationCommand()
-  : Command(CommandId::PlayPreviewAnimation(), CmdUIOnlyFlag)
+  : Command(CommandId::PlayPreviewAnimation())
 {
 }
 
 bool PlayPreviewAnimationCommand::onEnabled(Context* ctx)
 {
-  return ctx->checkFlags(ContextFlags::ActiveDocumentIsWritable | ContextFlags::HasActiveSprite);
+  return ctx->isUIAvailable() &&
+         ctx->checkFlags(ContextFlags::ActiveDocumentIsWritable | ContextFlags::HasActiveSprite);
 }
 
 bool PlayPreviewAnimationCommand::onChecked(Context* ctx)
diff --git a/src/app/commands/cmd_refresh.cpp b/src/app/commands/cmd_refresh.cpp
index 83439c4e4..b50089c50 100644
--- a/src/app/commands/cmd_refresh.cpp
+++ b/src/app/commands/cmd_refresh.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2021  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -10,7 +10,6 @@
 #endif
 
 #include "app/app.h"
-#include "app/app_menus.h"
 #include "app/commands/command.h"
 #include "app/ui/main_menu_bar.h"
 #include "app/ui/main_window.h"
@@ -39,7 +38,7 @@ private:
   void postCancelMenuLoop();
 };
 
-RefreshCommand::RefreshCommand() : Command(CommandId::Refresh(), CmdUIOnlyFlag)
+RefreshCommand::RefreshCommand() : Command(CommandId::Refresh())
 {
 }
 
diff --git a/src/app/commands/cmd_remove_frame.cpp b/src/app/commands/cmd_remove_frame.cpp
index 740034322..da31a5625 100644
--- a/src/app/commands/cmd_remove_frame.cpp
+++ b/src/app/commands/cmd_remove_frame.cpp
@@ -16,7 +16,6 @@
 #include "app/modules/gui.h"
 #include "app/tx.h"
 #include "doc/sprite.h"
-#include "ui/ui.h"
 
 namespace app {
 
@@ -29,7 +28,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-RemoveFrameCommand::RemoveFrameCommand() : Command(CommandId::RemoveFrame(), CmdRecordableFlag)
+RemoveFrameCommand::RemoveFrameCommand() : Command(CommandId::RemoveFrame())
 {
 }
 
diff --git a/src/app/commands/cmd_remove_frame_tag.cpp b/src/app/commands/cmd_remove_frame_tag.cpp
index 5a1cf3199..4f4209404 100644
--- a/src/app/commands/cmd_remove_frame_tag.cpp
+++ b/src/app/commands/cmd_remove_frame_tag.cpp
@@ -15,7 +15,6 @@
 #include "app/commands/params.h"
 #include "app/context.h"
 #include "app/context_access.h"
-#include "app/loop_tag.h"
 #include "app/tx.h"
 #include "app/ui/timeline/timeline.h"
 #include "base/convert_to.h"
@@ -38,7 +37,7 @@ private:
 };
 
 RemoveFrameTagCommand::RemoveFrameTagCommand()
-  : Command(CommandId::RemoveFrameTag(), CmdRecordableFlag)
+  : Command(CommandId::RemoveFrameTag())
   , m_tagId(NullId)
 {
 }
diff --git a/src/app/commands/cmd_remove_layer.cpp b/src/app/commands/cmd_remove_layer.cpp
index a7db748c8..3f85cef70 100644
--- a/src/app/commands/cmd_remove_layer.cpp
+++ b/src/app/commands/cmd_remove_layer.cpp
@@ -105,7 +105,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-RemoveLayerCommand::RemoveLayerCommand() : Command(CommandId::RemoveLayer(), CmdRecordableFlag)
+RemoveLayerCommand::RemoveLayerCommand() : Command(CommandId::RemoveLayer())
 {
 }
 
diff --git a/src/app/commands/cmd_remove_slice.cpp b/src/app/commands/cmd_remove_slice.cpp
index 07373e36e..a4c4f25c8 100644
--- a/src/app/commands/cmd_remove_slice.cpp
+++ b/src/app/commands/cmd_remove_slice.cpp
@@ -15,14 +15,12 @@
 #include "app/commands/command.h"
 #include "app/context_access.h"
 #include "app/i18n/strings.h"
-#include "app/modules/gui.h"
 #include "app/tx.h"
 #include "app/ui/status_bar.h"
 #include "base/convert_to.h"
 #include "doc/selected_objects.h"
 #include "doc/slice.h"
 #include "doc/sprite.h"
-#include "ui/alert.h"
 #include "ui/widget.h"
 
 namespace app {
@@ -41,7 +39,7 @@ private:
   ObjectId m_sliceId;
 };
 
-RemoveSliceCommand::RemoveSliceCommand() : Command(CommandId::RemoveSlice(), CmdRecordableFlag)
+RemoveSliceCommand::RemoveSliceCommand() : Command(CommandId::RemoveSlice())
 {
 }
 
@@ -117,13 +115,15 @@ void RemoveSliceCommand::onExecute(Context* context)
     document->notifyGeneralUpdate();
   }
 
-  StatusBar::instance()->invalidate();
-  if (!sliceName.empty()) {
-    StatusBar::instance()->showTip(1000, Strings::remove_slice_x_removed(sliceName));
-  }
-  else {
-    StatusBar::instance()->showTip(1000,
-                                   Strings::remove_slice_n_slices_removed(slicesToDelete.size()));
+  if (context->isUIAvailable()) {
+    StatusBar::instance()->invalidate();
+    if (!sliceName.empty()) {
+      StatusBar::instance()->showTip(1000, Strings::remove_slice_x_removed(sliceName));
+    }
+    else {
+      StatusBar::instance()->showTip(1000,
+                                     Strings::remove_slice_n_slices_removed(slicesToDelete.size()));
+    }
   }
 }
 
diff --git a/src/app/commands/cmd_reopen_closed_file.cpp b/src/app/commands/cmd_reopen_closed_file.cpp
index e8c272fdc..a8f22a7f1 100644
--- a/src/app/commands/cmd_reopen_closed_file.cpp
+++ b/src/app/commands/cmd_reopen_closed_file.cpp
@@ -8,14 +8,10 @@
   #include "config.h"
 #endif
 
-#include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/commands.h"
-#include "app/doc.h"
 #include "app/ui_context.h"
 
-#include <cstdio>
-
 namespace app {
 
 class ReopenClosedFileCommand : public Command {
@@ -27,8 +23,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-ReopenClosedFileCommand::ReopenClosedFileCommand()
-  : Command(CommandId::ReopenClosedFile(), CmdUIOnlyFlag)
+ReopenClosedFileCommand::ReopenClosedFileCommand() : Command(CommandId::ReopenClosedFile())
 {
 }
 
diff --git a/src/app/commands/cmd_repeat_last_export.cpp b/src/app/commands/cmd_repeat_last_export.cpp
index 82dc747d3..a68dbdd6a 100644
--- a/src/app/commands/cmd_repeat_last_export.cpp
+++ b/src/app/commands/cmd_repeat_last_export.cpp
@@ -27,8 +27,7 @@ protected:
   virtual void onExecute(Context* context) override;
 };
 
-RepeatLastExportCommand::RepeatLastExportCommand()
-  : Command(CommandId::RepeatLastExport(), CmdRecordableFlag)
+RepeatLastExportCommand::RepeatLastExportCommand() : Command(CommandId::RepeatLastExport())
 {
 }
 
diff --git a/src/app/commands/cmd_reselect_mask.cpp b/src/app/commands/cmd_reselect_mask.cpp
index 517e6dae2..396729ba7 100644
--- a/src/app/commands/cmd_reselect_mask.cpp
+++ b/src/app/commands/cmd_reselect_mask.cpp
@@ -15,7 +15,6 @@
 #include "app/modules/gui.h"
 #include "app/tx.h"
 #include "doc/mask.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -28,7 +27,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-ReselectMaskCommand::ReselectMaskCommand() : Command(CommandId::ReselectMask(), CmdRecordableFlag)
+ReselectMaskCommand::ReselectMaskCommand() : Command(CommandId::ReselectMask())
 {
 }
 
diff --git a/src/app/commands/cmd_reverse_frames.cpp b/src/app/commands/cmd_reverse_frames.cpp
index f30652205..16634fd8c 100644
--- a/src/app/commands/cmd_reverse_frames.cpp
+++ b/src/app/commands/cmd_reverse_frames.cpp
@@ -27,7 +27,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-ReverseFramesCommand::ReverseFramesCommand() : Command(CommandId::ReverseFrames(), CmdUIOnlyFlag)
+ReverseFramesCommand::ReverseFramesCommand() : Command(CommandId::ReverseFrames())
 {
 }
 
diff --git a/src/app/commands/cmd_rotate.cpp b/src/app/commands/cmd_rotate.cpp
index bc264f700..bbd284f3b 100644
--- a/src/app/commands/cmd_rotate.cpp
+++ b/src/app/commands/cmd_rotate.cpp
@@ -14,13 +14,11 @@
 #include "app/commands/cmd_rotate.h"
 #include "app/commands/params.h"
 #include "app/doc_api.h"
-#include "app/doc_range.h"
 #include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/sprite_job.h"
 #include "app/tools/tool_box.h"
 #include "app/tx.h"
-#include "app/ui/color_bar.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/status_bar.h"
 #include "app/ui/timeline/timeline.h"
@@ -31,7 +29,6 @@
 #include "doc/image.h"
 #include "doc/mask.h"
 #include "doc/sprite.h"
-#include "ui/ui.h"
 
 namespace app {
 
@@ -166,7 +163,7 @@ protected:
   }
 };
 
-RotateCommand::RotateCommand() : Command(CommandId::Rotate(), CmdRecordableFlag)
+RotateCommand::RotateCommand() : Command(CommandId::Rotate())
 {
   m_ui = true;
   m_flipMask = false;
@@ -190,6 +187,10 @@ void RotateCommand::onLoadParams(const Params& params)
 
 bool RotateCommand::onEnabled(Context* context)
 {
+  // Because we use the toolbar & editor to transform the selection, this won't work without a UI
+  if (m_flipMask && !context->isUIAvailable())
+    return false;
+
   return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
                              ContextFlags::HasActiveSprite);
 }
diff --git a/src/app/commands/cmd_run_script.cpp b/src/app/commands/cmd_run_script.cpp
index 15540cc4f..721d94ef7 100644
--- a/src/app/commands/cmd_run_script.cpp
+++ b/src/app/commands/cmd_run_script.cpp
@@ -16,7 +16,6 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
-#include "app/console.h"
 #include "app/context.h"
 #include "app/i18n/strings.h"
 #include "app/pref/preferences.h"
@@ -27,8 +26,6 @@
 #include "fmt/format.h"
 #include "ui/manager.h"
 
-#include <cstdio>
-
 namespace app {
 
 class RunScriptCommand : public Command {
@@ -46,7 +43,7 @@ private:
   Params m_params;
 };
 
-RunScriptCommand::RunScriptCommand() : Command(CommandId::RunScript(), CmdRecordableFlag)
+RunScriptCommand::RunScriptCommand() : Command(CommandId::RunScript())
 {
 }
 
diff --git a/src/app/commands/cmd_save_file.cpp b/src/app/commands/cmd_save_file.cpp
index cdebc7e2b..51b0e53fe 100644
--- a/src/app/commands/cmd_save_file.cpp
+++ b/src/app/commands/cmd_save_file.cpp
@@ -36,8 +36,6 @@
 #include "app/ui/status_bar.h"
 #include "base/convert_to.h"
 #include "base/fs.h"
-#include "base/scoped_value.h"
-#include "base/thread.h"
 #include "doc/mask.h"
 #include "doc/sprite.h"
 #include "doc/tag.h"
@@ -86,8 +84,7 @@ private:
 
 //////////////////////////////////////////////////////////////////////
 
-SaveFileBaseCommand::SaveFileBaseCommand(const char* id, CommandFlags flags)
-  : CommandWithNewParams<SaveFileParams>(id, flags)
+SaveFileBaseCommand::SaveFileBaseCommand(const char* id) : CommandWithNewParams<SaveFileParams>(id)
 {
 }
 
@@ -269,7 +266,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-SaveFileCommand::SaveFileCommand() : SaveFileBaseCommand(CommandId::SaveFile(), CmdRecordableFlag)
+SaveFileCommand::SaveFileCommand() : SaveFileBaseCommand(CommandId::SaveFile())
 {
 }
 
@@ -310,8 +307,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-SaveFileAsCommand::SaveFileAsCommand()
-  : SaveFileBaseCommand(CommandId::SaveFileAs(), CmdRecordableFlag)
+SaveFileAsCommand::SaveFileAsCommand() : SaveFileBaseCommand(CommandId::SaveFileAs())
 {
 }
 
@@ -335,8 +331,7 @@ private:
   void moveToUndoState(Doc* doc, const undo::UndoState* state);
 };
 
-SaveFileCopyAsCommand::SaveFileCopyAsCommand()
-  : SaveFileBaseCommand(CommandId::SaveFileCopyAs(), CmdRecordableFlag)
+SaveFileCopyAsCommand::SaveFileCopyAsCommand() : SaveFileBaseCommand(CommandId::SaveFileCopyAs())
 {
 }
 
diff --git a/src/app/commands/cmd_save_file.h b/src/app/commands/cmd_save_file.h
index eab6837f7..3c8fe56bc 100644
--- a/src/app/commands/cmd_save_file.h
+++ b/src/app/commands/cmd_save_file.h
@@ -67,7 +67,7 @@ public:
   enum class SaveInBackground { Off, On };
   enum class ResizeOnTheFly { Off, On };
 
-  SaveFileBaseCommand(const char* id, CommandFlags flags);
+  SaveFileBaseCommand(const char* id);
 
 protected:
   void onLoadParams(const Params& params) override;
diff --git a/src/app/commands/cmd_save_mask.cpp b/src/app/commands/cmd_save_mask.cpp
index 73aa56591..5805de879 100644
--- a/src/app/commands/cmd_save_mask.cpp
+++ b/src/app/commands/cmd_save_mask.cpp
@@ -10,18 +10,22 @@
 #endif
 
 #include "app/commands/command.h"
+#include "app/commands/new_params.h"
 #include "app/context_access.h"
 #include "app/file_selector.h"
 #include "app/i18n/strings.h"
 #include "app/util/msk_file.h"
 #include "base/fs.h"
-#include "doc/mask.h"
-#include "doc/sprite.h"
 #include "ui/alert.h"
 
 namespace app {
 
-class SaveMaskCommand : public Command {
+struct SaveMaskParams : public NewParams {
+  Param<bool> ui{ this, true, "ui" };
+  Param<std::string> filename{ this, "default.msk", "filename" };
+};
+
+class SaveMaskCommand : public CommandWithNewParams<SaveMaskParams> {
 public:
   SaveMaskCommand();
 
@@ -30,7 +34,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-SaveMaskCommand::SaveMaskCommand() : Command(CommandId::SaveMask(), CmdUIOnlyFlag)
+SaveMaskCommand::SaveMaskCommand() : CommandWithNewParams(CommandId::SaveMask())
 {
 }
 
@@ -41,21 +45,27 @@ bool SaveMaskCommand::onEnabled(Context* context)
 
 void SaveMaskCommand::onExecute(Context* context)
 {
+  const bool ui = (params().ui() && context->isUIAvailable());
+  std::string filename = params().filename();
+
   const ContextReader reader(context);
   const Doc* document(reader.document());
 
-  base::paths exts = { "msk" };
-  base::paths selFilename;
-  if (!app::show_file_selector(Strings::save_selection_title(),
-                               "default.msk",
-                               exts,
-                               FileSelectorType::Save,
-                               selFilename))
-    return;
+  if (ui) {
+    base::paths exts = { "msk" };
+    base::paths selFilename;
+    if (!app::show_file_selector(Strings::save_selection_title(),
+                                 filename,
+                                 exts,
+                                 FileSelectorType::Save,
+                                 selFilename))
+      return;
 
-  std::string filename = selFilename.front();
+    filename = selFilename.front();
+  }
 
-  if (save_msk_file(document->mask(), filename.c_str()) != 0)
+  const bool result = (save_msk_file(document->mask(), filename.c_str()) == 0);
+  if (!result && ui)
     ui::Alert::show(Strings::alerts_error_saving_file(filename));
 }
 
diff --git a/src/app/commands/cmd_save_palette.cpp b/src/app/commands/cmd_save_palette.cpp
index 6f52f46ae..89fe5a718 100644
--- a/src/app/commands/cmd_save_palette.cpp
+++ b/src/app/commands/cmd_save_palette.cpp
@@ -10,8 +10,8 @@
 #endif
 
 #include "app/app.h"
-#include "app/commands/cmd_set_palette.h"
 #include "app/commands/commands.h"
+#include "app/commands/new_params.h"
 #include "app/commands/params.h"
 #include "app/context.h"
 #include "app/doc.h"
@@ -20,57 +20,61 @@
 #include "app/i18n/strings.h"
 #include "app/modules/palettes.h"
 #include "base/fs.h"
-#include "doc/palette.h"
 #include "ui/alert.h"
 
 namespace app {
 
 using namespace ui;
 
-class SavePaletteCommand : public Command {
+struct SavePaletteParams : public NewParams {
+  Param<bool> ui{ this, true, "ui" };
+  Param<std::string> filename{ this, "", "filename" };
+  Param<std::string> preset{ this, "", "preset" };
+  Param<bool> saveAsPreset{ this, false, "saveAsPreset" };
+  Param<int> columns{ this, 16, "columns" };
+};
+
+class SavePaletteCommand : public CommandWithNewParams<SavePaletteParams> {
 public:
   SavePaletteCommand();
 
 protected:
-  void onLoadParams(const Params& params) override;
-  void onExecute(Context* context) override;
+  void onExecute(Context* ctx) override;
   std::string onGetFriendlyName() const override;
-
-private:
-  std::string m_preset;
-  bool m_saveAsPreset = false;
 };
 
-SavePaletteCommand::SavePaletteCommand() : Command(CommandId::SavePalette(), CmdRecordableFlag)
+SavePaletteCommand::SavePaletteCommand() : CommandWithNewParams(CommandId::SavePalette())
 {
 }
 
-void SavePaletteCommand::onLoadParams(const Params& params)
-{
-  m_preset = params.get("preset");
-  m_saveAsPreset = (params.get("saveAsPreset") == "true");
-}
-
 void SavePaletteCommand::onExecute(Context* ctx)
 {
   const doc::Palette* palette = get_current_palette();
+  const bool ui = (params().ui() && ctx->isUIAvailable());
   std::string filename;
 
-  if (!m_preset.empty()) {
-    filename = get_preset_palette_filename(m_preset, ".ase");
+  if (!params().preset().empty()) {
+    filename = get_preset_palette_filename(params().preset(), ".ase");
   }
   else {
     base::paths exts = get_writable_palette_extensions();
-    base::paths selFilename;
-    std::string initialPath = (m_saveAsPreset ? get_preset_palettes_dir() : "");
-    if (!app::show_file_selector(Strings::save_palette_title(),
-                                 initialPath,
-                                 exts,
-                                 FileSelectorType::Save,
-                                 selFilename))
-      return;
 
-    filename = selFilename.front();
+    if (ui) {
+      base::paths selFilename;
+      std::string initialPath = params().saveAsPreset() ? get_preset_palettes_dir() :
+                                                          params().filename();
+      if (!app::show_file_selector(Strings::save_palette_title(),
+                                   initialPath,
+                                   exts,
+                                   FileSelectorType::Save,
+                                   selFilename))
+        return;
+
+      filename = selFilename.front();
+    }
+    else {
+      filename = params().filename();
+    }
 
     // Check that the file format supports saving indexed images/color
     // palettes (e.g. if the user specified .jpg we should show that
@@ -84,28 +88,31 @@ void SavePaletteCommand::onExecute(Context* ctx)
     }
   }
   gfx::ColorSpaceRef colorSpace = nullptr;
-  auto activeDoc = ctx->activeDocument();
+  auto* activeDoc = ctx->activeDocument();
   if (activeDoc)
     colorSpace = activeDoc->sprite()->colorSpace();
 
-  if (!save_palette(filename.c_str(), palette, 16, colorSpace)) // TODO 16 should be configurable
+  const bool result = save_palette(filename.c_str(), palette, params().columns(), colorSpace);
+
+  if (ui && !result)
     ui::Alert::show(Strings::alerts_error_saving_file(filename));
 
-  if (m_preset == get_default_palette_preset_name()) {
+  if (params().preset() == get_default_palette_preset_name()) {
     set_default_palette(palette);
     if (!activeDoc)
       set_current_palette(palette, false);
   }
-  if (m_saveAsPreset) {
+
+  if (params().saveAsPreset()) {
     App::instance()->PalettePresetsChange();
   }
 }
 
 std::string SavePaletteCommand::onGetFriendlyName() const
 {
-  if (m_preset == "default")
+  if (params().preset() == get_default_palette_preset_name())
     return Strings::commands_SavePaletteAsDefault();
-  else if (m_saveAsPreset)
+  if (params().saveAsPreset())
     return Strings::commands_SavePaletteAsPreset();
   return Command::onGetFriendlyName();
 }
diff --git a/src/app/commands/cmd_scroll.cpp b/src/app/commands/cmd_scroll.cpp
index 66780f3f3..eb7484609 100644
--- a/src/app/commands/cmd_scroll.cpp
+++ b/src/app/commands/cmd_scroll.cpp
@@ -12,11 +12,9 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/move_thing.h"
-#include "app/commands/params.h"
 #include "app/context_access.h"
 #include "app/i18n/strings.h"
 #include "app/ui/editor/editor.h"
-#include "base/convert_to.h"
 #include "ui/view.h"
 
 namespace app {
@@ -36,7 +34,7 @@ private:
   MoveThing m_moveThing;
 };
 
-ScrollCommand::ScrollCommand() : Command(CommandId::Scroll(), CmdUIOnlyFlag)
+ScrollCommand::ScrollCommand() : Command(CommandId::Scroll())
 {
 }
 
@@ -47,7 +45,7 @@ void ScrollCommand::onLoadParams(const Params& params)
 
 bool ScrollCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::HasActiveDocument);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::HasActiveDocument);
 }
 
 void ScrollCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_scroll_center.cpp b/src/app/commands/cmd_scroll_center.cpp
index 86b94e539..b39d9ce69 100644
--- a/src/app/commands/cmd_scroll_center.cpp
+++ b/src/app/commands/cmd_scroll_center.cpp
@@ -11,7 +11,6 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
-#include "app/context_access.h"
 #include "app/ui/editor/editor.h"
 
 namespace app {
@@ -25,7 +24,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-ScrollCenterCommand::ScrollCenterCommand() : Command(CommandId::ScrollCenter(), CmdUIOnlyFlag)
+ScrollCenterCommand::ScrollCenterCommand() : Command(CommandId::ScrollCenter())
 {
 }
 
diff --git a/src/app/commands/cmd_select_palette.cpp b/src/app/commands/cmd_select_palette.cpp
index 63742a7df..a5d7a7954 100644
--- a/src/app/commands/cmd_select_palette.cpp
+++ b/src/app/commands/cmd_select_palette.cpp
@@ -17,7 +17,6 @@
 #include "app/modules/palettes.h"
 #include "app/site.h"
 #include "doc/cel.h"
-#include "doc/frame_range.h"
 #include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
@@ -51,7 +50,7 @@ private:
 };
 
 SelectPaletteColorsCommand::SelectPaletteColorsCommand()
-  : Command(CommandId::SelectPaletteColors(), CmdRecordableFlag)
+  : Command(CommandId::SelectPaletteColors())
   , m_modifier(Modifier::UsedColors)
 {
 }
diff --git a/src/app/commands/cmd_select_tile.cpp b/src/app/commands/cmd_select_tile.cpp
index e20b6975f..6d5149188 100644
--- a/src/app/commands/cmd_select_tile.cpp
+++ b/src/app/commands/cmd_select_tile.cpp
@@ -19,7 +19,6 @@
 #include "app/tx.h"
 #include "app/ui/editor/editor.h"
 #include "doc/mask.h"
-#include "ui/system.h"
 
 namespace app {
 
@@ -40,7 +39,7 @@ private:
 };
 
 SelectTileCommand::SelectTileCommand()
-  : Command(CommandId::SelectTile(), CmdRecordableFlag)
+  : Command(CommandId::SelectTile())
   , m_mode(gen::SelectionMode::DEFAULT)
 {
 }
@@ -60,7 +59,8 @@ void SelectTileCommand::onLoadParams(const Params& params)
 
 bool SelectTileCommand::onEnabled(Context* ctx)
 {
-  return ctx->checkFlags(ContextFlags::ActiveDocumentIsWritable);
+  return ctx->checkFlags(ContextFlags::ActiveDocumentIsWritable) && ctx->isUIAvailable() &&
+         Editor::activeEditor()->hasMouse();
 }
 
 void SelectTileCommand::onExecute(Context* ctx)
diff --git a/src/app/commands/cmd_set_color_selector.cpp b/src/app/commands/cmd_set_color_selector.cpp
index 5732167bc..b76b44b7e 100644
--- a/src/app/commands/cmd_set_color_selector.cpp
+++ b/src/app/commands/cmd_set_color_selector.cpp
@@ -12,6 +12,7 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
+#include "app/context.h"
 #include "app/i18n/strings.h"
 #include "app/ui/color_bar.h"
 
@@ -22,6 +23,7 @@ public:
   SetColorSelectorCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   bool onNeedsParams() const override { return true; }
   void onLoadParams(const Params& params) override;
   bool onChecked(Context* context) override;
@@ -33,11 +35,16 @@ private:
 };
 
 SetColorSelectorCommand::SetColorSelectorCommand()
-  : Command(CommandId::SetColorSelector(), CmdUIOnlyFlag)
+  : Command(CommandId::SetColorSelector())
   , m_type(ColorBar::ColorSelector::SPECTRUM)
 {
 }
 
+bool SetColorSelectorCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void SetColorSelectorCommand::onLoadParams(const Params& params)
 {
   std::string type = params.get("type");
diff --git a/src/app/commands/cmd_set_ink_type.cpp b/src/app/commands/cmd_set_ink_type.cpp
index fadd5a3a5..39906f431 100644
--- a/src/app/commands/cmd_set_ink_type.cpp
+++ b/src/app/commands/cmd_set_ink_type.cpp
@@ -28,17 +28,22 @@ public:
   SetInkTypeCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   bool onNeedsParams() const override { return true; }
   bool onChecked(Context* context) override;
   void onExecute(Context* context) override;
   std::string onGetFriendlyName() const override;
 };
 
-SetInkTypeCommand::SetInkTypeCommand()
-  : CommandWithNewParams(CommandId::SetInkType(), CmdUIOnlyFlag)
+SetInkTypeCommand::SetInkTypeCommand() : CommandWithNewParams(CommandId::SetInkType())
 {
 }
 
+bool SetInkTypeCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 bool SetInkTypeCommand::onChecked(Context* context)
 {
   tools::Tool* tool = App::instance()->activeTool();
diff --git a/src/app/commands/cmd_set_loop_section.cpp b/src/app/commands/cmd_set_loop_section.cpp
index 21e13bc46..5fd81437e 100644
--- a/src/app/commands/cmd_set_loop_section.cpp
+++ b/src/app/commands/cmd_set_loop_section.cpp
@@ -40,7 +40,7 @@ protected:
 };
 
 SetLoopSectionCommand::SetLoopSectionCommand()
-  : Command(CommandId::SetLoopSection(), CmdRecordableFlag)
+  : Command(CommandId::SetLoopSection())
   , m_action(Action::Auto)
   , m_begin(0)
   , m_end(0)
@@ -129,7 +129,8 @@ void SetLoopSectionCommand::onExecute(Context* ctx)
     }
   }
 
-  App::instance()->timeline()->invalidate();
+  if (App::instance()->timeline())
+    App::instance()->timeline()->invalidate();
 }
 
 Command* CommandFactory::createSetLoopSectionCommand()
diff --git a/src/app/commands/cmd_set_palette.cpp b/src/app/commands/cmd_set_palette.cpp
index 6badeabd1..bb482333a 100644
--- a/src/app/commands/cmd_set_palette.cpp
+++ b/src/app/commands/cmd_set_palette.cpp
@@ -12,7 +12,6 @@
 #include "app/context_access.h"
 #include "app/doc_api.h"
 #include "app/file_selector.h"
-#include "app/ini_file.h"
 #include "app/modules/palettes.h"
 #include "app/tx.h"
 #include "doc/palette.h"
@@ -23,9 +22,7 @@ namespace app {
 
 using namespace ui;
 
-SetPaletteCommand::SetPaletteCommand()
-  : Command(CommandId::SetPalette(), CmdRecordableFlag)
-  , m_palette(NULL)
+SetPaletteCommand::SetPaletteCommand() : Command(CommandId::SetPalette()), m_palette(NULL)
 {
 }
 
diff --git a/src/app/commands/cmd_set_palette_entry_size.cpp b/src/app/commands/cmd_set_palette_entry_size.cpp
index b266e8b70..a9aaca230 100644
--- a/src/app/commands/cmd_set_palette_entry_size.cpp
+++ b/src/app/commands/cmd_set_palette_entry_size.cpp
@@ -12,6 +12,7 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
+#include "app/context.h"
 #include "app/ui/color_bar.h"
 
 namespace app {
@@ -21,6 +22,7 @@ public:
   SetPaletteEntrySizeCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   void onLoadParams(const Params& params) override;
   bool onChecked(Context* context) override;
   void onExecute(Context* context) override;
@@ -32,11 +34,16 @@ private:
 };
 
 SetPaletteEntrySizeCommand::SetPaletteEntrySizeCommand()
-  : Command(CommandId::SetPaletteEntrySize(), CmdUIOnlyFlag)
+  : Command(CommandId::SetPaletteEntrySize())
   , m_size(7)
 {
 }
 
+bool SetPaletteEntrySizeCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void SetPaletteEntrySizeCommand::onLoadParams(const Params& params)
 {
   if (params.has_param("size"))
diff --git a/src/app/commands/cmd_set_same_ink.cpp b/src/app/commands/cmd_set_same_ink.cpp
index 5fc23ec6b..7377c1874 100644
--- a/src/app/commands/cmd_set_same_ink.cpp
+++ b/src/app/commands/cmd_set_same_ink.cpp
@@ -11,7 +11,6 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/commands.h"
-#include "app/commands/params.h"
 #include "app/pref/preferences.h"
 #include "app/tools/tool.h"
 #include "app/tools/tool_box.h"
@@ -27,7 +26,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-SetSameInkCommand::SetSameInkCommand() : Command(CommandId::SetSameInk(), CmdUIOnlyFlag)
+SetSameInkCommand::SetSameInkCommand() : Command(CommandId::SetSameInk())
 {
 }
 
diff --git a/src/app/commands/cmd_show.cpp b/src/app/commands/cmd_show.cpp
index d2fb98a94..a15faad35 100644
--- a/src/app/commands/cmd_show.cpp
+++ b/src/app/commands/cmd_show.cpp
@@ -18,7 +18,7 @@ namespace app {
 
 class ShowExtrasCommand : public Command {
 public:
-  ShowExtrasCommand() : Command(CommandId::ShowExtras(), CmdUIOnlyFlag) {}
+  ShowExtrasCommand() : Command(CommandId::ShowExtras()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -49,7 +49,7 @@ protected:
 
 class ShowLayerEdgesCommand : public Command {
 public:
-  ShowLayerEdgesCommand() : Command(CommandId::ShowLayerEdges(), CmdUIOnlyFlag) {}
+  ShowLayerEdgesCommand() : Command(CommandId::ShowLayerEdges()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -67,7 +67,7 @@ protected:
 
 class ShowGridCommand : public Command {
 public:
-  ShowGridCommand() : Command(CommandId::ShowGrid(), CmdUIOnlyFlag) {}
+  ShowGridCommand() : Command(CommandId::ShowGrid()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -85,7 +85,7 @@ protected:
 
 class ShowPixelGridCommand : public Command {
 public:
-  ShowPixelGridCommand() : Command(CommandId::ShowPixelGrid(), CmdUIOnlyFlag) {}
+  ShowPixelGridCommand() : Command(CommandId::ShowPixelGrid()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -103,7 +103,7 @@ protected:
 
 class ShowSelectionEdgesCommand : public Command {
 public:
-  ShowSelectionEdgesCommand() : Command(CommandId::ShowSelectionEdges(), CmdUIOnlyFlag) {}
+  ShowSelectionEdgesCommand() : Command(CommandId::ShowSelectionEdges()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -121,7 +121,7 @@ protected:
 
 class ShowBrushPreviewCommand : public Command {
 public:
-  ShowBrushPreviewCommand() : Command(CommandId::ShowBrushPreview(), CmdUIOnlyFlag) {}
+  ShowBrushPreviewCommand() : Command(CommandId::ShowBrushPreview()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -146,10 +146,7 @@ protected:
 // Preview in the Preview window), not based on the active document.
 class ShowBrushPreviewInPreviewCommand : public Command {
 public:
-  ShowBrushPreviewInPreviewCommand()
-    : Command(CommandId::ShowBrushPreviewInPreview(), CmdUIOnlyFlag)
-  {
-  }
+  ShowBrushPreviewInPreviewCommand() : Command(CommandId::ShowBrushPreviewInPreview()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -167,7 +164,7 @@ protected:
 
 class ShowAutoGuidesCommand : public Command {
 public:
-  ShowAutoGuidesCommand() : Command(CommandId::ShowAutoGuides(), CmdUIOnlyFlag) {}
+  ShowAutoGuidesCommand() : Command(CommandId::ShowAutoGuides()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -185,7 +182,7 @@ protected:
 
 class ShowSlicesCommand : public Command {
 public:
-  ShowSlicesCommand() : Command(CommandId::ShowSlices(), CmdUIOnlyFlag) {}
+  ShowSlicesCommand() : Command(CommandId::ShowSlices()) {}
 
 protected:
   bool onChecked(Context* ctx) override
@@ -203,7 +200,7 @@ protected:
 
 class ShowTileNumbersCommand : public Command {
 public:
-  ShowTileNumbersCommand() : Command(CommandId::ShowTileNumbers(), CmdUIOnlyFlag) {}
+  ShowTileNumbersCommand() : Command(CommandId::ShowTileNumbers()) {}
 
 protected:
   bool onChecked(Context* ctx) override
diff --git a/src/app/commands/cmd_slice_properties.cpp b/src/app/commands/cmd_slice_properties.cpp
index 27ce7e45c..8a42dd9a6 100644
--- a/src/app/commands/cmd_slice_properties.cpp
+++ b/src/app/commands/cmd_slice_properties.cpp
@@ -39,7 +39,7 @@ private:
 };
 
 SlicePropertiesCommand::SlicePropertiesCommand()
-  : Command(CommandId::SliceProperties(), CmdUIOnlyFlag)
+  : Command(CommandId::SliceProperties())
   , m_sliceId(NullId)
 {
 }
@@ -57,7 +57,7 @@ void SlicePropertiesCommand::onLoadParams(const Params& params)
 
 bool SlicePropertiesCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
 }
 
 void SlicePropertiesCommand::onExecute(Context* context)
diff --git a/src/app/commands/cmd_sprite_properties.cpp b/src/app/commands/cmd_sprite_properties.cpp
index 5df15e65a..900acfbfb 100644
--- a/src/app/commands/cmd_sprite_properties.cpp
+++ b/src/app/commands/cmd_sprite_properties.cpp
@@ -30,7 +30,6 @@
 #include "app/util/pixel_ratio.h"
 #include "app/util/tileset_utils.h"
 #include "base/mem_utils.h"
-#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/sprite.h"
 #include "doc/tilesets.h"
@@ -142,6 +141,8 @@ public:
   {
     userData()->Click.connect([this] { onToggleUserData(); });
 
+    useUuidForLayers()->setSelected(sprite->useLayerUuids());
+
     m_userDataView.configureAndSet(m_sprite->userData(), propertiesGrid());
 
     if (sprite->tilesets()->size() == 0) {
@@ -233,15 +234,14 @@ protected:
   void onExecute(Context* context) override;
 };
 
-SpritePropertiesCommand::SpritePropertiesCommand()
-  : Command(CommandId::SpriteProperties(), CmdUIOnlyFlag)
+SpritePropertiesCommand::SpritePropertiesCommand() : Command(CommandId::SpriteProperties())
 {
 }
 
 bool SpritePropertiesCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
-                             ContextFlags::HasActiveSprite);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
+                                                         ContextFlags::HasActiveSprite);
 }
 
 void SpritePropertiesCommand::onExecute(Context* context)
@@ -397,6 +397,8 @@ void SpritePropertiesCommand::onExecute(Context* context)
 
     const UserData newUserData = window.getUserData();
 
+    sprite->useLayerUuids(window.useUuidForLayers()->isSelected());
+
     if (index != sprite->transparentColor() || pixelRatio != sprite->pixelRatio() ||
         newUserData != sprite->userData()) {
       Tx tx(writer, Strings::sprite_properties_change_sprite_props());
diff --git a/src/app/commands/cmd_sprite_size.cpp b/src/app/commands/cmd_sprite_size.cpp
index fa975d82b..a4665d301 100644
--- a/src/app/commands/cmd_sprite_size.cpp
+++ b/src/app/commands/cmd_sprite_size.cpp
@@ -372,7 +372,7 @@ protected:
 };
 
 SpriteSizeCommand::SpriteSizeCommand()
-  : CommandWithNewParams<SpriteSizeParams>(CommandId::SpriteSize(), CmdRecordableFlag)
+  : CommandWithNewParams<SpriteSizeParams>(CommandId::SpriteSize())
 {
 }
 
diff --git a/src/app/commands/cmd_swap_checkerboard_colors.cpp b/src/app/commands/cmd_swap_checkerboard_colors.cpp
index d9b5424c3..37939e0a2 100644
--- a/src/app/commands/cmd_swap_checkerboard_colors.cpp
+++ b/src/app/commands/cmd_swap_checkerboard_colors.cpp
@@ -8,11 +8,9 @@
   #include "config.h"
 #endif
 
-#include "app/app.h"
 #include "app/commands/command.h"
 #include "app/context.h"
 #include "app/ui/editor/editor.h"
-#include "ui/base.h"
 
 namespace app {
 
@@ -26,7 +24,7 @@ protected:
 };
 
 SwapCheckerboardColorsCommand::SwapCheckerboardColorsCommand()
-  : Command(CommandId::SwapCheckerboardColors(), CmdUIOnlyFlag)
+  : Command(CommandId::SwapCheckerboardColors())
 {
 }
 
diff --git a/src/app/commands/cmd_switch_colors.cpp b/src/app/commands/cmd_switch_colors.cpp
index 23a7b8ccc..514685a73 100644
--- a/src/app/commands/cmd_switch_colors.cpp
+++ b/src/app/commands/cmd_switch_colors.cpp
@@ -14,7 +14,6 @@
 #include "app/ui/color_bar.h"
 #include "app/ui/context_bar.h"
 #include "app/ui/editor/editor.h"
-#include "ui/base.h"
 
 namespace app {
 
@@ -27,7 +26,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-SwitchColorsCommand::SwitchColorsCommand() : Command(CommandId::SwitchColors(), CmdUIOnlyFlag)
+SwitchColorsCommand::SwitchColorsCommand() : Command(CommandId::SwitchColors())
 {
 }
 
diff --git a/src/app/commands/cmd_symmetry_mode.cpp b/src/app/commands/cmd_symmetry_mode.cpp
index 43491f9e6..8adb69eaf 100644
--- a/src/app/commands/cmd_symmetry_mode.cpp
+++ b/src/app/commands/cmd_symmetry_mode.cpp
@@ -15,10 +15,8 @@
 #include "app/context.h"
 #include "app/doc.h"
 #include "app/i18n/strings.h"
-#include "app/modules/gui.h"
 #include "app/pref/preferences.h"
 #include "app/ui/context_bar.h"
-#include "app/ui_context.h"
 
 namespace app {
 
@@ -37,7 +35,7 @@ private:
   app::gen::SymmetryMode m_mode = app::gen::SymmetryMode::NONE;
 };
 
-SymmetryModeCommand::SymmetryModeCommand() : Command(CommandId::SymmetryMode(), CmdUIOnlyFlag)
+SymmetryModeCommand::SymmetryModeCommand() : Command(CommandId::SymmetryMode())
 {
 }
 
@@ -120,7 +118,8 @@ void SymmetryModeCommand::onExecute(Context* ctx)
     // TODO Same with context bar, in the future the context bar could
     //      be listening the DocPref changes to be automatically
     //      invalidated (like it already does with symmetryMode.enabled)
-    App::instance()->contextBar()->updateForActiveTool();
+    if (App::instance()->contextBar())
+      App::instance()->contextBar()->updateForActiveTool();
   }
 }
 
diff --git a/src/app/commands/cmd_tiled_mode.cpp b/src/app/commands/cmd_tiled_mode.cpp
index f06ebf64c..48a5f020f 100644
--- a/src/app/commands/cmd_tiled_mode.cpp
+++ b/src/app/commands/cmd_tiled_mode.cpp
@@ -35,7 +35,7 @@ protected:
 };
 
 TiledModeCommand::TiledModeCommand()
-  : Command(CommandId::TiledMode(), CmdUIOnlyFlag)
+  : Command(CommandId::TiledMode())
   , m_mode(filters::TiledMode::NONE)
 {
 }
diff --git a/src/app/commands/cmd_timeline.cpp b/src/app/commands/cmd_timeline.cpp
index 3be19233d..64cd78ea3 100644
--- a/src/app/commands/cmd_timeline.cpp
+++ b/src/app/commands/cmd_timeline.cpp
@@ -24,6 +24,7 @@ public:
   TimelineCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   bool onNeedsParams() const override { return true; }
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
@@ -34,13 +35,18 @@ protected:
   bool m_switch;
 };
 
-TimelineCommand::TimelineCommand() : Command(CommandId::Timeline(), CmdUIOnlyFlag)
+TimelineCommand::TimelineCommand() : Command(CommandId::Timeline())
 {
   m_open = true;
   m_close = false;
   m_switch = false;
 }
 
+bool TimelineCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void TimelineCommand::onLoadParams(const Params& params)
 {
   m_open = params.get_as<bool>("open");
diff --git a/src/app/commands/cmd_toggle_preview.cpp b/src/app/commands/cmd_toggle_preview.cpp
index 9fd291b70..030e8d54a 100644
--- a/src/app/commands/cmd_toggle_preview.cpp
+++ b/src/app/commands/cmd_toggle_preview.cpp
@@ -26,14 +26,14 @@ protected:
   void onExecute(Context* context) override;
 };
 
-TogglePreviewCommand::TogglePreviewCommand() : Command(CommandId::TogglePreview(), CmdUIOnlyFlag)
+TogglePreviewCommand::TogglePreviewCommand() : Command(CommandId::TogglePreview())
 {
 }
 
 bool TogglePreviewCommand::onEnabled(Context* context)
 {
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
-                             ContextFlags::HasActiveSprite);
+  return context->isUIAvailable() && context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
+                                                         ContextFlags::HasActiveSprite);
 }
 
 bool TogglePreviewCommand::onChecked(Context* context)
diff --git a/src/app/commands/cmd_toggle_tiles_mode.cpp b/src/app/commands/cmd_toggle_tiles_mode.cpp
index 5cee869fa..f322a13d5 100644
--- a/src/app/commands/cmd_toggle_tiles_mode.cpp
+++ b/src/app/commands/cmd_toggle_tiles_mode.cpp
@@ -18,7 +18,7 @@ using namespace gfx;
 
 class ToggleTilesModeCommand : public Command {
 public:
-  ToggleTilesModeCommand() : Command(CommandId::ToggleTilesMode(), CmdUIOnlyFlag) {}
+  ToggleTilesModeCommand() : Command(CommandId::ToggleTilesMode()) {}
 
 protected:
   bool onChecked(Context* context) override
diff --git a/src/app/commands/cmd_toggle_timeline_thumbnails.cpp b/src/app/commands/cmd_toggle_timeline_thumbnails.cpp
index 31112f98b..b81bcb7d6 100644
--- a/src/app/commands/cmd_toggle_timeline_thumbnails.cpp
+++ b/src/app/commands/cmd_toggle_timeline_thumbnails.cpp
@@ -10,7 +10,6 @@
   #include "config.h"
 #endif
 
-#include "app/app.h"
 #include "app/commands/command.h"
 #include "app/context.h"
 #include "app/doc.h"
@@ -22,9 +21,7 @@ using namespace gfx;
 
 class ToggleTimelineThumbnailsCommand : public Command {
 public:
-  ToggleTimelineThumbnailsCommand() : Command(CommandId::ToggleTimelineThumbnails(), CmdUIOnlyFlag)
-  {
-  }
+  ToggleTimelineThumbnailsCommand() : Command(CommandId::ToggleTimelineThumbnails()) {}
 
 protected:
   bool onChecked(Context* context) override
diff --git a/src/app/commands/cmd_undo.cpp b/src/app/commands/cmd_undo.cpp
index 96f31117e..0bf9d38d1 100644
--- a/src/app/commands/cmd_undo.cpp
+++ b/src/app/commands/cmd_undo.cpp
@@ -23,7 +23,6 @@
 #include "base/thread.h"
 #include "doc/sprite.h"
 #include "ui/manager.h"
-#include "ui/system.h"
 
 namespace app {
 
@@ -42,7 +41,7 @@ private:
 };
 
 UndoCommand::UndoCommand(Type type)
-  : Command((type == Undo ? CommandId::Undo() : CommandId::Redo()), CmdUIOnlyFlag)
+  : Command((type == Undo ? CommandId::Undo() : CommandId::Redo()))
   , m_type(type)
 {
 }
diff --git a/src/app/commands/cmd_undo_history.cpp b/src/app/commands/cmd_undo_history.cpp
index f15c8c94e..c02f51036 100644
--- a/src/app/commands/cmd_undo_history.cpp
+++ b/src/app/commands/cmd_undo_history.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2022  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2015-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -21,6 +21,7 @@
 #include "app/doc_undo.h"
 #include "app/doc_undo_observer.h"
 #include "app/docs_observer.h"
+#include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/modules/palettes.h"
 #include "app/site.h"
@@ -28,10 +29,10 @@
 #include "app/ui/workspace.h"
 #include "base/mem_utils.h"
 #include "fmt/format.h"
-#include "ui/init_theme_event.h"
-#include "ui/listitem.h"
+#include "text/font_metrics.h"
 #include "ui/message.h"
 #include "ui/paint_event.h"
+#include "ui/scale.h"
 #include "ui/size_hint_event.h"
 #include "ui/view.h"
 #include "undo/undo_state.h"
@@ -290,7 +291,7 @@ public:
                    base::get_pretty_memory_size(static_cast<Cmd*>(state->cmd())->memSize())
 #endif
                  :
-                 std::string("Initial State"));
+                 Strings::undo_history_initial_state());
 
       if ((g->getClipBounds() & itemBounds).isEmpty())
         return;
@@ -300,9 +301,14 @@ public:
         style = theme->styles.undoSavedItem();
       }
 
+      text::FontMetrics metrics;
+      font()->metrics(&metrics);
+      const float lineHeight = metrics.descent - metrics.ascent;
+
       ui::PaintWidgetPartInfo info;
       info.text = &itemText;
       info.styleFlags = (selected ? ui::Style::Layer::kSelected : 0);
+      info.baseline = ui::guiscaled_center(itemBounds.y, itemBounds.h, lineHeight) - metrics.ascent;
       theme->paintWidgetPart(g, style, itemBounds, info);
     }
 
@@ -489,15 +495,21 @@ public:
   UndoHistoryCommand();
 
 protected:
+  bool onEnabled(Context* context) override;
   void onExecute(Context* ctx) override;
 };
 
 static UndoHistoryWindow* g_window = NULL;
 
-UndoHistoryCommand::UndoHistoryCommand() : Command(CommandId::UndoHistory(), CmdUIOnlyFlag)
+UndoHistoryCommand::UndoHistoryCommand() : Command(CommandId::UndoHistory())
 {
 }
 
+bool UndoHistoryCommand::onEnabled(Context* context)
+{
+  return context->isUIAvailable();
+}
+
 void UndoHistoryCommand::onExecute(Context* ctx)
 {
   if (!g_window)
diff --git a/src/app/commands/cmd_unlink_cel.cpp b/src/app/commands/cmd_unlink_cel.cpp
index 25e751d44..61e82e642 100644
--- a/src/app/commands/cmd_unlink_cel.cpp
+++ b/src/app/commands/cmd_unlink_cel.cpp
@@ -19,7 +19,6 @@
 #include "app/ui/status_bar.h"
 #include "doc/cel.h"
 #include "doc/layer.h"
-#include "doc/sprite.h"
 
 namespace app {
 
@@ -32,7 +31,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-UnlinkCelCommand::UnlinkCelCommand() : Command(CommandId::UnlinkCel(), CmdRecordableFlag)
+UnlinkCelCommand::UnlinkCelCommand() : Command(CommandId::UnlinkCel())
 {
 }
 
diff --git a/src/app/commands/cmd_zoom.cpp b/src/app/commands/cmd_zoom.cpp
index 96aee22c6..a7374c3a9 100644
--- a/src/app/commands/cmd_zoom.cpp
+++ b/src/app/commands/cmd_zoom.cpp
@@ -43,7 +43,7 @@ private:
 };
 
 ZoomCommand::ZoomCommand()
-  : Command(CommandId::Zoom(), CmdUIOnlyFlag)
+  : Command(CommandId::Zoom())
   , m_action(Action::In)
   , m_zoom(1, 1)
   , m_focus(Focus::Default)
diff --git a/src/app/commands/command.cpp b/src/app/commands/command.cpp
index f94ef5b8f..f6625f6af 100644
--- a/src/app/commands/command.cpp
+++ b/src/app/commands/command.cpp
@@ -16,7 +16,7 @@
 
 namespace app {
 
-Command::Command(const char* id, CommandFlags flags) : m_id(id), m_flags(flags)
+Command::Command(const char* id) : m_id(id)
 {
 }
 
diff --git a/src/app/commands/command.h b/src/app/commands/command.h
index 9d01d385b..2f13a868e 100644
--- a/src/app/commands/command.h
+++ b/src/app/commands/command.h
@@ -20,14 +20,9 @@ namespace app {
 class Context;
 class Params;
 
-enum CommandFlags {
-  CmdUIOnlyFlag = 0x00000001,
-  CmdRecordableFlag = 0x00000002,
-};
-
 class Command {
 public:
-  Command(const char* id, CommandFlags flags);
+  Command(const char* id);
   virtual ~Command();
 
   const std::string& id() const { return m_id; }
@@ -55,7 +50,6 @@ private:
   void execute(Context* context);
 
   std::string m_id;
-  CommandFlags m_flags;
 };
 
 } // namespace app
diff --git a/src/app/commands/commands_list.h b/src/app/commands/commands_list.h
index 4177aec0b..5a32f7495 100644
--- a/src/app/commands/commands_list.h
+++ b/src/app/commands/commands_list.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2024  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -174,6 +174,7 @@ FOR_EACH_COMMAND(TogglePreview)
 FOR_EACH_COMMAND(ToggleRewindOnStop)
 FOR_EACH_COMMAND(ToggleTilesMode)
 FOR_EACH_COMMAND(ToggleTimelineThumbnails)
+FOR_EACH_COMMAND(ToggleWorkspaceLayout)
 FOR_EACH_COMMAND(Undo)
 FOR_EACH_COMMAND(UndoHistory)
 FOR_EACH_COMMAND(UnlinkCel)
diff --git a/src/app/commands/convert_layer.cpp b/src/app/commands/convert_layer.cpp
index c80cab48d..4414bc4ba 100644
--- a/src/app/commands/convert_layer.cpp
+++ b/src/app/commands/convert_layer.cpp
@@ -79,7 +79,7 @@ private:
 };
 
 ConvertLayerCommand::ConvertLayerCommand()
-  : CommandWithNewParams<ConvertLayerParams>(CommandId::ConvertLayer(), CmdRecordableFlag)
+  : CommandWithNewParams<ConvertLayerParams>(CommandId::ConvertLayer())
 {
 }
 
diff --git a/src/app/commands/copy_path.cpp b/src/app/commands/copy_path.cpp
index 4586ebf9f..02c4602f7 100644
--- a/src/app/commands/copy_path.cpp
+++ b/src/app/commands/copy_path.cpp
@@ -26,7 +26,7 @@ protected:
   void onExecute(Context* ctx) override;
 };
 
-CopyPathCommand::CopyPathCommand() : Command(CommandId::CopyPath(), CmdRecordableFlag)
+CopyPathCommand::CopyPathCommand() : Command(CommandId::CopyPath())
 {
 }
 
diff --git a/src/app/commands/debugger.cpp b/src/app/commands/debugger.cpp
index ab2b36e92..095fb1e25 100644
--- a/src/app/commands/debugger.cpp
+++ b/src/app/commands/debugger.cpp
@@ -244,7 +244,7 @@ protected:
         for (const uint8_t* line : m_fileContent->lines) {
           ASSERT(line);
           tmp.assign((const char*)line);
-          m_maxLineWidth = std::max(m_maxLineWidth, f->textLength(tmp));
+          m_maxLineWidth = std::max<int>(m_maxLineWidth, std::ceil(f->textLength(tmp)));
         }
       }
 
@@ -775,7 +775,7 @@ private:
   bool m_fileOk = true;
 };
 
-DebuggerCommand::DebuggerCommand() : Command(CommandId::Debugger(), CmdRecordableFlag)
+DebuggerCommand::DebuggerCommand() : Command(CommandId::Debugger())
 {
 }
 
diff --git a/src/app/commands/filters/cmd_brightness_contrast.cpp b/src/app/commands/filters/cmd_brightness_contrast.cpp
index db7928bfc..a7e05babe 100644
--- a/src/app/commands/filters/cmd_brightness_contrast.cpp
+++ b/src/app/commands/filters/cmd_brightness_contrast.cpp
@@ -85,8 +85,7 @@ protected:
 };
 
 BrightnessContrastCommand::BrightnessContrastCommand()
-  : CommandWithNewParams<BrightnessContrastParams>(CommandId::BrightnessContrast(),
-                                                   CmdRecordableFlag)
+  : CommandWithNewParams<BrightnessContrastParams>(CommandId::BrightnessContrast())
 {
 }
 
diff --git a/src/app/commands/filters/cmd_color_curve.cpp b/src/app/commands/filters/cmd_color_curve.cpp
index e1e4deefb..af12a9058 100644
--- a/src/app/commands/filters/cmd_color_curve.cpp
+++ b/src/app/commands/filters/cmd_color_curve.cpp
@@ -82,7 +82,7 @@ protected:
 };
 
 ColorCurveCommand::ColorCurveCommand()
-  : CommandWithNewParams<ColorCurveParams>(CommandId::ColorCurve(), CmdRecordableFlag)
+  : CommandWithNewParams<ColorCurveParams>(CommandId::ColorCurve())
 {
 }
 
diff --git a/src/app/commands/filters/cmd_convolution_matrix.cpp b/src/app/commands/filters/cmd_convolution_matrix.cpp
index 18a79de78..6185fc5b4 100644
--- a/src/app/commands/filters/cmd_convolution_matrix.cpp
+++ b/src/app/commands/filters/cmd_convolution_matrix.cpp
@@ -162,7 +162,7 @@ protected:
 };
 
 ConvolutionMatrixCommand::ConvolutionMatrixCommand()
-  : CommandWithNewParams<ConvolutionMatrixParams>(CommandId::ConvolutionMatrix(), CmdRecordableFlag)
+  : CommandWithNewParams<ConvolutionMatrixParams>(CommandId::ConvolutionMatrix())
 {
 }
 
diff --git a/src/app/commands/filters/cmd_despeckle.cpp b/src/app/commands/filters/cmd_despeckle.cpp
index c202db84a..8618c9f2a 100644
--- a/src/app/commands/filters/cmd_despeckle.cpp
+++ b/src/app/commands/filters/cmd_despeckle.cpp
@@ -106,8 +106,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-DespeckleCommand::DespeckleCommand()
-  : CommandWithNewParams<DespeckleParams>(CommandId::Despeckle(), CmdRecordableFlag)
+DespeckleCommand::DespeckleCommand() : CommandWithNewParams<DespeckleParams>(CommandId::Despeckle())
 {
 }
 
diff --git a/src/app/commands/filters/cmd_hue_saturation.cpp b/src/app/commands/filters/cmd_hue_saturation.cpp
index 9073b4099..044063eae 100644
--- a/src/app/commands/filters/cmd_hue_saturation.cpp
+++ b/src/app/commands/filters/cmd_hue_saturation.cpp
@@ -139,7 +139,7 @@ protected:
 };
 
 HueSaturationCommand::HueSaturationCommand()
-  : CommandWithNewParams<HueSaturationParams>(CommandId::HueSaturation(), CmdRecordableFlag)
+  : CommandWithNewParams<HueSaturationParams>(CommandId::HueSaturation())
 {
 }
 
diff --git a/src/app/commands/filters/cmd_invert_color.cpp b/src/app/commands/filters/cmd_invert_color.cpp
index bcf9024ee..7e58ca148 100644
--- a/src/app/commands/filters/cmd_invert_color.cpp
+++ b/src/app/commands/filters/cmd_invert_color.cpp
@@ -59,7 +59,7 @@ protected:
 };
 
 InvertColorCommand::InvertColorCommand()
-  : CommandWithNewParams<InvertColorParams>(CommandId::InvertColor(), CmdRecordableFlag)
+  : CommandWithNewParams<InvertColorParams>(CommandId::InvertColor())
 {
 }
 
diff --git a/src/app/commands/filters/cmd_outline.cpp b/src/app/commands/filters/cmd_outline.cpp
index 0ef971300..925895d61 100644
--- a/src/app/commands/filters/cmd_outline.cpp
+++ b/src/app/commands/filters/cmd_outline.cpp
@@ -195,8 +195,7 @@ protected:
   void onExecute(Context* context) override;
 };
 
-OutlineCommand::OutlineCommand()
-  : CommandWithNewParams<OutlineParams>(CommandId::Outline(), CmdRecordableFlag)
+OutlineCommand::OutlineCommand() : CommandWithNewParams<OutlineParams>(CommandId::Outline())
 {
 }
 
diff --git a/src/app/commands/filters/cmd_replace_color.cpp b/src/app/commands/filters/cmd_replace_color.cpp
index 3542d503c..86c0619fc 100644
--- a/src/app/commands/filters/cmd_replace_color.cpp
+++ b/src/app/commands/filters/cmd_replace_color.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -128,7 +128,7 @@ private:
       case ui::kKeyDownMessage: {
         KeyboardShortcuts* keys = KeyboardShortcuts::instance();
         const KeyPtr key = keys->command(CommandId::SwitchColors());
-        if (key && key->isPressed(msg, *keys)) {
+        if (key && key->isPressed(msg)) {
           // Switch colors
           app::Color from = m_fromButton->getColor();
           app::Color to = m_toButton->getColor();
@@ -158,7 +158,7 @@ protected:
 };
 
 ReplaceColorCommand::ReplaceColorCommand()
-  : CommandWithNewParams<ReplaceColorParams>(CommandId::ReplaceColor(), CmdRecordableFlag)
+  : CommandWithNewParams<ReplaceColorParams>(CommandId::ReplaceColor())
 {
 }
 
diff --git a/src/app/commands/filters/filter_manager_impl.cpp b/src/app/commands/filters/filter_manager_impl.cpp
index 5830771ac..98da7d6ca 100644
--- a/src/app/commands/filters/filter_manager_impl.cpp
+++ b/src/app/commands/filters/filter_manager_impl.cpp
@@ -247,6 +247,9 @@ void FilterManagerImpl::apply()
   }
   else {
     result = CommandResult(CommandResult::kCanceled);
+
+    // Rollback transaction
+    m_tx.reset();
   }
 
   ASSERT(m_reader.context());
diff --git a/src/app/commands/filters/filter_preview.cpp b/src/app/commands/filters/filter_preview.cpp
index bf887f3af..80c3105a3 100644
--- a/src/app/commands/filters/filter_preview.cpp
+++ b/src/app/commands/filters/filter_preview.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2023  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -74,6 +74,7 @@ void FilterPreview::stop()
       m_filterMgr->end();
     }
     m_timer.stop();
+    m_restartPreviewTimer.stop();
   }
 
   // Wait the filter task to end.
diff --git a/src/app/commands/filters/filter_worker.cpp b/src/app/commands/filters/filter_worker.cpp
index 6c0e0fcd0..e585da5db 100644
--- a/src/app/commands/filters/filter_worker.cpp
+++ b/src/app/commands/filters/filter_worker.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -149,9 +149,6 @@ void FilterWorker::run()
     Console console;
     console.printf("A problem has occurred.\n\nDetails:\n%s", m_error.c_str());
   }
-  else if (m_cancelled && !m_filterMgr->isTransaction()) {
-    StatusBar::instance()->showTip(2500, Strings::statusbar_tips_filter_no_unlocked_layer());
-  }
 }
 
 // Called by FilterManagerImpl to informate the progress of the filter.
diff --git a/src/app/commands/move_colors_command.cpp b/src/app/commands/move_colors_command.cpp
index aa22189ac..bad3398bf 100644
--- a/src/app/commands/move_colors_command.cpp
+++ b/src/app/commands/move_colors_command.cpp
@@ -33,8 +33,7 @@ class MoveColorsCommand : public CommandWithNewParams<MoveColorsParams> {
 public:
   MoveColorsCommand(bool copy)
     : CommandWithNewParams<MoveColorsParams>(
-        (copy ? CommandId::CopyColors() : CommandId::MoveColors()),
-        CmdRecordableFlag)
+        (copy ? CommandId::CopyColors() : CommandId::MoveColors()))
     , m_copy(copy)
   {
   }
diff --git a/src/app/commands/move_tiles_command.cpp b/src/app/commands/move_tiles_command.cpp
index 45aa2cabd..b9b456987 100644
--- a/src/app/commands/move_tiles_command.cpp
+++ b/src/app/commands/move_tiles_command.cpp
@@ -31,8 +31,7 @@ class MoveTilesCommand : public CommandWithNewParams<MoveTilesParams> {
 public:
   MoveTilesCommand(const bool copy)
     : CommandWithNewParams<MoveTilesParams>(
-        (copy ? CommandId::CopyTiles() : CommandId::MoveTiles()),
-        CmdRecordableFlag)
+        (copy ? CommandId::CopyTiles() : CommandId::MoveTiles()))
     , m_copy(copy)
   {
   }
diff --git a/src/app/commands/quick_command.cpp b/src/app/commands/quick_command.cpp
index b3015a24e..da499421f 100644
--- a/src/app/commands/quick_command.cpp
+++ b/src/app/commands/quick_command.cpp
@@ -13,7 +13,7 @@
 namespace app {
 
 QuickCommand::QuickCommand(const char* id, std::function<void()> execute)
-  : Command(id, CmdUIOnlyFlag)
+  : Command(id)
   , m_execute(execute)
 {
 }
diff --git a/src/app/commands/screenshot.cpp b/src/app/commands/screenshot.cpp
index cca841583..a9e59b624 100644
--- a/src/app/commands/screenshot.cpp
+++ b/src/app/commands/screenshot.cpp
@@ -58,7 +58,7 @@ protected:
 };
 
 ScreenshotCommand::ScreenshotCommand()
-  : CommandWithNewParams<ScreenshotParams>(CommandId::Screenshot(), CmdUIOnlyFlag)
+  : CommandWithNewParams<ScreenshotParams>(CommandId::Screenshot())
 {
 }
 
diff --git a/src/app/commands/set_playback_speed.cpp b/src/app/commands/set_playback_speed.cpp
index 84e58ff5b..02114aa86 100644
--- a/src/app/commands/set_playback_speed.cpp
+++ b/src/app/commands/set_playback_speed.cpp
@@ -31,7 +31,7 @@ protected:
 };
 
 SetPlaybackSpeedCommand::SetPlaybackSpeedCommand()
-  : CommandWithNewParams(CommandId::SetPlaybackSpeed(), CmdUIOnlyFlag)
+  : CommandWithNewParams(CommandId::SetPlaybackSpeed())
 {
 }
 
diff --git a/src/app/commands/show_menu.cpp b/src/app/commands/show_menu.cpp
index 4e0c844a6..3a0749191 100644
--- a/src/app/commands/show_menu.cpp
+++ b/src/app/commands/show_menu.cpp
@@ -33,8 +33,7 @@ protected:
   void openSubmenuById(Menu* menu, const std::string& id);
 };
 
-ShowMenuCommand::ShowMenuCommand()
-  : CommandWithNewParams<ShowMenuParams>(CommandId::ShowMenu(), CmdUIOnlyFlag)
+ShowMenuCommand::ShowMenuCommand() : CommandWithNewParams<ShowMenuParams>(CommandId::ShowMenu())
 {
 }
 
diff --git a/src/app/commands/tileset_mode.cpp b/src/app/commands/tileset_mode.cpp
index 614019c30..d91572481 100644
--- a/src/app/commands/tileset_mode.cpp
+++ b/src/app/commands/tileset_mode.cpp
@@ -20,10 +20,7 @@ using namespace gfx;
 
 class TilesetModeCommand : public Command {
 public:
-  TilesetModeCommand() : Command(CommandId::TilesetMode(), CmdUIOnlyFlag)
-  {
-    m_mode = TilesetMode::Auto;
-  }
+  TilesetModeCommand() : Command(CommandId::TilesetMode()) { m_mode = TilesetMode::Auto; }
 
 protected:
   void onLoadParams(const Params& params) override
diff --git a/src/app/commands/toggle_other_layers_opacity.cpp b/src/app/commands/toggle_other_layers_opacity.cpp
index c92ac8fec..64991eacf 100644
--- a/src/app/commands/toggle_other_layers_opacity.cpp
+++ b/src/app/commands/toggle_other_layers_opacity.cpp
@@ -39,8 +39,7 @@ private:
 };
 
 ToggleOtherLayersOpacityCommand::ToggleOtherLayersOpacityCommand()
-  : CommandWithNewParams<ToggleOtherLayersOpacityParams>(CommandId::ToggleOtherLayersOpacity(),
-                                                         CmdUIOnlyFlag)
+  : CommandWithNewParams<ToggleOtherLayersOpacityParams>(CommandId::ToggleOtherLayersOpacity())
 {
 }
 
diff --git a/src/app/commands/toggle_play_option.cpp b/src/app/commands/toggle_play_option.cpp
index 1f7d02adc..cd96d6d81 100644
--- a/src/app/commands/toggle_play_option.cpp
+++ b/src/app/commands/toggle_play_option.cpp
@@ -39,7 +39,7 @@ protected:
 TogglePlayOptionCommand::TogglePlayOptionCommand(const char* id,
                                                  Option<bool>* general,
                                                  Option<bool>* preview)
-  : Command(id, CmdUIOnlyFlag)
+  : Command(id)
   , m_general(general)
   , m_preview(preview)
 {
diff --git a/src/app/commands/toggle_workspace_layout.cpp b/src/app/commands/toggle_workspace_layout.cpp
new file mode 100644
index 000000000..5e54be315
--- /dev/null
+++ b/src/app/commands/toggle_workspace_layout.cpp
@@ -0,0 +1,54 @@
+// Aseprite
+// Copyright (c) 2024  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/app.h"
+#include "app/commands/command.h"
+#include "app/context.h"
+#include "app/ui/layout_selector.h"
+#include "app/ui/main_window.h"
+
+namespace app {
+
+class ToggleWorkspaceLayoutCommand : public Command {
+public:
+  ToggleWorkspaceLayoutCommand();
+
+protected:
+  bool onEnabled(Context* ctx) override;
+  bool onChecked(Context* ctx) override;
+  void onExecute(Context* ctx) override;
+};
+
+ToggleWorkspaceLayoutCommand::ToggleWorkspaceLayoutCommand()
+  : Command(CommandId::ToggleWorkspaceLayout())
+{
+}
+
+bool ToggleWorkspaceLayoutCommand::onEnabled(Context* ctx)
+{
+  return ctx->isUIAvailable();
+}
+
+bool ToggleWorkspaceLayoutCommand::onChecked(Context* ctx)
+{
+  return App::instance()->mainWindow()->layoutSelector()->isSelectorVisible();
+}
+
+void ToggleWorkspaceLayoutCommand::onExecute(Context* ctx)
+{
+  App::instance()->mainWindow()->layoutSelector()->switchSelectorFromCommand();
+}
+
+Command* CommandFactory::createToggleWorkspaceLayoutCommand()
+{
+  return new ToggleWorkspaceLayoutCommand();
+}
+
+} // namespace app
diff --git a/src/app/console.cpp b/src/app/console.cpp
index d449252c0..f1954d1c6 100644
--- a/src/app/console.cpp
+++ b/src/app/console.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -48,9 +48,12 @@ public:
 
     // When the main window is closed, we should close the console (in
     // other case the main message loop will continue running for the
-    // console too).
-    m_mainWindowClosedConn = App::instance()->mainWindow()->Close.connect(
-      [this] { closeWindow(nullptr); });
+    // console too). The main window can be nullptr if the console is
+    // used to show an error when loading the default theme or font at
+    // the initialization.
+    if (auto* mainWin = App::instance()->mainWindow()) {
+      m_mainWindowClosedConn = mainWin->Close.connect([this] { closeWindow(nullptr); });
+    }
 
     // When the window is closed, we clear the text
     Close.connect([this] {
diff --git a/src/app/context.cpp b/src/app/context.cpp
index 046e1bad9..4e77825ef 100644
--- a/src/app/context.cpp
+++ b/src/app/context.cpp
@@ -198,6 +198,8 @@ void Context::executeCommand(Command* command, const Params& params)
     }
     else {
       LOG(VERBOSE, "CTXT: Command %s is disabled\n", command->id().c_str());
+      m_result = CommandResult(CommandResult::kDisabled);
+      return;
     }
 
     AfterCommandExecution(ev);
diff --git a/src/app/context.h b/src/app/context.h
index d42566940..9e0a84454 100644
--- a/src/app/context.h
+++ b/src/app/context.h
@@ -48,6 +48,8 @@ public:
     kError,
     // Canceled by user.
     kCanceled,
+    // Disabled.
+    kDisabled
   };
 
   CommandResult(Type type = Type::kOk) : m_type(type) {}
diff --git a/src/app/crash/data_recovery.cpp b/src/app/crash/data_recovery.cpp
index e12fbf1e7..0dba039f7 100644
--- a/src/app/crash/data_recovery.cpp
+++ b/src/app/crash/data_recovery.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2023  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -139,6 +139,13 @@ DataRecovery::Sessions DataRecovery::sessions()
   return copy;
 }
 
+bool DataRecovery::isRunningSession(const SessionPtr& session) const
+{
+  ASSERT(session);
+  ASSERT(m_inProgress);
+  return session->path() == m_inProgress->path();
+}
+
 void DataRecovery::searchForSessions()
 {
   Sessions sessions;
@@ -150,7 +157,7 @@ void DataRecovery::searchForSessions()
     RECO_TRACE("RECO: Session '%s' ", itempath.c_str());
 
     SessionPtr session(new Session(&m_config, itempath));
-    if (!session->isRunning()) {
+    if (!isRunningSession(session)) {
       if ((session->isEmpty()) || (!session->isCrashedSession() && session->isOldSession())) {
         RECO_TRACE("to be deleted (%s)\n",
                    session->isEmpty() ? "is empty" :
diff --git a/src/app/crash/data_recovery.h b/src/app/crash/data_recovery.h
index 3b857f4a1..02c3efb2c 100644
--- a/src/app/crash/data_recovery.h
+++ b/src/app/crash/data_recovery.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2021  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -45,6 +45,8 @@ public:
   // Returns a copy of the list of sessions that can be recovered.
   Sessions sessions();
 
+  bool isRunningSession(const SessionPtr& session) const;
+
   // Triggered in the UI-thread from the m_thread using an
   // ui::execute_from_ui_thread() when the list of sessions is ready
   // to be used.
diff --git a/src/app/crash/read_document.cpp b/src/app/crash/read_document.cpp
index 3a54dc427..4727242e8 100644
--- a/src/app/crash/read_document.cpp
+++ b/src/app/crash/read_document.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -44,6 +44,7 @@
 #include "doc/tilesets.h"
 #include "doc/user_data_io.h"
 #include "doc/util.h"
+#include "doc/uuid_io.h"
 #include "fixmath/fixmath.h"
 
 #include <fstream>
@@ -450,6 +451,7 @@ private:
            type == ObjectType::LayerTilemap);
 
     std::string name = read_string(s);
+
     std::unique_ptr<Layer> lay;
 
     switch (type) {
@@ -495,13 +497,19 @@ private:
         break;
     }
 
-    if (lay) {
-      UserData userData = read_user_data(s, m_serial);
-      lay->setUserData(userData);
-      return lay.release();
-    }
-    else
+    if (!lay)
       return nullptr;
+
+    UserData userData = read_user_data(s, m_serial);
+    lay->setUserData(userData);
+
+    base::Uuid uuid;
+    if (m_serial >= SerialFormat::Ver3) {
+      uuid = read_uuid(s);
+      lay->setUuid(uuid);
+    }
+
+    return lay.release();
   }
 
   Cel* readCel(std::ifstream& s) { return read_cel(s, this, false); }
diff --git a/src/app/crash/session.cpp b/src/app/crash/session.cpp
index 764485e5b..6427d251f 100644
--- a/src/app/crash/session.cpp
+++ b/src/app/crash/session.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -19,12 +19,10 @@
 #include "app/crash/write_document.h"
 #include "app/doc.h"
 #include "app/doc_access.h"
-#include "app/file/file.h"
 #include "app/ui_context.h"
 #include "base/convert_to.h"
 #include "base/fs.h"
 #include "base/fstream_path.h"
-#include "base/process.h"
 #include "base/split_string.h"
 #include "base/string.h"
 #include "base/thread.h"
@@ -128,12 +126,6 @@ const Session::Backups& Session::backups()
   return m_backups;
 }
 
-bool Session::isRunning()
-{
-  loadPid();
-  return base::get_process_name(m_pid) == base::get_process_name(base::get_current_process_id());
-}
-
 bool Session::isCrashedSession()
 {
   loadPid();
diff --git a/src/app/crash/session.h b/src/app/crash/session.h
index d6cfcd747..ccf3e34ff 100644
--- a/src/app/crash/session.h
+++ b/src/app/crash/session.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -47,9 +47,9 @@ public:
 
   std::string name() const;
   std::string version();
+  std::string& path() { return m_path; }
   const Backups& backups();
 
-  bool isRunning();
   bool isCrashedSession();
   bool isOldSession();
   bool isEmpty();
diff --git a/src/app/crash/write_document.cpp b/src/app/crash/write_document.cpp
index 3437fbe68..d976ccd7d 100644
--- a/src/app/crash/write_document.cpp
+++ b/src/app/crash/write_document.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -41,6 +41,7 @@
 #include "doc/tileset_io.h"
 #include "doc/tilesets.h"
 #include "doc/user_data_io.h"
+#include "doc/uuid_io.h"
 #include "fixmath/fixmath.h"
 
 #include <fstream>
@@ -282,6 +283,8 @@ private:
 
     // Save user data
     write_user_data(s, lay->userData());
+
+    write_uuid(s, lay->uuid());
     return true;
   }
 
diff --git a/src/app/doc.h b/src/app/doc.h
index 6e692ac99..66166b68e 100644
--- a/src/app/doc.h
+++ b/src/app/doc.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
diff --git a/src/app/doc_api.cpp b/src/app/doc_api.cpp
index e613ec1ae..d739ab88b 100644
--- a/src/app/doc_api.cpp
+++ b/src/app/doc_api.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -14,6 +14,7 @@
 #include "app/cmd/add_cel.h"
 #include "app/cmd/add_frame.h"
 #include "app/cmd/add_layer.h"
+#include "app/cmd/add_tileset.h"
 #include "app/cmd/clear_cel.h"
 #include "app/cmd/clear_image.h"
 #include "app/cmd/copy_cel.h"
@@ -52,6 +53,7 @@
 #include "doc/algorithm/flip_image.h"
 #include "doc/algorithm/shrink_bounds.h"
 #include "doc/cel.h"
+#include "doc/layer_tilemap.h"
 #include "doc/mask.h"
 #include "doc/palette.h"
 #include "doc/slice.h"
@@ -605,6 +607,18 @@ LayerImage* DocApi::newLayer(LayerGroup* parent, const std::string& name)
   return newLayer;
 }
 
+LayerImage* DocApi::newLayerAfter(LayerGroup* parent, const std::string& name, Layer* afterThis)
+{
+  LayerImage* newLayer = new LayerImage(parent->sprite());
+  newLayer->setName(name);
+
+  if (!afterThis)
+    afterThis = parent->lastLayer();
+
+  addLayer(parent, newLayer, afterThis);
+  return newLayer;
+}
+
 LayerGroup* DocApi::newGroup(LayerGroup* parent, const std::string& name)
 {
   LayerGroup* newLayerGroup = new LayerGroup(parent->sprite());
@@ -614,6 +628,33 @@ LayerGroup* DocApi::newGroup(LayerGroup* parent, const std::string& name)
   return newLayerGroup;
 }
 
+LayerGroup* DocApi::newGroupAfter(LayerGroup* parent, const std::string& name, Layer* afterThis)
+{
+  LayerGroup* newLayerGroup = new LayerGroup(parent->sprite());
+  newLayerGroup->setName(name);
+
+  if (!afterThis)
+    afterThis = parent->lastLayer();
+
+  addLayer(parent, newLayerGroup, afterThis);
+  return newLayerGroup;
+}
+
+LayerTilemap* DocApi::newTilemapAfter(LayerGroup* parent,
+                                      const std::string& name,
+                                      tileset_index tsi,
+                                      Layer* afterThis)
+{
+  LayerTilemap* newTilemap = new LayerTilemap(parent->sprite(), tsi);
+  newTilemap->setName(name);
+
+  if (!afterThis)
+    afterThis = parent->lastLayer();
+
+  addLayer(parent, newTilemap, afterThis);
+  return newTilemap;
+}
+
 void DocApi::addLayer(LayerGroup* parent, Layer* newLayer, Layer* afterThis)
 {
   m_transaction.execute(new cmd::AddLayer(parent, newLayer, afterThis));
@@ -652,23 +693,61 @@ void DocApi::restackLayerBefore(Layer* layer, LayerGroup* parent, Layer* beforeT
   restackLayerAfter(layer, parent, afterThis);
 }
 
-Layer* DocApi::duplicateLayerAfter(Layer* sourceLayer, LayerGroup* parent, Layer* afterLayer)
+Layer* DocApi::copyLayerWithSprite(doc::Layer* layer, doc::Sprite* sprite)
+{
+  std::unique_ptr<doc::Layer> clone;
+  if (layer->isTilemap()) {
+    auto* srcTilemap = static_cast<LayerTilemap*>(layer);
+    tileset_index tilesetIndex = srcTilemap->tilesetIndex();
+    // If the caller is trying to make a copy of a tilemap layer specifying a
+    // different sprite as its owner, then we must copy the tilesets of the
+    // given tilemap layer into the new owner.
+    if (sprite != srcTilemap->sprite()) {
+      auto* srcTilesetCopy = Tileset::MakeCopyCopyingImagesForSprite(srcTilemap->tileset(), sprite);
+      auto* addTileset = new cmd::AddTileset(sprite, srcTilesetCopy);
+      m_transaction.execute(addTileset);
+      tilesetIndex = addTileset->tilesetIndex();
+    }
+
+    clone = std::make_unique<LayerTilemap>(sprite, tilesetIndex);
+  }
+  else if (layer->isImage())
+    clone = std::make_unique<LayerImage>(sprite);
+  else if (layer->isGroup())
+    clone = std::make_unique<LayerGroup>(sprite);
+  else
+    throw std::runtime_error("Invalid layer type");
+
+  if (auto* doc = dynamic_cast<app::Doc*>(sprite->document())) {
+    doc->copyLayerContent(layer, doc, clone.get());
+  }
+
+  return clone.release();
+}
+
+Layer* DocApi::duplicateLayerAfter(Layer* sourceLayer,
+                                   LayerGroup* parent,
+                                   Layer* afterLayer,
+                                   const std::string& nameSuffix)
 {
   ASSERT(parent);
-  Layer* newLayerPtr = copy_layer(sourceLayer);
+  Layer* newLayerPtr = copyLayerWithSprite(sourceLayer, parent->sprite());
 
-  newLayerPtr->setName(newLayerPtr->name() + " Copy");
+  newLayerPtr->setName(newLayerPtr->name() + nameSuffix);
 
   addLayer(parent, newLayerPtr, afterLayer);
 
   return newLayerPtr;
 }
 
-Layer* DocApi::duplicateLayerBefore(Layer* sourceLayer, LayerGroup* parent, Layer* beforeLayer)
+Layer* DocApi::duplicateLayerBefore(Layer* sourceLayer,
+                                    LayerGroup* parent,
+                                    Layer* beforeLayer,
+                                    const std::string& nameSuffix)
 {
   ASSERT(parent);
   Layer* afterThis = (beforeLayer ? beforeLayer->getPreviousBrowsable() : nullptr);
-  Layer* newLayer = duplicateLayerAfter(sourceLayer, parent, afterThis);
+  Layer* newLayer = duplicateLayerAfter(sourceLayer, parent, afterThis, nameSuffix);
   if (newLayer)
     restackLayerBefore(newLayer, parent, beforeLayer);
   return newLayer;
diff --git a/src/app/doc_api.h b/src/app/doc_api.h
index ecceb3815..2c1c3b957 100644
--- a/src/app/doc_api.h
+++ b/src/app/doc_api.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -9,12 +9,14 @@
 #define APP_DOC_API_H_INCLUDED
 #pragma once
 
+#include "app/doc_api_dnd_helper.h"
 #include "app/drop_frame_place.h"
 #include "app/tags_handling.h"
 #include "doc/algorithm/flip_type.h"
 #include "doc/color.h"
 #include "doc/frame.h"
 #include "doc/image_ref.h"
+#include "doc/tile.h"
 #include "gfx/rect.h"
 
 #include <map>
@@ -26,6 +28,7 @@ class Image;
 class Layer;
 class LayerGroup;
 class LayerImage;
+class LayerTilemap;
 class Mask;
 class Palette;
 class Sprite;
@@ -36,6 +39,7 @@ class Doc;
 class Transaction;
 
 using namespace doc;
+using namespace docapi;
 
 // High-level API to modify a document adding undo information, i.e.
 // adding new "Cmd"s in the given transaction.
@@ -104,13 +108,25 @@ public:
 
   // Layers API
   LayerImage* newLayer(LayerGroup* parent, const std::string& name);
+  LayerImage* newLayerAfter(LayerGroup* parent, const std::string& name, Layer* afterThis);
   LayerGroup* newGroup(LayerGroup* parent, const std::string& name);
+  LayerGroup* newGroupAfter(LayerGroup* parent, const std::string& name, Layer* afterThis);
+  LayerTilemap* newTilemapAfter(LayerGroup* parent,
+                                const std::string& name,
+                                tileset_index tsi,
+                                Layer* afterThis);
   void addLayer(LayerGroup* parent, Layer* newLayer, Layer* afterThis);
   void removeLayer(Layer* layer);
   void restackLayerAfter(Layer* layer, LayerGroup* parent, Layer* afterThis);
   void restackLayerBefore(Layer* layer, LayerGroup* parent, Layer* beforeThis);
-  Layer* duplicateLayerAfter(Layer* sourceLayer, LayerGroup* parent, Layer* afterLayer);
-  Layer* duplicateLayerBefore(Layer* sourceLayer, LayerGroup* parent, Layer* beforeLayer);
+  Layer* duplicateLayerAfter(Layer* sourceLayer,
+                             LayerGroup* parent,
+                             Layer* afterLayer,
+                             const std::string& nameSuffix = std::string());
+  Layer* duplicateLayerBefore(Layer* sourceLayer,
+                              LayerGroup* parent,
+                              Layer* beforeLayer,
+                              const std::string& nameSuffix = std::string());
 
   // Images API
   void replaceImage(Sprite* sprite, const ImageRef& oldImage, const ImageRef& newImage);
@@ -126,6 +142,14 @@ public:
   // Palette API
   void setPalette(Sprite* sprite, frame_t frame, const Palette* newPalette);
 
+  // Drag and Drop helper API
+  void dropDocumentsOnTimeline(app::Doc* doc,
+                               doc::frame_t frame,
+                               doc::layer_t layerIndex,
+                               InsertionPoint insert,
+                               DroppedOn droppedOn,
+                               DocProvider& provider);
+
 private:
   void cropImageLayer(LayerImage* layer, const gfx::Rect& bounds, const bool trimOutside);
   bool cropCel(LayerImage* layer, Cel* cel, const gfx::Rect& bounds, const bool trimOutside);
@@ -137,6 +161,8 @@ private:
                   const DropFramePlace dropFramePlace,
                   const TagsHandling tagsHandling);
 
+  Layer* copyLayerWithSprite(doc::Layer* layer, doc::Sprite* sprite);
+
   class HandleLinkedCels {
   public:
     HandleLinkedCels(DocApi& api,
diff --git a/src/app/doc_api_dnd_helper.cpp b/src/app/doc_api_dnd_helper.cpp
new file mode 100644
index 000000000..259e462e5
--- /dev/null
+++ b/src/app/doc_api_dnd_helper.cpp
@@ -0,0 +1,142 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/doc_api.h"
+
+#include "app/cmd/copy_cel.h"
+#include "app/cmd/set_pixel_format.h"
+#include "app/cmd/set_total_frames.h"
+#include "app/file/file.h"
+#include "app/transaction.h"
+#include "doc/layer.h"
+#include "render/dithering.h"
+
+namespace {
+
+using namespace app;
+
+// Returns true if the document srcDoc has a cel that can be copied into a
+// destDoc's cel.
+// The cel from srcDoc can be copied only when all of the following conditions
+// are met:
+// * Drop took place in a cel.
+// * Source doc has only one layer with just one frame.
+// * The layer from the source doc and the destination cel's layer are both
+// Image layers.
+// Otherwise this function returns false.
+bool can_copy_cel(Doc* srcDoc, Doc* destDoc, DroppedOn droppedOn, doc::layer_t layerIndex)
+{
+  auto* srcLayer = srcDoc->sprite()->firstLayer();
+  auto* destLayer = destDoc->sprite()->allLayers()[layerIndex];
+  return droppedOn == DroppedOn::Cel && srcDoc->sprite()->allLayersCount() == 1 &&
+         srcDoc->sprite()->totalFrames() == 1 && srcLayer->isImage() && destLayer->isImage();
+}
+
+void setup_insertion_layer(Doc* destDoc,
+                           doc::layer_t layerIndex,
+                           InsertionPoint& insert,
+                           Layer*& layer,
+                           LayerGroup*& group)
+{
+  const LayerList& allLayers = destDoc->sprite()->allLayers();
+  layer = allLayers[layerIndex];
+  if (insert == InsertionPoint::BeforeLayer && layer->isGroup()) {
+    group = static_cast<LayerGroup*>(layer);
+    // The user is trying to drop layers into an empty group, so there is no after
+    // nor before layer...
+    if (group->layersCount() == 0) {
+      layer = nullptr;
+      return;
+    }
+    layer = group->lastLayer();
+    insert = InsertionPoint::AfterLayer;
+  }
+
+  group = layer->parent();
+}
+
+} // namespace
+
+namespace app {
+
+using namespace docapi;
+
+void DocApi::dropDocumentsOnTimeline(app::Doc* destDoc,
+                                     doc::frame_t frame,
+                                     doc::layer_t layerIndex,
+                                     InsertionPoint insert,
+                                     DroppedOn droppedOn,
+                                     DocProvider& docProvider)
+{
+  // Layer used as a reference to determine if the dropped layers will be
+  // inserted after or before it.
+  Layer* refLayer = nullptr;
+  // Parent group of the reference layer layer.
+  LayerGroup* group = nullptr;
+  // Keep track of the current insertion point.
+  setup_insertion_layer(destDoc, layerIndex, insert, refLayer, group);
+
+  int docsProcessed = 0;
+  while (docProvider.pendingDocs() > 0) {
+    std::unique_ptr<Doc> srcDoc = docProvider.nextDoc();
+    docsProcessed++;
+
+    // If the provider returned a null document then there was some problem with
+    // that specific doc but it can continue providing more documents
+    if (!srcDoc)
+      continue;
+
+    // If source document doesn't match the destination document's color
+    // mode, change it.
+    if (srcDoc->colorMode() != destDoc->colorMode()) {
+      // We can change the source doc pixel format out of any transaction because
+      // we don't need undo/redo it.
+      cmd::SetPixelFormat cmd(srcDoc->sprite(),
+                              destDoc->sprite()->pixelFormat(),
+                              render::Dithering(),
+                              Preferences::instance().quantization.rgbmapAlgorithm(),
+                              nullptr,
+                              nullptr,
+                              FitCriteria::DEFAULT);
+      cmd.execute(destDoc->context());
+    }
+
+    // If there is only one source document to process and it has a single cel
+    // that can be copied, then copy the cel from the source doc into the
+    // destination doc's selected frame.
+    const bool isJustOneDoc = (docsProcessed == 1 && docProvider.pendingDocs() == 0);
+    if (isJustOneDoc && can_copy_cel(srcDoc.get(), destDoc, droppedOn, layerIndex)) {
+      auto* srcLayer = static_cast<LayerImage*>(srcDoc->sprite()->firstLayer());
+      auto* destLayer = static_cast<LayerImage*>(destDoc->sprite()->allLayers()[layerIndex]);
+      m_transaction.execute(new cmd::CopyCel(srcLayer, 0, destLayer, frame, false));
+      break;
+    }
+
+    // If there is no room for the source frames, add frames to the
+    // destination sprite.
+    if (frame + srcDoc->sprite()->totalFrames() > destDoc->sprite()->totalFrames()) {
+      m_transaction.execute(
+        new cmd::SetTotalFrames(destDoc->sprite(), frame + srcDoc->sprite()->totalFrames()));
+    }
+
+    for (auto* srcLayer : srcDoc->sprite()->root()->layers()) {
+      srcLayer->displaceFrames(0, frame);
+      if (insert == InsertionPoint::AfterLayer) {
+        refLayer = duplicateLayerAfter(srcLayer, group, refLayer);
+      }
+      else {
+        refLayer = duplicateLayerBefore(srcLayer, group, refLayer);
+        insert = InsertionPoint::AfterLayer;
+      }
+    }
+  }
+}
+
+} // namespace app
diff --git a/src/app/doc_api_dnd_helper.h b/src/app/doc_api_dnd_helper.h
new file mode 100644
index 000000000..05b613b1e
--- /dev/null
+++ b/src/app/doc_api_dnd_helper.h
@@ -0,0 +1,41 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_DOC_API_DND_HELPER_H_INCLUDED
+#define APP_DOC_API_DND_HELPER_H_INCLUDED
+#pragma once
+
+#include "app/doc.h"
+
+namespace app { namespace docapi {
+
+enum class InsertionPoint {
+  BeforeLayer,
+  AfterLayer,
+};
+
+enum class DroppedOn {
+  Unspecified,
+  Frame,
+  Layer,
+  Cel,
+};
+
+// Used by the drag & drop helper API as a provider of the documents that
+// were dragged and then dropped in some Drag&Drop aware widget.
+class DocProvider {
+public:
+  virtual ~DocProvider() = default;
+  // Returns the next document from the underlying provider's implementation,
+  // returns null if there is no more documents to provide.
+  virtual std::unique_ptr<Doc> nextDoc() = 0;
+  // Returns the number of docs that were not provided yet.
+  virtual int pendingDocs() = 0;
+};
+
+}} // namespace app::docapi
+
+#endif
diff --git a/src/app/doc_exporter.cpp b/src/app/doc_exporter.cpp
index a437ce7ce..c5ded0b4b 100644
--- a/src/app/doc_exporter.cpp
+++ b/src/app/doc_exporter.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -43,6 +43,7 @@
 #include "gfx/size.h"
 #include "render/dithering.h"
 #include "render/ordered_dither.h"
+#include "render/quantization.h"
 #include "render/render.h"
 #include "ver/info.h"
 
@@ -69,6 +70,104 @@ std::string escape_for_json(const std::string& path)
   return res;
 }
 
+// Forward declaration
+void serialize_properties(const doc::UserData::Properties& props, std::ostream& os);
+
+// Helper for a single value
+void serialize_variant(const doc::UserData::Variant& value, std::ostream& os)
+{
+  using Properties = doc::UserData::Properties;
+  switch (value.index()) {
+    case USER_DATA_PROPERTY_TYPE_BOOL: os << (get_value<bool>(value) ? "true" : "false"); break;
+    case USER_DATA_PROPERTY_TYPE_INT8: os << static_cast<int64_t>(get_value<int8_t>(value)); break;
+    case USER_DATA_PROPERTY_TYPE_UINT8:
+      os << static_cast<int64_t>(get_value<uint8_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_INT16:
+      os << static_cast<int64_t>(get_value<int16_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_UINT16:
+      os << static_cast<int64_t>(get_value<uint16_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_INT32:
+      os << static_cast<int64_t>(get_value<int32_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_UINT32:
+      os << static_cast<int64_t>(get_value<uint32_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_INT64:
+      os << static_cast<int64_t>(get_value<int64_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_UINT64:
+      os << static_cast<int64_t>(get_value<uint64_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_FLOAT:  os << get_value<float>(value); break;
+    case USER_DATA_PROPERTY_TYPE_DOUBLE: os << get_value<double>(value); break;
+    case USER_DATA_PROPERTY_TYPE_STRING:
+      os << "\"" << escape_for_json(get_value<std::string>(value)) << "\"";
+      break;
+    case USER_DATA_PROPERTY_TYPE_PROPERTIES:
+      serialize_properties(get_value<Properties>(value), os);
+      break;
+    default: os << "\"[unsupported type]\""; break;
+  }
+}
+
+// Serializes a map of properties
+void serialize_properties(const doc::UserData::Properties& props, std::ostream& os)
+{
+  os << "{";
+  bool first = true;
+  for (const auto& [key, value] : props) {
+    if (!first)
+      os << ", ";
+    first = false;
+    os << "\"" << escape_for_json(key) << "\": ";
+    serialize_variant(value, os);
+  }
+  os << "}";
+}
+
+void serialize_userdata_properties(const doc::UserData& data, std::ostream& os)
+{
+  const auto& propsMaps = data.propertiesMaps();
+  bool hasAnyProps = false;
+  for (const auto& [group, props] : propsMaps) {
+    if (!props.empty()) {
+      hasAnyProps = true;
+      break;
+    }
+  }
+  if (hasAnyProps) {
+    os << ", \"properties\": {";
+    bool firstProp = true;
+    for (const auto& [group, props] : propsMaps) {
+      if (!props.empty()) {
+        if (!firstProp)
+          os << ", ";
+        firstProp = false;
+        if (group.empty()) {
+          // Default group: flatten its keys at the top level
+          bool firstKey = true;
+          for (const auto& [key, value] : props) {
+            if (!firstKey)
+              os << ", ";
+            firstKey = false;
+            os << "\"" << escape_for_json(key) << "\": ";
+            serialize_variant(value, os);
+          }
+        }
+        else {
+          // Named group: nest under its group name
+          os << "\"" << escape_for_json(group) << "\": ";
+          serialize_properties(props, os);
+        }
+      }
+    }
+    os << "}";
+  }
+}
+
 std::ostream& operator<<(std::ostream& os, const doc::UserData& data)
 {
   doc::color_t color = data.color();
@@ -80,6 +179,9 @@ std::ostream& operator<<(std::ostream& os, const doc::UserData& data)
   }
   if (!data.text().empty())
     os << ", \"data\": \"" << escape_for_json(data.text()) << "\"";
+
+  serialize_userdata_properties(data, os);
+
   return os;
 }
 
@@ -300,6 +402,35 @@ public:
     }
   }
 
+  void setPixelFormat(const doc::PixelFormat newPixelFormat)
+  {
+    if (!m_image || m_image->pixelFormat() == newPixelFormat)
+      return;
+
+    ImageSpec spec(ColorMode(newPixelFormat),
+                   m_image->width(),
+                   m_image->height(),
+                   m_image->maskColor());
+    ImageRef convertedImg(Image::create(spec));
+    if (!convertedImg)
+      return;
+
+    clear_image(convertedImg.get(), 0);
+    render::Dithering dithering;
+    Sprite* sprite = this->sprite();
+    render::convert_pixel_format(m_image.get(),
+                                 convertedImg.get(),
+                                 newPixelFormat,
+                                 dithering,
+                                 sprite ? sprite->rgbMap(0) : nullptr,
+                                 sprite ? sprite->palette(0) : nullptr,
+                                 (sprite && sprite->backgroundLayer()),
+                                 0,
+                                 0,
+                                 nullptr);
+    m_image = convertedImg;
+  }
+
 private:
   Doc* m_document;
   Sprite* m_sprite;
@@ -679,6 +810,9 @@ Doc* DocExporter::exportSheet(Context* ctx, base::task_token& token)
   Sprite* texture = textureDocument->sprite();
   Image* textureImage = texture->root()->firstLayer()->cel(frame_t(0))->image();
 
+  for (auto& sample : samples)
+    sample.setPixelFormat(texture->pixelFormat());
+
   renderTexture(ctx, samples, textureImage, token);
   if (token.canceled())
     return nullptr;
@@ -1246,22 +1380,6 @@ void DocExporter::renderTexture(Context* ctx,
       ++i;
       continue;
     }
-
-    // Make the sprite compatible with the texture so the render()
-    // works correctly.
-    if (sample.sprite()->pixelFormat() != textureImage->pixelFormat()) {
-      RgbMapAlgorithm rgbmapAlgo = Preferences::instance().quantization.rgbmapAlgorithm();
-      FitCriteria fc = Preferences::instance().quantization.fitCriteria();
-      cmd::SetPixelFormat(sample.sprite(),
-                          textureImage->pixelFormat(),
-                          render::Dithering(),
-                          rgbmapAlgo,
-                          nullptr, // toGray is not needed because the texture is Indexed or RGB
-                          nullptr, // TODO add a delegate to show progress
-                          fc)
-        .execute(ctx);
-    }
-
     sample.renderSample(textureImage,
                         sample.inTextureBounds().x + m_innerPadding,
                         sample.inTextureBounds().y + m_innerPadding,
diff --git a/src/app/doc_range_ops.cpp b/src/app/doc_range_ops.cpp
index d19b458fe..849085eb0 100644
--- a/src/app/doc_range_ops.cpp
+++ b/src/app/doc_range_ops.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2020  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -405,7 +405,8 @@ static DocRange drop_range_op(Doc* doc,
             if (place == kDocRangeBefore) {
               Layer* beforeThis = (!dstLayers.empty() ? dstLayers.front() : nullptr);
               for (Layer* srcLayer : srcLayers) {
-                Layer* copiedLayer = api.duplicateLayerBefore(srcLayer, parent, beforeThis);
+                Layer* copiedLayer =
+                  api.duplicateLayerBefore(srcLayer, parent, beforeThis, " Copy");
 
                 resultRange.startRange(copiedLayer, -1, DocRange::kLayers);
                 resultRange.endRange(copiedLayer, -1);
@@ -416,7 +417,7 @@ static DocRange drop_range_op(Doc* doc,
 
               Layer* afterThis = (!dstLayers.empty() ? dstLayers.back() : nullptr);
               for (Layer* srcLayer : srcLayers) {
-                Layer* copiedLayer = api.duplicateLayerAfter(srcLayer, parent, afterThis);
+                Layer* copiedLayer = api.duplicateLayerAfter(srcLayer, parent, afterThis, " Copy");
 
                 resultRange.startRange(copiedLayer, -1, DocRange::kLayers);
                 resultRange.endRange(copiedLayer, -1);
diff --git a/src/app/file/ase_format.cpp b/src/app/file/ase_format.cpp
index a9c3c45a7..e9f648ef3 100644
--- a/src/app/file/ase_format.cpp
+++ b/src/app/file/ase_format.cpp
@@ -20,6 +20,7 @@
 #include "base/file_handle.h"
 #include "base/fs.h"
 #include "base/mem_utils.h"
+#include "base/uuid.h"
 #include "dio/aseprite_common.h"
 #include "dio/aseprite_decoder.h"
 #include "dio/decode_delegate.h"
@@ -542,7 +543,8 @@ static void ase_file_prepare_header(FILE* f,
                    sprite->pixelFormat() == IMAGE_INDEXED   ? 8 :
                                                               0);
   header->flags = (ASE_FILE_FLAG_LAYER_WITH_OPACITY |
-                   (composeGroups ? ASE_FILE_FLAG_COMPOSITE_GROUPS : 0));
+                   (composeGroups ? ASE_FILE_FLAG_COMPOSITE_GROUPS : 0) |
+                   (sprite->useLayerUuids() ? ASE_FILE_FLAG_LAYER_WITH_UUID : 0));
   header->speed = sprite->frameDuration(firstFrame);
   header->next = 0;
   header->frit = 0;
@@ -788,6 +790,13 @@ static void ase_file_write_palette_chunk(FILE* f,
   }
 }
 
+static void ase_file_write_uuid(FILE* f, const base::Uuid& uuid)
+{
+  for (int i = 0; i < 16; ++i) {
+    fputc(uuid[i], f);
+  }
+}
+
 static void ase_file_write_layer_chunk(FILE* f,
                                        const dio::AsepriteHeader* header,
                                        dio::AsepriteFrameHeader* frame_header,
@@ -837,6 +846,9 @@ static void ase_file_write_layer_chunk(FILE* f,
   // Tileset index
   if (layer->isTilemap())
     fputl(static_cast<const LayerTilemap*>(layer)->tilesetIndex(), f);
+
+  if ((header->flags & ASE_FILE_FLAG_LAYER_WITH_UUID) == ASE_FILE_FLAG_LAYER_WITH_UUID)
+    ase_file_write_uuid(f, layer->uuid());
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -1678,9 +1690,7 @@ static void ase_file_write_property_value(FILE* f, const UserData::Variant& valu
     }
     case USER_DATA_PROPERTY_TYPE_UUID: {
       auto& uuid = *std::get_if<base::Uuid>(&value);
-      for (int i = 0; i < 16; ++i) {
-        fputc(uuid[i], f);
-      }
+      ase_file_write_uuid(f, uuid);
       break;
     }
   }
diff --git a/src/app/file/gif_format.cpp b/src/app/file/gif_format.cpp
index 9be49d665..d6f5a6cf5 100644
--- a/src/app/file/gif_format.cpp
+++ b/src/app/file/gif_format.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -1095,6 +1095,9 @@ public:
     gifframe_t nframes = totalFrames();
     for (gifframe_t gifFrame = 0; gifFrame < nframes; ++gifFrame) {
       ASSERT(frame_it != frame_end);
+      if (m_fop->isStop())
+        break;
+
       frame_t frame = *frame_it;
       ++frame_it;
 
@@ -1401,7 +1404,7 @@ private:
           color_t color = *srcIt;
           int i;
 
-          if (rgba_geta(color) >= 128) {
+          if (rgba_geta(color) > 0) {
             i = framePalette.findExactMatch(rgba_getr(color),
                                             rgba_getg(color),
                                             rgba_getb(color),
diff --git a/src/app/file/svg_format.cpp b/src/app/file/svg_format.cpp
index 9e084eaeb..8073f31e0 100644
--- a/src/app/file/svg_format.cpp
+++ b/src/app/file/svg_format.cpp
@@ -75,20 +75,86 @@ bool SvgFormat::onSave(FileOp* fop)
   const int pixelScaleValue = std::clamp(svg_options->pixelScale, 0, 10000);
   FileHandle handle(open_file_with_exception_sync_on_close(fop->filename(), "wb"));
   FILE* f = handle.get();
-  auto printcol = [f](int x, int y, int r, int g, int b, int a, int pxScale) {
-    fprintf(f,
-            "<rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill=\"#%02X%02X%02X\" ",
-            x * pxScale,
-            y * pxScale,
-            pxScale,
-            pxScale,
-            r,
-            g,
-            b);
-    if (a != 255)
-      fprintf(f, "opacity=\"%f\" ", (float)a / 255.0);
-    fprintf(f, "/>\n");
+
+  auto printRect =
+    [f](int x, int y, int width, int height, int r, int g, int b, int a, int pxScale) {
+      fprintf(f,
+              "<rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill=\"#%02X%02X%02X\" ",
+              x * pxScale,
+              y * pxScale,
+              width * pxScale,
+              height * pxScale,
+              r,
+              g,
+              b);
+      if (a != 255)
+        fprintf(f, "opacity=\"%f\" ", (float)a / 255.0);
+      fprintf(f, "/>\n");
+    };
+
+  // Helper function for greedy merge of same-colored pixels
+  auto mergePixels = [&](auto getPixelColor) {
+    std::vector<std::vector<bool>> processed(image->height(),
+                                             std::vector<bool>(image->width(), false));
+
+    for (y = 0; y < image->height(); y++) {
+      for (x = 0; x < image->width(); x++) {
+        if (processed[y][x])
+          continue;
+
+        auto [pixelR, pixelG, pixelB, pixelA, shouldSkip] = getPixelColor(x, y);
+        if (shouldSkip) {
+          processed[y][x] = true;
+          continue;
+        }
+
+        // Find the largest rectangle starting from this pixel
+        int maxWidth = 0;
+        int maxHeight = 0;
+
+        // Find maximum width for current row
+        for (int w = x; w < image->width(); w++) {
+          if (processed[y][w])
+            break;
+          auto [checkR, checkG, checkB, checkA, skip] = getPixelColor(w, y);
+          if (skip || checkR != pixelR || checkG != pixelG || checkB != pixelB || checkA != pixelA)
+            break;
+          maxWidth = w - x + 1;
+        }
+
+        // Find maximum height with current width
+        for (int h = y; h < image->height(); h++) {
+          bool canExtend = true;
+          for (int w = x; w < x + maxWidth; w++) {
+            if (processed[h][w]) {
+              canExtend = false;
+              break;
+            }
+            auto [checkR, checkG, checkB, checkA, skip] = getPixelColor(w, h);
+            if (skip || checkR != pixelR || checkG != pixelG || checkB != pixelB ||
+                checkA != pixelA) {
+              canExtend = false;
+              break;
+            }
+          }
+          if (!canExtend)
+            break;
+          maxHeight = h - y + 1;
+        }
+
+        // Mark rectangle as processed and output it
+        for (int h = y; h < y + maxHeight; h++) {
+          for (int w = x; w < x + maxWidth; w++) {
+            processed[h][w] = true;
+          }
+        }
+
+        printRect(x, y, maxWidth, maxHeight, pixelR, pixelG, pixelB, pixelA, pixelScaleValue);
+      }
+      fop->setProgress((float)y / (float)(image->height()));
+    }
   };
+
   fprintf(f, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
   fprintf(
     f,
@@ -98,59 +164,55 @@ bool SvgFormat::onSave(FileOp* fop)
 
   switch (image->pixelFormat()) {
     case IMAGE_RGB: {
-      for (y = 0; y < image->height(); y++) {
-        for (x = 0; x < image->width(); x++) {
-          c = get_pixel_fast<RgbTraits>(image.get(), x, y);
-          alpha = rgba_geta(c);
-          if (alpha != 0x00)
-            printcol(x, y, rgba_getr(c), rgba_getg(c), rgba_getb(c), alpha, pixelScaleValue);
-        }
-        fop->setProgress((float)y / (float)(image->height()));
-      }
+      auto getPixelColor = [&](int px, int py) -> std::tuple<int, int, int, int, bool> {
+        c = get_pixel_fast<RgbTraits>(image.get(), px, py);
+        alpha = rgba_geta(c);
+        if (alpha == 0x00)
+          return { 0, 0, 0, 0, true };
+        return { rgba_getr(c), rgba_getg(c), rgba_getb(c), alpha, false };
+      };
+      mergePixels(getPixelColor);
       break;
     }
     case IMAGE_GRAYSCALE: {
-      for (y = 0; y < image->height(); y++) {
-        for (x = 0; x < image->width(); x++) {
-          c = get_pixel_fast<GrayscaleTraits>(image.get(), x, y);
-          auto v = graya_getv(c);
-          alpha = graya_geta(c);
-          if (alpha != 0x00)
-            printcol(x, y, v, v, v, alpha, pixelScaleValue);
-        }
-        fop->setProgress((float)y / (float)(image->height()));
-      }
+      auto getPixelColor = [&](int px, int py) -> std::tuple<int, int, int, int, bool> {
+        c = get_pixel_fast<GrayscaleTraits>(image.get(), px, py);
+        auto v = graya_getv(c);
+        alpha = graya_geta(c);
+        if (alpha == 0x00)
+          return { 0, 0, 0, 0, true };
+        return { v, v, v, alpha, false };
+      };
+      mergePixels(getPixelColor);
       break;
     }
     case IMAGE_INDEXED: {
       unsigned char image_palette[256][4];
-      for (y = 0; y < 256; y++) {
-        fop->sequenceGetColor(y, &r, &g, &b);
-        image_palette[y][0] = r;
-        image_palette[y][1] = g;
-        image_palette[y][2] = b;
-        fop->sequenceGetAlpha(y, &a);
-        image_palette[y][3] = a;
+      for (int i = 0; i < 256; i++) {
+        fop->sequenceGetColor(i, &r, &g, &b);
+        image_palette[i][0] = r;
+        image_palette[i][1] = g;
+        image_palette[i][2] = b;
+        fop->sequenceGetAlpha(i, &a);
+        image_palette[i][3] = a;
       }
       color_t mask_color = -1;
       if (fop->document()->sprite()->backgroundLayer() == NULL ||
           !fop->document()->sprite()->backgroundLayer()->isVisible()) {
         mask_color = fop->document()->sprite()->transparentColor();
       }
-      for (y = 0; y < image->height(); y++) {
-        for (x = 0; x < image->width(); x++) {
-          c = get_pixel_fast<IndexedTraits>(image.get(), x, y);
-          if (c != mask_color)
-            printcol(x,
-                     y,
-                     image_palette[c][0] & 0xff,
-                     image_palette[c][1] & 0xff,
-                     image_palette[c][2] & 0xff,
-                     image_palette[c][3] & 0xff,
-                     pixelScaleValue);
-        }
-        fop->setProgress((float)y / (float)(image->height()));
-      }
+
+      auto getPixelColor = [&](int px, int py) -> std::tuple<int, int, int, int, bool> {
+        c = get_pixel_fast<IndexedTraits>(image.get(), px, py);
+        if (c == mask_color)
+          return { 0, 0, 0, 0, true };
+        return { image_palette[c][0] & 0xff,
+                 image_palette[c][1] & 0xff,
+                 image_palette[c][2] & 0xff,
+                 image_palette[c][3] & 0xff,
+                 false };
+      };
+      mergePixels(getPixelColor);
       break;
     }
   }
diff --git a/src/app/file_system.cpp b/src/app/file_system.cpp
index 7ebbf44ca..d2628f5e0 100644
--- a/src/app/file_system.cpp
+++ b/src/app/file_system.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -82,6 +82,9 @@ public:
   unsigned int m_version;
   bool m_removed;
   mutable bool m_is_folder;
+#ifdef _WIN32
+  bool m_isHidden = false;
+#endif
   std::atomic<double> m_thumbnailProgress;
   std::atomic<os::Surface*> m_thumbnail;
 #ifdef _WIN32
@@ -266,7 +269,7 @@ IFileItem* FileSystemModule::getRootFileItem()
     fileitem->m_pidl = pidl;
     fileitem->m_fullpidl = pidl;
 
-    SFGAOF attrib = SFGAO_FOLDER;
+    SFGAOF attrib = SFGAO_FOLDER | SFGAO_HIDDEN;
     shl_idesktop->GetAttributesOf(1, (LPCITEMIDLIST*)&pidl, &attrib);
 
     update_by_pidl(fileitem, attrib);
@@ -357,7 +360,7 @@ bool FileItem::isHidden() const
   ASSERT(m_displayname != NOTINITIALIZED);
 
 #ifdef _WIN32
-  return false;
+  return m_isHidden;
 #else
   return m_displayname[0] == '.';
 #endif
@@ -462,7 +465,7 @@ const FileItemList& FileItem::children()
         // Get the interface to enumerate subitems
         hr = pFolder->EnumObjects(
           reinterpret_cast<HWND>(os::System::instance()->defaultWindow()->nativeHandle()),
-          SHCONTF_FOLDERS | SHCONTF_NONFOLDERS,
+          SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN,
           &pEnum);
 
         if (hr == S_OK && pEnum) {
@@ -473,10 +476,9 @@ const FileItemList& FileItem::children()
           while (pEnum->Next(256, itempidl, &fetched) == S_OK && fetched > 0) {
             // Request the SFGAO_FOLDER attribute to know what of the
             // item is file or a folder
-            for (c = 0; c < fetched; ++c) {
-              attribs[c] = SFGAO_FOLDER;
-              pFolder->GetAttributesOf(1, (LPCITEMIDLIST*)itempidl, attribs + c);
-            }
+            for (c = 0; c < fetched; ++c)
+              attribs[c] = SFGAO_FOLDER | SFGAO_HIDDEN;
+            pFolder->GetAttributesOf(fetched, (LPCITEMIDLIST*)itempidl, attribs);
 
             // Generate the FileItems
             for (c = 0; c < fetched; ++c) {
@@ -755,6 +757,9 @@ static void update_by_pidl(FileItem* fileitem, SFGAOF attrib)
   // Is it a folder?
 
   fileitem->m_is_folder = calc_is_folder(fileitem->m_filename, attrib);
+  #if _WIN32
+  fileitem->m_isHidden = (attrib & SFGAO_HIDDEN ? true : false);
+  #endif
 
   // Get the name to display
 
diff --git a/src/app/fonts/font_data.cpp b/src/app/fonts/font_data.cpp
new file mode 100644
index 000000000..ebf72d9ad
--- /dev/null
+++ b/src/app/fonts/font_data.cpp
@@ -0,0 +1,101 @@
+// Aseprite
+// Copyright (C) 2020-2025  Igara Studio S.A.
+// Copyright (C) 2001-2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/fonts/font_data.h"
+
+#include "text/font.h"
+#include "text/font_mgr.h"
+#include "text/sprite_sheet_font.h"
+#include "text/typeface.h"
+#include "ui/manager.h"
+#include "ui/scale.h"
+
+#include <set>
+
+#define USE_CACHE 1
+
+namespace app {
+
+FontData::FontData(text::FontType type) : m_type(type)
+{
+}
+
+FontData::FontData(const text::FontRef& nativeFont)
+  : m_type(nativeFont->type())
+  , m_antialias(nativeFont->antialias())
+  , m_hinting(nativeFont->hinting())
+  , m_nativeFont(nativeFont)
+{
+}
+
+text::FontRef FontData::getFont(text::FontMgrRef& fontMgr, float size)
+{
+  ASSERT(fontMgr);
+
+  if (size == 0.0f && m_size != 0.0f)
+    size = m_size;
+
+#if USE_CACHE
+  // Use cached fonts
+  const Cache::Key cacheKey{ size, m_antialias, m_hinting != text::FontHinting::None };
+  auto it = m_cache.fonts.find(cacheKey);
+  if (it != m_cache.fonts.end()) // Cache hit
+    return it->second;
+#endif
+
+  text::FontRef font = nullptr;
+
+  switch (m_type) {
+    case text::FontType::SpriteSheet:
+      font = fontMgr->loadSpriteSheetFont(m_filename.c_str(), size);
+      if (font && m_descent != 0.0f) {
+        static_cast<text::SpriteSheetFont*>(font.get())->setDescent(m_descent);
+      }
+      break;
+
+    case text::FontType::FreeType: {
+      font = fontMgr->loadTrueTypeFont(m_filename.c_str(), size);
+      if (font) {
+        font->setAntialias(m_antialias);
+        font->setHinting(m_hinting);
+      }
+      break;
+    }
+
+    case text::FontType::Native:
+      if (size == m_nativeFont->size())
+        font = m_nativeFont;
+      else {
+        text::TypefaceRef typeface = m_nativeFont->typeface();
+        font = fontMgr->makeFont(typeface, size);
+        font->setAntialias(m_antialias);
+        font->setHinting(m_hinting);
+      }
+      break;
+  }
+
+#if USE_CACHE
+  // Cache this font
+  m_cache.fonts[cacheKey] = font;
+#endif
+
+  // Load fallback
+  if (m_fallback) {
+    text::FontRef fallback = m_fallback->getFont(fontMgr, m_fallbackSize * ui::guiscale());
+    if (font)
+      font->setFallback(fallback);
+    else
+      return fallback; // Don't double-cache the fallback font
+  }
+  return font;
+}
+
+} // namespace app
diff --git a/src/app/fonts/font_data.h b/src/app/fonts/font_data.h
new file mode 100644
index 000000000..a69c5a996
--- /dev/null
+++ b/src/app/fonts/font_data.h
@@ -0,0 +1,82 @@
+// Aseprite
+// Copyright (C) 2020-2025  Igara Studio S.A.
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_FONTS_FONT_DATA_H_INCLUDED
+#define APP_FONTS_FONT_DATA_H_INCLUDED
+#pragma once
+
+#include "base/disable_copying.h"
+#include "text/font.h"
+#include "text/fwd.h"
+
+#include <map>
+
+namespace app {
+
+// Represents a defined font in a <font> element from "data/fonts/fonts.xml" file
+// and theme fonts (<font> elements from "data/extensions/aseprite-theme/theme.xml").
+class FontData {
+public:
+  FontData(text::FontType type);
+  FontData(const text::FontRef& nativeFont);
+
+  text::FontType type() const { return m_type; }
+  const std::string& name() const { return m_name; }
+  const std::string& filename() const { return m_filename; }
+  float defaultSize() const { return m_size; }
+  bool antialias() const { return m_antialias; }
+  text::FontHinting hinting() const { return m_hinting; }
+
+  void setName(const std::string& name) { m_name = name; }
+  void setFilename(const std::string& filename) { m_filename = filename; }
+  void setDefaultSize(const float size) { m_size = size; }
+  void setAntialias(const bool antialias) { m_antialias = antialias; }
+  void setHinting(const text::FontHinting hinting) { m_hinting = hinting; }
+  void setFallback(FontData* fallback, float fallbackSize)
+  {
+    m_fallback = fallback;
+    m_fallbackSize = fallbackSize;
+  }
+
+  // Descent font metrics for sprite sheet fonts
+  void setDescent(float descent) { m_descent = descent; }
+
+  text::FontRef getFont(text::FontMgrRef& fontMgr, float size);
+
+private:
+  // Cache of loaded fonts so we avoid re-loading them.
+  struct Cache {
+    struct Key {
+      float size;
+      bool antialias : 1;
+      bool hinting : 1;
+      bool operator<(const Key& b) const
+      {
+        return size < b.size || antialias < b.antialias || hinting < b.hinting;
+      }
+    };
+    std::map<Key, text::FontRef> fonts;
+  };
+
+  text::FontType m_type;
+  std::string m_name;
+  std::string m_filename;
+  float m_size = 0.0f;
+  bool m_antialias = false;
+  text::FontHinting m_hinting = text::FontHinting::Normal;
+  Cache m_cache;
+  FontData* m_fallback = nullptr;
+  float m_fallbackSize = 0.0f;
+  float m_descent = 0.0f;
+  text::FontRef m_nativeFont;
+
+  DISABLE_COPYING(FontData);
+};
+
+} // namespace app
+
+#endif
diff --git a/src/app/font_info.cpp b/src/app/fonts/font_info.cpp
similarity index 71%
rename from src/app/font_info.cpp
rename to src/app/fonts/font_info.cpp
index 140aeb6c2..370f805c7 100644
--- a/src/app/font_info.cpp
+++ b/src/app/fonts/font_info.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2024  Igara Studio S.A.
+// Copyright (c) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -8,7 +8,9 @@
   #include "config.h"
 #endif
 
-#include "app/font_info.h"
+#include "app/fonts/font_info.h"
+
+#include "app/fonts/font_data.h"
 #include "app/pref/preferences.h"
 #include "base/fs.h"
 #include "base/split_string.h"
@@ -26,27 +28,46 @@ FontInfo::FontInfo(Type type,
                    const std::string& name,
                    const float size,
                    const text::FontStyle style,
-                   const Flags flags)
+                   const Flags flags,
+                   const text::FontHinting hinting)
   : m_type(type)
   , m_name(name)
   , m_size(size)
   , m_style(style)
   , m_flags(flags)
+  , m_hinting(hinting)
 {
 }
 
 FontInfo::FontInfo(const FontInfo& other,
                    const float size,
                    const text::FontStyle style,
-                   const Flags flags)
+                   const Flags flags,
+                   text::FontHinting hinting)
   : m_type(other.type())
   , m_name(other.name())
   , m_size(size)
   , m_style(style)
   , m_flags(flags)
+  , m_hinting(hinting)
 {
 }
 
+FontInfo::FontInfo(const FontData* data, const float size)
+  : m_type(Type::Unknown)
+  , m_name(data->name())
+  , m_size(size != 0.0f ? size : data->defaultSize())
+  , m_flags(data->antialias() ? Flags::Antialias : Flags::None)
+  , m_hinting(data->hinting())
+{
+  switch (data->type()) {
+    case text::FontType::Unknown:     m_type = Type::Unknown; break;
+    case text::FontType::SpriteSheet:
+    case text::FontType::FreeType:    m_type = Type::File; break;
+    case text::FontType::Native:      m_type = Type::System; break;
+  }
+}
+
 std::string FontInfo::title() const
 {
   return m_type == FontInfo::Type::File ? base::get_file_name(m_name) : m_name;
@@ -129,6 +150,12 @@ std::string FontInfo::humanString() const
       result += " Antialias";
     if (ligatures())
       result += " Ligatures";
+    switch (hinting()) {
+      case text::FontHinting::None:   result += " No Hinting"; break;
+      case text::FontHinting::Slight: result += " Slight Hinting"; break;
+      case text::FontHinting::Normal: break;
+      case text::FontHinting::Full:   result += " Full Hinting"; break;
+    }
   }
   return result;
 }
@@ -149,6 +176,7 @@ app::FontInfo convert_to(const std::string& from)
   bool bold = false;
   bool italic = false;
   app::FontInfo::Flags flags = app::FontInfo::Flags::None;
+  text::FontHinting hinting = text::FontHinting::Normal;
 
   if (!parts.empty()) {
     if (parts[0].compare(0, 5, "file=") == 0) {
@@ -159,7 +187,7 @@ app::FontInfo convert_to(const std::string& from)
       type = app::FontInfo::Type::System;
       name = parts[0].substr(7);
     }
-    else {
+    else if (!parts[0].empty()) {
       type = app::FontInfo::Type::Name;
       name = parts[0];
     }
@@ -175,6 +203,17 @@ app::FontInfo convert_to(const std::string& from)
       else if (parts[i].compare(0, 5, "size=") == 0) {
         size = std::strtof(parts[i].substr(5).c_str(), nullptr);
       }
+      else if (parts[i].compare(0, 8, "hinting=") == 0) {
+        std::string hintingStr = parts[i].substr(8);
+        if (hintingStr == "none")
+          hinting = text::FontHinting::None;
+        else if (hintingStr == "slight")
+          hinting = text::FontHinting::Slight;
+        else if (hintingStr == "normal")
+          hinting = text::FontHinting::Normal;
+        else if (hintingStr == "full")
+          hinting = text::FontHinting::Full;
+      }
     }
   }
 
@@ -186,7 +225,7 @@ app::FontInfo convert_to(const std::string& from)
   else if (italic)
     style = text::FontStyle::Italic();
 
-  return app::FontInfo(type, name, size, style, flags);
+  return app::FontInfo(type, name, size, style, flags, hinting);
 }
 
 template<>
@@ -212,6 +251,17 @@ std::string convert_to(const app::FontInfo& from)
       result += ",antialias";
     if (from.ligatures())
       result += ",ligatures";
+    if (from.hinting() != text::FontHinting::Normal) {
+      result += ",hinting=";
+      switch (from.hinting()) {
+        case text::FontHinting::None:   result += "none"; break;
+        case text::FontHinting::Slight: result += "slight"; break;
+        case text::FontHinting::Normal:
+          // Filtered out by above if
+          break;
+        case text::FontHinting::Full: result += "full"; break;
+      }
+    }
   }
   return result;
 }
diff --git a/src/app/font_info.h b/src/app/fonts/font_info.h
similarity index 68%
rename from src/app/font_info.h
rename to src/app/fonts/font_info.h
index bd5270ee3..e69f17660 100644
--- a/src/app/font_info.h
+++ b/src/app/fonts/font_info.h
@@ -1,16 +1,18 @@
 // Aseprite
-// Copyright (c) 2024  Igara Studio S.A.
+// Copyright (c) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
 
-#ifndef APP_UI_FONT_INFO_H_INCLUDED
-#define APP_UI_FONT_INFO_H_INCLUDED
+#ifndef APP_FONTS_FONT_INFO_H_INCLUDED
+#define APP_FONTS_FONT_INFO_H_INCLUDED
 #pragma once
 
 #include "base/convert_to.h"
 #include "base/enum_flags.h"
+#include "text/font_hinting.h"
 #include "text/font_style.h"
+#include "text/font_type.h"
 #include "text/fwd.h"
 #include "text/typeface.h"
 
@@ -19,7 +21,16 @@
 
 namespace app {
 
-// TODO should we merge this with skin::FontData?
+class FontData;
+
+// Represents a font reference from any place:
+// - Name: a font referenced by name, a font that came from fonts.xml files (Fonts/FontData)
+// - File: an external font loaded from a .ttf file
+// - System: native laf-os fonts (i.e. Skia fonts loaded from the operating system)
+//
+// This font reference can be serialize to a string to be saved in the
+// aseprite.ini configuration (e.g. latest font used in text tool, or
+// custom theme fonts, etc.).
 class FontInfo {
 public:
   enum class Type {
@@ -41,9 +52,16 @@ public:
            const std::string& name = {},
            float size = kDefaultSize,
            text::FontStyle style = text::FontStyle(),
-           Flags flags = Flags::None);
+           Flags flags = Flags::None,
+           text::FontHinting hinting = text::FontHinting::Normal);
 
-  FontInfo(const FontInfo& other, float size, text::FontStyle style, Flags flags);
+  FontInfo(const FontInfo& other,
+           float size,
+           text::FontStyle style,
+           Flags flags,
+           text::FontHinting hinting);
+
+  FontInfo(const FontData* data, float size = 0.0f);
 
   bool isValid() const { return m_type != Type::Unknown; }
   bool useDefaultSize() const { return m_size == kDefaultSize; }
@@ -64,6 +82,7 @@ public:
   Flags flags() const { return m_flags; }
   bool antialias() const;
   bool ligatures() const;
+  text::FontHinting hinting() const { return m_hinting; }
 
   text::TypefaceRef findTypeface(const text::FontMgrRef& fontMgr) const;
 
@@ -84,6 +103,7 @@ private:
   float m_size = kDefaultSize;
   text::FontStyle m_style;
   Flags m_flags = Flags::None;
+  text::FontHinting m_hinting = text::FontHinting::Normal;
 };
 
 LAF_ENUM_FLAGS(FontInfo::Flags);
diff --git a/src/app/font_info_tests.cpp b/src/app/fonts/font_info_tests.cpp
similarity index 96%
rename from src/app/font_info_tests.cpp
rename to src/app/fonts/font_info_tests.cpp
index 7977ed313..475fc8633 100644
--- a/src/app/font_info_tests.cpp
+++ b/src/app/fonts/font_info_tests.cpp
@@ -1,12 +1,12 @@
 // Aseprite
-// Copyright (c) 2024  Igara Studio S.A.
+// Copyright (c) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
 
 #include "tests/app_test.h"
 
-#include "app/font_info.h"
+#include "app/fonts/font_info.h"
 
 using namespace app;
 using namespace std::literals;
diff --git a/src/app/font_path.cpp b/src/app/fonts/font_path.cpp
similarity index 89%
rename from src/app/font_path.cpp
rename to src/app/fonts/font_path.cpp
index 54cac3ab2..34fdce095 100644
--- a/src/app/font_path.cpp
+++ b/src/app/fonts/font_path.cpp
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2017-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -8,7 +9,7 @@
   #include "config.h"
 #endif
 
-#include "app/font_path.h"
+#include "app/fonts/font_path.h"
 
 #include "base/fs.h"
 
diff --git a/src/app/font_path.h b/src/app/fonts/font_path.h
similarity index 83%
rename from src/app/font_path.h
rename to src/app/fonts/font_path.h
index 0ab1eac86..89d6ee5ec 100644
--- a/src/app/font_path.h
+++ b/src/app/fonts/font_path.h
@@ -4,8 +4,8 @@
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
 
-#ifndef APP_FONT_PATH_H_INCLUDED
-#define APP_FONT_PATH_H_INCLUDED
+#ifndef APP_FONTS_FONT_PATH_H_INCLUDED
+#define APP_FONTS_FONT_PATH_H_INCLUDED
 #pragma once
 
 #include "base/paths.h"
diff --git a/src/app/font_path_osx.mm b/src/app/fonts/font_path_osx.mm
similarity index 88%
rename from src/app/font_path_osx.mm
rename to src/app/fonts/font_path_osx.mm
index e2ec89a4f..978dd09cf 100644
--- a/src/app/font_path_osx.mm
+++ b/src/app/fonts/font_path_osx.mm
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2017-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -8,7 +9,7 @@
   #include "config.h"
 #endif
 
-#include "app/font_path.h"
+#include "app/fonts/font_path.h"
 
 #include "base/fs.h"
 
diff --git a/src/app/font_path_unix.cpp b/src/app/fonts/font_path_unix.cpp
similarity index 92%
rename from src/app/font_path_unix.cpp
rename to src/app/fonts/font_path_unix.cpp
index 2ed03dd2c..829ff6f8c 100644
--- a/src/app/font_path_unix.cpp
+++ b/src/app/fonts/font_path_unix.cpp
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2017-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -8,7 +9,7 @@
   #include "config.h"
 #endif
 
-#include "app/font_path.h"
+#include "app/fonts/font_path.h"
 
 #include "base/fs.h"
 
diff --git a/src/app/font_path_win.cpp b/src/app/fonts/font_path_win.cpp
similarity index 93%
rename from src/app/font_path_win.cpp
rename to src/app/fonts/font_path_win.cpp
index 4d2b80f04..d4c6c6b59 100644
--- a/src/app/font_path_win.cpp
+++ b/src/app/fonts/font_path_win.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2017-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -9,7 +9,7 @@
   #include "config.h"
 #endif
 
-#include "app/font_path.h"
+#include "app/fonts/font_path.h"
 
 #include "base/fs.h"
 #include "base/string.h"
diff --git a/src/app/fonts/fonts.cpp b/src/app/fonts/fonts.cpp
new file mode 100644
index 000000000..aef64480a
--- /dev/null
+++ b/src/app/fonts/fonts.cpp
@@ -0,0 +1,98 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/fonts/fonts.h"
+
+#include "app/fonts/font_data.h"
+#include "app/fonts/font_info.h"
+#include "text/font_mgr.h"
+
+namespace app {
+
+static Fonts* g_instance = nullptr;
+
+// static
+Fonts* Fonts::instance()
+{
+  ASSERT(g_instance);
+  return g_instance;
+}
+
+Fonts::Fonts(const text::FontMgrRef& fontMgr) : m_fontMgr(fontMgr)
+{
+  ASSERT(!g_instance);
+  g_instance = this;
+}
+
+Fonts::~Fonts()
+{
+  ASSERT(g_instance == this);
+  g_instance = nullptr;
+}
+
+void Fonts::addFontData(std::unique_ptr<FontData>&& fontData)
+{
+  ASSERT(fontData);
+  std::string name = fontData->name();
+  m_fonts[name] = std::move(fontData);
+}
+
+FontData* Fonts::fontDataByName(const std::string& name)
+{
+  auto it = m_fonts.find(name);
+  if (it == m_fonts.end())
+    return nullptr;
+  return it->second.get();
+}
+
+text::FontRef Fonts::fontByName(const std::string& name, const float size)
+{
+  auto it = m_fonts.find(name);
+  if (it == m_fonts.end())
+    return nullptr;
+  return it->second->getFont(m_fontMgr, size);
+}
+
+text::FontRef Fonts::fontFromInfo(const FontInfo& fontInfo)
+{
+  ASSERT(m_fontMgr);
+  if (!m_fontMgr)
+    return nullptr;
+
+  text::FontRef font;
+  if (fontInfo.type() == FontInfo::Type::System) {
+    // Just in case the typeface is not present in the FontInfo
+    auto typeface = fontInfo.findTypeface(m_fontMgr);
+    if (!typeface)
+      return nullptr;
+
+    if (fontInfo.useDefaultSize())
+      font = m_fontMgr->makeFont(typeface);
+    else
+      font = m_fontMgr->makeFont(typeface, fontInfo.size());
+  }
+  else {
+    const float size = (fontInfo.useDefaultSize() ? 0.0f : fontInfo.size());
+    font = fontByName(fontInfo.name(), size);
+
+    if (!font && fontInfo.type() == FontInfo::Type::File) {
+      font = m_fontMgr->loadTrueTypeFont(fontInfo.name().c_str(), size);
+    }
+  }
+
+  if (font) {
+    font->setAntialias(fontInfo.antialias());
+    font->setHinting(fontInfo.hinting());
+  }
+
+  return font;
+}
+
+} // namespace app
diff --git a/src/app/fonts/fonts.h b/src/app/fonts/fonts.h
new file mode 100644
index 000000000..16bb4e92a
--- /dev/null
+++ b/src/app/fonts/fonts.h
@@ -0,0 +1,49 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_FONTS_FONTS_H_INCLUDED
+#define APP_FONTS_FONTS_H_INCLUDED
+#pragma once
+
+#include "text/fwd.h"
+
+#include <map>
+#include <memory>
+#include <string>
+
+namespace app {
+
+class FontData;
+using FontDataMap = std::map<std::string, std::unique_ptr<FontData>>;
+class FontInfo;
+
+// Available defined fonts in "data/fonts/fonts.xml" file and theme
+// fonts (<font> elements from "data/extensions/aseprite-theme/theme.xml").
+class Fonts {
+public:
+  static Fonts* instance();
+
+  Fonts(const text::FontMgrRef& fontMgr);
+  ~Fonts();
+
+  const text::FontMgrRef& fontMgr() const { return m_fontMgr; }
+  const FontDataMap& definedFonts() const { return m_fonts; }
+  bool isEmpty() const { return m_fonts.empty(); }
+
+  void addFontData(std::unique_ptr<FontData>&& fontData);
+
+  FontData* fontDataByName(const std::string& name);
+  text::FontRef fontByName(const std::string& name, float size);
+  text::FontRef fontFromInfo(const FontInfo& fontInfo);
+
+private:
+  text::FontMgrRef m_fontMgr;
+  FontDataMap m_fonts;
+};
+
+} // namespace app
+
+#endif
diff --git a/src/app/inline_command_execution.h b/src/app/inline_command_execution.h
index 6ebd51bb7..5a6e9dd74 100644
--- a/src/app/inline_command_execution.h
+++ b/src/app/inline_command_execution.h
@@ -19,7 +19,7 @@ namespace app {
 
 class InlineCommandExecution : public Command {
 public:
-  InlineCommandExecution(Context* ctx) : Command("", CmdUIOnlyFlag), m_context(ctx)
+  InlineCommandExecution(Context* ctx) : Command(""), m_context(ctx)
   {
     CommandExecutionEvent ev(this, m_noParams);
     m_context->BeforeCommandExecution(ev);
diff --git a/src/app/modules/gui.cpp b/src/app/modules/gui.cpp
index 0e16af1bb..f42d7c503 100644
--- a/src/app/modules/gui.cpp
+++ b/src/app/modules/gui.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -682,11 +682,11 @@ bool CustomizedGuiManager::processKey(Message* msg)
 {
   App* app = App::instance();
   const KeyboardShortcuts* keys = KeyboardShortcuts::instance();
-  const KeyContext contexts[] = { keys->getCurrentKeyContext(), KeyContext::Normal };
+  const KeyContext contexts[] = { KeyboardShortcuts::getCurrentKeyContext(), KeyContext::Normal };
   int n = (contexts[0] != contexts[1] ? 2 : 1);
   for (int i = 0; i < n; ++i) {
     for (const KeyPtr& key : *keys) {
-      if (key->isPressed(msg, *keys, contexts[i])) {
+      if (key->isPressed(msg, contexts[i])) {
         // Cancel menu-bar loops (to close any popup menu)
         app->mainWindow()->getMenuBar()->cancelMenuLoop();
 
@@ -700,7 +700,7 @@ bool CustomizedGuiManager::processKey(Message* msg)
             // Collect all tools with the pressed keyboard-shortcut
             for (tools::Tool* tool : *toolbox) {
               const KeyPtr key = keys->tool(tool);
-              if (key && key->isPressed(msg, *keys))
+              if (key && key->isPressed(msg))
                 possibles.push_back(tool);
             }
 
diff --git a/src/app/resource_finder.cpp b/src/app/resource_finder.cpp
index a72891013..65b71e900 100644
--- a/src/app/resource_finder.cpp
+++ b/src/app/resource_finder.cpp
@@ -213,7 +213,7 @@ void ResourceFinder::includeDesktopDir(const char* filename)
 #ifdef _WIN32
 
   std::vector<wchar_t> buf(MAX_PATH);
-  HRESULT hr = SHGetFolderPath(NULL, CSIDL_DESKTOPDIRECTORY, NULL, SHGFP_TYPE_DEFAULT, &buf[0]);
+  HRESULT hr = SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, &buf[0]);
   if (hr == S_OK) {
     addPath(base::join_path(base::to_utf8(&buf[0]), filename));
   }
diff --git a/src/app/script/api_version.h b/src/app/script/api_version.h
index c64082cea..d8726e6b7 100644
--- a/src/app/script/api_version.h
+++ b/src/app/script/api_version.h
@@ -10,6 +10,6 @@
 
 // Increment this value if the scripting API is modified between two
 // released Aseprite versions.
-#define API_VERSION 31
+#define API_VERSION 35
 
 #endif
diff --git a/src/app/script/app_command_object.cpp b/src/app/script/app_command_object.cpp
index 3c8d5a57c..fc919a6ec 100644
--- a/src/app/script/app_command_object.cpp
+++ b/src/app/script/app_command_object.cpp
@@ -63,6 +63,17 @@ int Command_call(lua_State* L)
   return 1;
 }
 
+int Command_enabled(lua_State* L)
+{
+  app::Context* ctx = App::instance()->context();
+  if (!ctx)
+    return 0;
+
+  auto* command = get_ptr<Command>(L, 1);
+  lua_pushboolean(L, command->isEnabled(ctx));
+  return 1;
+}
+
 int AppCommand_index(lua_State* L)
 {
   const char* id = lua_tostring(L, 2);
@@ -82,6 +93,11 @@ const luaL_Reg Command_methods[] = {
   { nullptr,  nullptr      }
 };
 
+const Property Command_properties[] = {
+  { "enabled", Command_enabled, nullptr },
+  { nullptr,   nullptr,         nullptr }
+};
+
 const luaL_Reg AppCommand_methods[] = {
   { "__index", AppCommand_index },
   { nullptr,   nullptr          }
@@ -95,6 +111,8 @@ DEF_MTNAME(AppCommand);
 void register_app_command_object(lua_State* L)
 {
   REG_CLASS(L, Command);
+  REG_CLASS_PROPERTIES(L, Command);
+
   REG_CLASS(L, AppCommand);
 
   lua_getglobal(L, "app");
diff --git a/src/app/script/dialog_class.cpp b/src/app/script/dialog_class.cpp
index d91e2eb52..7fa02674e 100644
--- a/src/app/script/dialog_class.cpp
+++ b/src/app/script/dialog_class.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2018  David Capello
 //
 // This program is distributed under the terms of
@@ -127,12 +127,13 @@ struct Dialog {
   int showRef = LUA_REFNIL;
   lua_State* L = nullptr;
 
-  Dialog(const ui::Window::Type windowType, const std::string& title)
+  Dialog(const ui::Window::Type windowType, const std::string& title, bool sizeable)
     : window(windowType, title)
     , grid(2, false)
     , currentGrid(&grid)
   {
     window.addChild(&grid);
+    window.setSizeable(sizeable);
     all_dialogs.push_back(this);
   }
 
@@ -365,6 +366,7 @@ int Dialog_new(lua_State* L)
   // Get the title and the type of window (with or without title bar)
   ui::Window::Type windowType = ui::Window::WithTitleBar;
   std::string title = "Script";
+  bool sizeable = true;
   if (lua_isstring(L, 1)) {
     title = lua_tostring(L, 1);
   }
@@ -378,9 +380,14 @@ int Dialog_new(lua_State* L)
     if (type != LUA_TNIL && lua_toboolean(L, -1))
       windowType = ui::Window::WithoutTitleBar;
     lua_pop(L, 1);
+
+    type = lua_getfield(L, 1, "resizeable");
+    if (type != LUA_TNIL && !lua_toboolean(L, -1))
+      sizeable = false;
+    lua_pop(L, 1);
   }
 
-  auto dlg = push_new<Dialog>(L, windowType, title);
+  auto dlg = push_new<Dialog>(L, windowType, title, sizeable);
 
   // The uservalue of the dialog userdata will contain a table that
   // stores all the callbacks to handle events. As these callbacks can
@@ -575,8 +582,9 @@ int Dialog_add_widget(lua_State* L, Widget* widget)
   bool vexpand = (widget->type() == Canvas::Type());
 
   // This is to separate different kind of widgets without label in
-  // different rows.
-  if (dlg->lastWidgetType != widget->type() || dlg->autoNewRow) {
+  // different rows. Separator widgets will always create a new row.
+  if (dlg->lastWidgetType != widget->type() || dlg->autoNewRow ||
+      widget->type() == ui::kSeparatorWidget) {
     dlg->lastWidgetType = widget->type();
     dlg->hbox = nullptr;
   }
@@ -631,8 +639,8 @@ int Dialog_add_widget(lua_State* L, Widget* widget)
         dlg->labelWidgets[id] = labelWidget;
     }
     else {
-      // For tabs we don't want the empty space of an unspecified label.
-      if (widget->type() != Tabs::Type()) {
+      // For tabs and separators, we don't want the empty space of an unspecified label.
+      if (widget->type() != Tabs::Type() && widget->type() != ui::kSeparatorWidget) {
         dlg->currentGrid->addChildInCell(new ui::HBox, 1, 1, ui::LEFT | ui::TOP);
       }
     }
@@ -641,14 +649,15 @@ int Dialog_add_widget(lua_State* L, Widget* widget)
     if (widget->type() == ui::kButtonWidget)
       hbox->enableFlags(ui::HOMOGENEOUS);
 
-    // For tabs we don't want the empty space of an unspecified label, so
+    // For tabs and unlabeled separators, we don't want the empty space of an unspecified label, so
     // span 2 columns.
-    const int hspan = (widget->type() == Tabs::Type() ? 2 : 1);
+    const int hspan =
+      ((widget->type() == Tabs::Type()) || (widget->type() == ui::kSeparatorWidget && !label) ? 2 :
+                                                                                                1);
     dlg->currentGrid->addChildInCell(hbox,
                                      hspan,
                                      1,
                                      ui::HORIZONTAL | (vexpand ? ui::VERTICAL : ui::TOP));
-
     dlg->hbox = hbox;
   }
 
@@ -709,12 +718,7 @@ int Dialog_separator(lua_State* L)
     dlg->dataWidgets[id] = widget;
   }
 
-  dlg->mainWidgets.push_back(widget);
-  dlg->currentGrid->addChildInCell(widget, 2, 1, ui::HORIZONTAL | ui::TOP);
-  dlg->hbox = nullptr;
-
-  lua_pushvalue(L, 1);
-  return 1;
+  return Dialog_add_widget(L, widget);
 }
 
 int Dialog_label(lua_State* L)
@@ -1048,7 +1052,7 @@ int Dialog_shades(lua_State* L)
 int Dialog_file(lua_State* L)
 {
   std::string title = "Open File";
-  std::string path = std::string();
+  std::string path;
   std::string fn;
   base::paths exts;
   auto dlgType = FileSelectorType::Open;
@@ -1114,11 +1118,14 @@ int Dialog_file(lua_State* L)
 
   // Set default path if 'basepath' is blank
   if (path.empty()) {
-    const auto* doc = App::instance()->context()->activeDocument();
-    if (doc)
-      path = base::get_file_path(doc->filename());
-    else
-      path = (base::get_file_path(fn).empty() ? base::get_current_path() : base::get_file_path(fn));
+    // We use the 'filename' path the relative path if it was given.
+    path = base::get_file_path(fn);
+    if (path.empty()) {
+      if (const auto* doc = App::instance()->context()->activeDocument())
+        path = base::get_file_path(doc->filename());
+      else
+        path = base::get_current_path();
+    }
   }
 
   // Update the widget with the provided filename
@@ -1509,6 +1516,10 @@ int Dialog_modify(lua_State* L)
     type = lua_getfield(L, 2, "text");
     if (const char* s = lua_tostring(L, -1)) {
       widget->setText(s);
+
+      // Re-process mnemonics for buttons
+      if (widget->type() == WidgetType::kButtonWidget)
+        widget->processMnemonicFromText();
       relayout = true;
     }
     lua_pop(L, 1);
diff --git a/src/app/script/events_class.cpp b/src/app/script/events_class.cpp
index 5067b5252..155f4800b 100644
--- a/src/app/script/events_class.cpp
+++ b/src/app/script/events_class.cpp
@@ -370,6 +370,10 @@ public:
 #if ENABLE_REMAP_TILESET_EVENT
     RemapTileset,
 #endif
+    LayerBlendMode,
+    LayerName,
+    LayerOpacity,
+    LayerVisibility,
   };
 
   SpriteEvents(const Sprite* sprite) : m_spriteId(sprite->id()) { doc()->add_observer(this); }
@@ -401,6 +405,14 @@ public:
     else if (std::strcmp(eventName, "remaptileset") == 0)
       return RemapTileset;
 #endif
+    else if (std::strcmp(eventName, "layerblendmode") == 0)
+      return LayerBlendMode;
+    else if (std::strcmp(eventName, "layername") == 0)
+      return LayerName;
+    else if (std::strcmp(eventName, "layeropacity") == 0)
+      return LayerOpacity;
+    else if (std::strcmp(eventName, "layervisibility") == 0)
+      return LayerVisibility;
     else
       return Unknown;
   }
@@ -460,6 +472,38 @@ public:
     });
   }
 
+  void onLayerBlendModeChange(DocEvent& ev) override
+  {
+    call(LayerBlendMode,
+         {
+           { "layer", ev.layer() }
+    });
+  }
+
+  void onLayerNameChange(DocEvent& ev) override
+  {
+    call(LayerName,
+         {
+           { "layer", ev.layer() }
+    });
+  }
+
+  void onLayerOpacityChange(DocEvent& ev) override
+  {
+    call(LayerOpacity,
+         {
+           { "layer", ev.layer() }
+    });
+  }
+
+  void onAfterLayerVisibilityChange(DocEvent& ev) override
+  {
+    call(LayerVisibility,
+         {
+           { "layer", ev.layer() }
+    });
+  }
+
 private:
   void onAddFirstListener(EventType eventType) override
   {
diff --git a/src/app/script/image_class.cpp b/src/app/script/image_class.cpp
index eff32a3fa..d3c047827 100644
--- a/src/app/script/image_class.cpp
+++ b/src/app/script/image_class.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2015-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -9,6 +9,7 @@
   #include "config.h"
 #endif
 
+#include "app/cmd/clear_rect.h"
 #include "app/cmd/copy_rect.h"
 #include "app/cmd/copy_region.h"
 #include "app/cmd/flip_image.h"
@@ -246,7 +247,15 @@ int Image_clear(lua_State* L)
   else
     color = convert_args_into_pixel_color(L, i, img->pixelFormat());
 
-  doc::fill_rect(img, rc, color); // Clips the rectangle to the image bounds
+  if (auto cel = obj->cel(L)) {
+    Tx tx(cel->sprite());
+    tx(new cmd::ClearRect(cel, rc.offset(cel->position()), color));
+    tx.commit();
+  }
+  // If the destination image is not related to a sprite, we just draw
+  // the source image without undo information.
+  else
+    doc::fill_rect(img, rc, color); // Clips the rectangle to the image bounds
   return 0;
 }
 
diff --git a/src/app/script/layer_class.cpp b/src/app/script/layer_class.cpp
index 49ff51cd9..3b7238d55 100644
--- a/src/app/script/layer_class.cpp
+++ b/src/app/script/layer_class.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2018  David Capello
 //
 // This program is distributed under the terms of
@@ -247,6 +247,13 @@ int Layer_get_tileset(lua_State* L)
   return 1;
 }
 
+int Layer_get_uuid(lua_State* L)
+{
+  auto* layer = get_docobj<Layer>(L, 1);
+  push_obj(L, layer->uuid());
+  return 1;
+}
+
 int Layer_set_name(lua_State* L)
 {
   auto layer = get_docobj<Layer>(L, 1);
@@ -446,6 +453,7 @@ const Property Layer_properties[] = {
   { "data",          UserData_get_text<Layer>,       UserData_set_text<Layer>       },
   { "properties",    UserData_get_properties<Layer>, UserData_set_properties<Layer> },
   { "tileset",       Layer_get_tileset,              Layer_set_tileset              },
+  { "uuid",          Layer_get_uuid,                 nullptr                        },
   { nullptr,         nullptr,                        nullptr                        }
 };
 
diff --git a/src/app/script/plugin_class.cpp b/src/app/script/plugin_class.cpp
index 2f62f9d45..806db1fa6 100644
--- a/src/app/script/plugin_class.cpp
+++ b/src/app/script/plugin_class.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2023  Igara Studio S.A.
+// Copyright (C) 2020-2023, 2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -29,11 +29,16 @@ struct Plugin {
 
 class PluginCommand : public Command {
 public:
-  PluginCommand(const std::string& id, const std::string& title, int onclickRef, int onenabledRef)
-    : Command(id.c_str(), CmdUIOnlyFlag)
+  PluginCommand(const std::string& id,
+                const std::string& title,
+                int onclickRef,
+                int onenabledRef,
+                int oncheckedRef)
+    : Command(id.c_str())
     , m_title(title)
     , m_onclickRef(onclickRef)
     , m_onenabledRef(onenabledRef)
+    , m_oncheckedRef(oncheckedRef)
   {
   }
 
@@ -72,28 +77,44 @@ protected:
   bool onEnabled(Context* context) override
   {
     if (m_onenabledRef) {
-      script::Engine* engine = App::instance()->scriptEngine();
-      lua_State* L = engine->luaState();
-
-      lua_rawgeti(L, LUA_REGISTRYINDEX, m_onenabledRef);
-      if (lua_pcall(L, 0, 1, 0)) {
-        if (const char* s = lua_tostring(L, -1)) {
-          Console().printf("Error: %s", s);
-          return false;
-        }
-      }
-      else {
-        bool ret = lua_toboolean(L, -1);
-        lua_pop(L, 1);
-        return ret;
-      }
+      return callScriptRef(m_onenabledRef);
     }
     return true;
   }
 
+  bool onChecked(Context* context) override
+  {
+    if (m_oncheckedRef) {
+      return callScriptRef(m_oncheckedRef);
+    }
+    return false;
+  }
+
+private:
+  bool callScriptRef(int ref)
+  {
+    ASSERT(ref);
+    script::Engine* engine = App::instance()->scriptEngine();
+    lua_State* L = engine->luaState();
+
+    lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
+    if (lua_pcall(L, 0, 1, 0)) {
+      if (const char* s = lua_tostring(L, -1)) {
+        Console().printf("Error: %s", s);
+        return false;
+      }
+    }
+    else {
+      bool ret = lua_toboolean(L, -1);
+      lua_pop(L, 1);
+      return ret;
+    }
+  }
+
   std::string m_title;
   int m_onclickRef;
   int m_onenabledRef;
+  int m_oncheckedRef;
 };
 
 void deleteCommandIfExistent(Extension* ext, const std::string& id)
@@ -126,6 +147,7 @@ int Plugin_newCommand(lua_State* L)
   if (lua_istable(L, 2)) {
     std::string id, title, group;
     int onenabledRef = 0;
+    int oncheckedRef = 0;
 
     lua_getfield(L, 2, "id");
     if (const char* s = lua_tostring(L, -1)) {
@@ -156,6 +178,14 @@ int Plugin_newCommand(lua_State* L)
       lua_pop(L, 1);
     }
 
+    type = lua_getfield(L, 2, "onchecked");
+    if (type == LUA_TFUNCTION) {
+      oncheckedRef = luaL_ref(L, LUA_REGISTRYINDEX); // does a pop
+    }
+    else {
+      lua_pop(L, 1);
+    }
+
     type = lua_getfield(L, 2, "onclick");
     if (type == LUA_TFUNCTION) {
       int onclickRef = luaL_ref(L, LUA_REGISTRYINDEX);
@@ -164,7 +194,7 @@ int Plugin_newCommand(lua_State* L)
       // overwriting a previous registered command)
       deleteCommandIfExistent(plugin->ext, id);
 
-      auto cmd = new PluginCommand(id, title, onclickRef, onenabledRef);
+      auto cmd = new PluginCommand(id, title, onclickRef, onenabledRef, oncheckedRef);
       Commands::instance()->add(cmd);
       plugin->ext->addCommand(id);
 
@@ -172,6 +202,7 @@ int Plugin_newCommand(lua_State* L)
       if (!group.empty() && App::instance()->isGui()) { // On CLI menus do not make sense
         if (auto appMenus = AppMenus::instance()) {
           auto menuItem = std::make_unique<AppMenuItem>(title, id);
+          menuItem->processMnemonicFromText();
           appMenus->addMenuItemIntoGroup(group, std::move(menuItem));
         }
       }
diff --git a/src/app/script/security.cpp b/src/app/script/security.cpp
index 6799f7eb4..c10dd3336 100644
--- a/src/app/script/security.cpp
+++ b/src/app/script/security.cpp
@@ -40,6 +40,8 @@ int secure_io_lines(lua_State* L);
 int secure_io_input(lua_State* L);
 int secure_io_output(lua_State* L);
 int secure_os_execute(lua_State* L);
+int secure_os_remove(lua_State* L);
+int secure_os_rename(lua_State* L);
 int secure_package_loadlib(lua_State* L);
 
 enum {
@@ -49,6 +51,8 @@ enum {
   io_input,
   io_output,
   os_execute,
+  os_remove,
+  os_rename,
   package_loadlib,
 };
 
@@ -64,6 +68,8 @@ static struct {
   { "io",      "input",   secure_io_input        },
   { "io",      "output",  secure_io_output       },
   { "os",      "execute", secure_os_execute      },
+  { "os",      "remove",  secure_os_remove       },
+  { "os",      "rename",  secure_os_rename       },
   { "package", "loadlib", secure_package_loadlib },
 };
 
@@ -185,6 +191,81 @@ int secure_os_execute(lua_State* L)
   return replaced_functions[os_execute].origfunc(L);
 }
 
+int file_result(lua_State* L, bool result, int errorNo = 0, const std::string& fileName = "")
+{
+  if (result) {
+    lua_pushboolean(L, 1);
+    return 1;
+  }
+
+  luaL_pushfail(L);
+  if (fileName.empty())
+    lua_pushstring(L, strerror(errorNo));
+  else
+    lua_pushfstring(L, "%s: %s", fileName.c_str(), strerror(errorNo));
+  lua_pushinteger(L, errorNo);
+  return 3;
+}
+
+int secure_os_remove(lua_State* L)
+{
+  const std::string absFilename = base::get_canonical_path(luaL_checkstring(L, 1));
+  if (absFilename.empty())
+    return file_result(L, false, ENOENT, absFilename);
+
+  if (!ask_access(L, absFilename.data(), FileAccessMode::Write, ResourceType::File))
+    return file_result(L, false, EACCES, absFilename);
+
+  if (base::is_directory(absFilename)) {
+    try {
+      base::remove_directory(absFilename);
+      return file_result(L, true);
+    }
+    catch (const std::exception&) {
+      return file_result(L, false, EIO, absFilename);
+    }
+  }
+
+  try {
+    base::delete_file(absFilename);
+  }
+  catch (const std::exception&) {
+    return file_result(L, false, EIO, absFilename);
+  }
+
+  return file_result(L, true);
+}
+
+int secure_os_rename(lua_State* L)
+{
+  const std::string absSourceFilename = base::get_canonical_path(luaL_checkstring(L, 1));
+  const std::string absDestFilename = base::get_absolute_path(luaL_checkstring(L, 2));
+  lua_pop(L, 2);
+
+  if (absSourceFilename.empty())
+    return file_result(L, false, ENOENT, absSourceFilename);
+
+  if (absDestFilename.empty())
+    return file_result(L, false, EINVAL, absDestFilename);
+
+  if (!ask_access(L, absSourceFilename.data(), FileAccessMode::Write, ResourceType::File))
+    return file_result(L, false, EACCES, absSourceFilename);
+
+  try {
+    // If the destination file already exists, we should ask for permission to overwrite it.
+    if (!base::get_canonical_path(absDestFilename).empty() &&
+        !ask_access(L, absDestFilename.data(), FileAccessMode::Write, ResourceType::File)) {
+      return file_result(L, false, EACCES, absDestFilename);
+    }
+
+    base::move_file(absSourceFilename, absDestFilename);
+    return file_result(L, true);
+  }
+  catch (const std::exception&) {
+    return file_result(L, false, EIO, absSourceFilename);
+  }
+}
+
 int secure_package_loadlib(lua_State* L)
 {
   const char* cmd = luaL_checkstring(L, 1);
@@ -201,7 +282,7 @@ void overwrite_unsecure_functions(lua_State* L)
 {
   // Remove unsupported functions
   lua_getglobal(L, "os");
-  for (const char* name : { "remove", "rename", "exit", "tmpname" }) {
+  for (const char* name : { "exit", "tmpname" }) {
     lua_pushcfunction(L, unsupported);
     lua_setfield(L, -2, name);
   }
@@ -280,7 +361,15 @@ bool ask_access(lua_State* L,
     {
       std::string label;
       switch (resourceType) {
-        case ResourceType::File:      label = Strings::script_access_file_label(); break;
+        case ResourceType::File: {
+          if (mode == FileAccessMode::Write) {
+            label = Strings::script_access_file_write_label();
+          }
+          else {
+            label = Strings::script_access_file_label();
+          }
+          break;
+        }
         case ResourceType::Command:   label = Strings::script_access_command_label(); break;
         case ResourceType::WebSocket: label = Strings::script_access_websocket_label(); break;
         case ResourceType::Clipboard: label = Strings::script_access_clipboard_label(); break;
diff --git a/src/app/script/site_class.cpp b/src/app/script/site_class.cpp
index 301bc5285..73934e36e 100644
--- a/src/app/script/site_class.cpp
+++ b/src/app/script/site_class.cpp
@@ -13,6 +13,8 @@
 #include "app/console.h"
 #include "app/context.h"
 #include "app/context_observer.h"
+#include "app/doc.h"
+#include "app/doc_undo.h"
 #include "app/script/docobj.h"
 #include "app/script/engine.h"
 #include "app/script/luacpp.h"
diff --git a/src/app/script/sprite_class.cpp b/src/app/script/sprite_class.cpp
index 899d9aeb3..892944acd 100644
--- a/src/app/script/sprite_class.cpp
+++ b/src/app/script/sprite_class.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2015-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -54,6 +54,7 @@
 #include "app/ui/doc_view.h"
 #include "base/convert_to.h"
 #include "base/fs.h"
+#include "base/gcd.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
 #include "doc/mask.h"
@@ -63,6 +64,7 @@
 #include "doc/tag.h"
 #include "doc/tileset.h"
 #include "doc/tilesets.h"
+#include "undo/undo_state.h"
 
 #include <algorithm>
 
@@ -973,7 +975,13 @@ int Sprite_get_pixelRatio(lua_State* L)
 int Sprite_set_pixelRatio(lua_State* L)
 {
   auto sprite = get_docobj<Sprite>(L, 1);
-  const gfx::Size pixelRatio = convert_args_into_size(L, 2);
+  gfx::Size pixelRatio = convert_args_into_size(L, 2);
+  if (pixelRatio.w < 1 || pixelRatio.h < 1)
+    return luaL_error(L, "invalid pixel ratio = %d:%d", pixelRatio.w, pixelRatio.h);
+
+  double gcd = base::gcd(double(pixelRatio.w), double(pixelRatio.h));
+  pixelRatio.w = int(double(pixelRatio.w) / gcd);
+  pixelRatio.h = int(double(pixelRatio.h) / gcd);
   Tx tx(sprite);
   tx(new cmd::SetPixelRatio(sprite, pixelRatio));
   tx.commit();
@@ -1005,6 +1013,59 @@ int Sprite_set_tileManagementPlugin(lua_State* L)
   return 0;
 }
 
+int Sprite_get_useLayerUuids(lua_State* L)
+{
+  auto* sprite = get_docobj<Sprite>(L, 1);
+  lua_pushboolean(L, sprite->useLayerUuids());
+  return 1;
+}
+
+int Sprite_set_useLayerUuids(lua_State* L)
+{
+  auto* sprite = get_docobj<Sprite>(L, 1);
+  if (lua_isboolean(L, 2)) {
+    const bool value = lua_toboolean(L, 2);
+    sprite->useLayerUuids(value);
+  }
+  return 0;
+}
+
+int Sprite_get_undoHistory(lua_State* L)
+{
+  const auto* sprite = get_docobj<Sprite>(L, 1);
+  const auto* doc = static_cast<Doc*>(sprite->document());
+  const auto* history = doc->undoHistory();
+
+  if (!history) {
+    lua_pushnil(L);
+    return 1;
+  }
+
+  const undo::UndoState* currentState = history->currentState();
+  const undo::UndoState* s = history->firstState();
+  const bool canRedo = history->canRedo();
+  bool pastCurrent = !currentState && canRedo;
+
+  int undoSteps = 0;
+  int redoSteps = 0;
+  while (s) {
+    if (pastCurrent && canRedo)
+      redoSteps++;
+    else if (currentState || !canRedo)
+      undoSteps++;
+
+    if (s == currentState || !currentState)
+      pastCurrent = true;
+
+    s = s->next();
+  }
+
+  lua_newtable(L);
+  setfield_integer(L, "undoSteps", undoSteps);
+  setfield_integer(L, "redoSteps", redoSteps);
+  return 1;
+}
+
 const luaL_Reg Sprite_methods[] = {
   { "__eq",              Sprite_eq                },
   { "resize",            Sprite_resize            },
@@ -1069,6 +1130,8 @@ const Property Sprite_properties[] = {
   { "pixelRatio",           Sprite_get_pixelRatio,           Sprite_set_pixelRatio           },
   { "events",               Sprite_get_events,               nullptr                         },
   { "tileManagementPlugin", Sprite_get_tileManagementPlugin, Sprite_set_tileManagementPlugin },
+  { "useLayerUuids",        Sprite_get_useLayerUuids,        Sprite_set_useLayerUuids        },
+  { "undoHistory",          Sprite_get_undoHistory,          nullptr                         },
   { nullptr,                nullptr,                         nullptr                         }
 };
 
diff --git a/src/app/thumbnails.cpp b/src/app/thumbnails.cpp
index 664bf0f34..c2e436b63 100644
--- a/src/app/thumbnails.cpp
+++ b/src/app/thumbnails.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2018  David Capello
 // Copyright (C) 2016  Carlo Caputo
 //
@@ -21,11 +21,13 @@
 
 namespace app { namespace thumb {
 
-os::SurfaceRef get_cel_thumbnail(const doc::Cel* cel, const gfx::Size& fitInSize)
+os::SurfaceRef get_cel_thumbnail(const doc::Cel* cel,
+                                 const bool scaleUpToFit,
+                                 const gfx::Size& fitInSize)
 {
   gfx::Size newSize;
 
-  if (cel->bounds().w > fitInSize.w || cel->bounds().h > fitInSize.h)
+  if (scaleUpToFit || cel->bounds().w > fitInSize.w || cel->bounds().h > fitInSize.h)
     newSize = gfx::Rect(cel->bounds()).fitIn(gfx::Rect(fitInSize)).size();
   else
     newSize = cel->bounds().size();
diff --git a/src/app/thumbnails.h b/src/app/thumbnails.h
index 0540b0f88..2218655e6 100644
--- a/src/app/thumbnails.h
+++ b/src/app/thumbnails.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2020  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2016  Carlo Caputo
 //
 // This program is distributed under the terms of
@@ -22,7 +22,9 @@ class Surface;
 
 namespace app { namespace thumb {
 
-os::SurfaceRef get_cel_thumbnail(const doc::Cel* cel, const gfx::Size& fitInSize);
+os::SurfaceRef get_cel_thumbnail(const doc::Cel* cel,
+                                 const bool scaleUpToFit,
+                                 const gfx::Size& fitInSize);
 
 }} // namespace app::thumb
 
diff --git a/src/app/tools/inks.h b/src/app/tools/inks.h
index 8785158b7..a794c77b4 100644
--- a/src/app/tools/inks.h
+++ b/src/app/tools/inks.h
@@ -291,9 +291,15 @@ public:
     if (m_createSlice)
       m_maxBounds |= rc;
     else {
-      rc &= loop->getDstImage()->bounds();
-      for (int v = rc.y; v < rc.y2(); ++v)
-        BaseInk::inkHline(rc.x, v, rc.x2() - 1, loop);
+      if (loop->isSelectionToolLoop()) {
+        rc &= loop->sprite()->bounds();
+        loop->addSelectionToolPoint(rc);
+      }
+      else {
+        rc &= loop->getDstImage()->bounds();
+        for (int v = rc.y; v < rc.y2(); ++v)
+          BaseInk::inkHline(rc.x, v, rc.x2() - 1, loop);
+      }
     }
   }
 
@@ -304,7 +310,8 @@ public:
       m_maxBounds = gfx::Rect(0, 0, 0, 0);
     }
     else {
-      m_maxBounds &= loop->getDstImage()->bounds();
+      m_maxBounds &= (loop->isSelectionToolLoop() ? loop->sprite()->bounds() :
+                                                    loop->getDstImage()->bounds());
       loop->onSliceRect(m_maxBounds);
     }
   }
@@ -456,9 +463,15 @@ public:
       m_maxBounds |= rc;
     }
     else {
-      rc &= loop->getDstImage()->bounds();
-      for (int v = rc.y; v < rc.y2(); ++v)
-        BaseInk::inkHline(rc.x, v, rc.x2() - 1, loop);
+      if (loop->isSelectionToolLoop()) {
+        rc &= loop->sprite()->bounds();
+        loop->addSelectionToolPoint(rc);
+      }
+      else {
+        rc &= loop->getDstImage()->bounds();
+        for (int v = rc.y; v < rc.y2(); ++v)
+          BaseInk::inkHline(rc.x, v, rc.x2() - 1, loop);
+      }
     }
   }
 
diff --git a/src/app/tools/intertwiners.h b/src/app/tools/intertwiners.h
index d5207e35c..064643974 100644
--- a/src/app/tools/intertwiners.h
+++ b/src/app/tools/intertwiners.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -74,12 +74,6 @@ public:
 };
 
 class IntertwineAsLines : public Intertwine {
-  // It was introduced to know if joinStroke function
-  // was executed inmediatelly after a "Last" trace policy (i.e. after the
-  // user confirms a line draw while he is holding down the SHIFT key), so
-  // we have to ignore printing the first pixel of the line.
-  bool m_retainedTracePolicyLast = false;
-
   // In freehand-like tools, on each mouse movement we draw only the
   // line between the last two mouse points in the stroke (the
   // complete stroke is not re-painted again), so we want to indicate
@@ -90,22 +84,10 @@ class IntertwineAsLines : public Intertwine {
 public:
   bool snapByAngle() override { return true; }
 
-  void prepareIntertwine(ToolLoop* loop) override
-  {
-    m_retainedTracePolicyLast = false;
-    m_firstStroke = true;
-  }
+  void prepareIntertwine(ToolLoop* loop) override { m_firstStroke = true; }
 
   void joinStroke(ToolLoop* loop, const Stroke& stroke) override
   {
-    // Required for LineFreehand controller in the first stage, when
-    // we are drawing the line and the trace policy is "Last". Each
-    // new joinStroke() is like a fresh start.  Without this fix, the
-    // first stage on LineFreehand will draw a "star" like pattern
-    // with lines from the first point to the last point.
-    if (loop->getTracePolicy() == TracePolicy::Last)
-      m_retainedTracePolicyLast = true;
-
     if (stroke.size() == 0)
       return;
     else if (stroke.size() == 1) {
@@ -129,9 +111,10 @@ public:
       // when we use Shift+click in the Pencil tool to continue the
       // old stroke).
       // TODO useful only in the case when brush size = 1px
-      const int start =
-        (loop->getController()->isFreehand() && (m_retainedTracePolicyLast || !m_firstStroke) ? 1 :
-                                                                                                0);
+      const int start = (loop->getController()->isFreehand() &&
+                             ((loop->getTracePolicy() == TracePolicy::Last) || !m_firstStroke) ?
+                           1 :
+                           0);
 
       for (int c = start; c < pts.size(); ++c)
         doPointshapeStrokePt(pts[c], loop);
@@ -442,11 +425,6 @@ public:
 };
 
 class IntertwineAsPixelPerfect : public Intertwine {
-  // It was introduced to know if joinStroke function
-  // was executed inmediatelly after a "Last" trace policy (i.e. after the
-  // user confirms a line draw while he is holding down the SHIFT key), so
-  // we have to ignore printing the first pixel of the line.
-  bool m_retainedTracePolicyLast = false;
   Stroke m_pts;
   bool m_saveStrokeArea = false;
 
@@ -483,7 +461,6 @@ public:
   void prepareIntertwine(ToolLoop* loop) override
   {
     m_pts.reset();
-    m_retainedTracePolicyLast = false;
     m_grid = m_dstGrid = m_celGrid = loop->getGrid();
     m_restoredRegion.clear();
 
@@ -509,10 +486,8 @@ public:
     // new joinStroke() is like a fresh start.  Without this fix, the
     // first stage on LineFreehand will draw a "star" like pattern
     // with lines from the first point to the last point.
-    if (loop->getTracePolicy() == TracePolicy::Last) {
-      m_retainedTracePolicyLast = true;
+    if (loop->getTracePolicy() == TracePolicy::Last)
       m_pts.reset();
-    }
 
     int thirdFromLastPt = 0, nextPt = 0;
 
@@ -572,14 +547,17 @@ public:
       // a joinStroke pass with a retained "Last" trace policy
       // (i.e. the user confirms draw a line while he is holding
       // the SHIFT key))
-      if (c == 0 && m_retainedTracePolicyLast)
+      if (c == 0 && loop->getTracePolicy() == TracePolicy::Last)
         continue;
 
       // For the last point we need to store the source image content at that
       // point so we can restore it when erasing a point because of
       // pixel-perfect. So we set the following flag to indicate this, and
       // use it in doTransformPoint.
-      m_saveStrokeArea = (c == m_pts.size() - 1);
+      // The previous behavior isn't required for LineFreehand controller and
+      // the trace policy is "Last" (i.e. the user is drawing a line while
+      // he is holding the SHIFT key)
+      m_saveStrokeArea = ((c == m_pts.size() - 1) && loop->getTracePolicy() != TracePolicy::Last);
       if (m_saveStrokeArea) {
         clearPointshapeStrokePtAreas();
         setLastPtIndex(c);
diff --git a/src/app/tools/point_shape.cpp b/src/app/tools/point_shape.cpp
index 0ee3b06bb..645c630ad 100644
--- a/src/app/tools/point_shape.cpp
+++ b/src/app/tools/point_shape.cpp
@@ -29,8 +29,10 @@ void PointShape::doInkHline(int x1, int y, int x2, ToolLoop* loop)
 {
   Ink* ink = loop->getInk();
   TiledMode tiledMode = loop->getTiledMode();
-  const int dstw = loop->getDstImage()->width();
-  const int dsth = loop->getDstImage()->height();
+  const int dstw = (!loop->isSelectionToolLoop() ? loop->getDstImage()->width() :
+                                                   loop->sprite()->bounds().w);
+  const int dsth = (!loop->isSelectionToolLoop() ? loop->getDstImage()->height() :
+                                                   loop->sprite()->bounds().h);
   int x, w, size; // width or height
 
   // In case the ink needs original cel coordinates, we have to
diff --git a/src/app/tools/symmetry.cpp b/src/app/tools/symmetry.cpp
index 57899a093..a153ba46e 100644
--- a/src/app/tools/symmetry.cpp
+++ b/src/app/tools/symmetry.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2021-2024  Igara Studio S.A.
+// Copyright (C) 2021-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -20,7 +20,7 @@ void Symmetry::generateStrokes(const Stroke& stroke, Strokes& strokes, ToolLoop*
 {
   Stroke stroke2;
   strokes.push_back(stroke);
-  gen::SymmetryMode symmetryMode = loop->getSymmetry()->mode();
+  const gen::SymmetryMode symmetryMode = tools::Symmetry::resolveMode(loop->getSymmetry()->mode());
   switch (symmetryMode) {
     case gen::SymmetryMode::NONE: ASSERT(false); break;
 
@@ -171,4 +171,14 @@ void Symmetry::calculateSymmetricalStroke(const Stroke& refStroke,
   }
 }
 
+gen::SymmetryMode Symmetry::resolveMode(gen::SymmetryMode mode)
+{
+  return (((int(mode) & int(gen::SymmetryMode::HORIZONTAL)) ||
+           (int(mode) & int(gen::SymmetryMode::VERTICAL))) &&
+          ((int(mode) & int(gen::SymmetryMode::RIGHT_DIAG)) ||
+           (int(mode) & int(gen::SymmetryMode::LEFT_DIAG)))) ?
+           gen::SymmetryMode::ALL :
+           mode;
+}
+
 }} // namespace app::tools
diff --git a/src/app/tools/symmetry.h b/src/app/tools/symmetry.h
index 543799dec..2dd086d86 100644
--- a/src/app/tools/symmetry.h
+++ b/src/app/tools/symmetry.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2021-2024  Igara Studio S.A.
+// Copyright (C) 2021-2025  Igara Studio S.A.
 // Copyright (C) 2015  David Capello
 //
 // This program is distributed under the terms of
@@ -38,6 +38,8 @@ public:
 
   gen::SymmetryMode mode() const { return m_symmetryMode; }
 
+  static gen::SymmetryMode resolveMode(gen::SymmetryMode mode);
+
 private:
   void calculateSymmetricalStroke(const Stroke& refStroke,
                                   Stroke& stroke,
diff --git a/src/app/tools/tool_loop.h b/src/app/tools/tool_loop.h
index 3f9bd3edb..8a95d012c 100644
--- a/src/app/tools/tool_loop.h
+++ b/src/app/tools/tool_loop.h
@@ -264,6 +264,11 @@ public:
   virtual void onSliceRect(const gfx::Rect& bounds) = 0;
 
   virtual const app::TiledModeHelper& getTiledModeHelper() = 0;
+
+  // Used by selection tools
+  virtual bool isSelectionToolLoop() const = 0;
+  virtual void addSelectionToolPoint(const gfx::Rect& rc) = 0;
+  virtual void clearSelectionToolMask(const bool finalStep) = 0;
 };
 
 } // namespace tools
diff --git a/src/app/tools/tool_loop_manager.cpp b/src/app/tools/tool_loop_manager.cpp
index 3983dd9ad..b95f02ca0 100644
--- a/src/app/tools/tool_loop_manager.cpp
+++ b/src/app/tools/tool_loop_manager.cpp
@@ -271,6 +271,8 @@ void ToolLoopManager::doLoopStep(bool lastStep)
   }
 
   m_toolLoop->validateDstImage(m_dirtyArea);
+  if (!lastStep && m_toolLoop->isSelectionToolLoop())
+    m_toolLoop->clearSelectionToolMask(false);
 
   // Join or fill user points
   if (fillStrokes)
@@ -341,6 +343,13 @@ void ToolLoopManager::calculateDirtyArea(const Strokes& strokes)
     m_dirtyArea.createUnion(m_dirtyArea, Region(r1.createUnion(r2)));
   }
 
+  // This ensures the Selection Tool Mask doesn't leave a 'trail' behind
+  if (m_toolLoop->isSelectionToolLoop()) {
+    auto bounds = m_dirtyArea.bounds();
+    bounds.enlarge(1);
+    m_dirtyArea |= gfx::Region(bounds);
+  }
+
   // Merge new dirty area with the previous one (for tools like line
   // or rectangle it's needed to redraw the previous position and
   // the new one)
diff --git a/src/app/ui/app_menuitem.cpp b/src/app/ui/app_menuitem.cpp
index 73ebff19d..0c0b45f3f 100644
--- a/src/app/ui/app_menuitem.cpp
+++ b/src/app/ui/app_menuitem.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -19,9 +19,10 @@
 #include "app/ui/keyboard_shortcuts.h"
 #include "app/ui_context.h"
 #include "os/menus.h"
-#include "ui/accelerator.h"
 #include "ui/menu.h"
 #include "ui/message.h"
+#include "ui/scale.h"
+#include "ui/shortcut.h"
 #include "ui/size_hint_event.h"
 #include "ui/widget.h"
 
@@ -134,12 +135,12 @@ void AppMenuItem::onSizeHint(SizeHintEvent& ev)
   gfx::Size size(0, 0);
 
   if (hasText()) {
-    size.w = +textWidth() + (inBar() ? childSpacing() / 4 : childSpacing()) + border().width();
+    size.w = textWidth() + (inBar() ? guiscaled_div(childSpacing(), 4) : childSpacing()) +
+             border().width();
+    size.h = textHeight() + border().height();
 
-    size.h = +textHeight() + border().height();
-
-    if (m_key && !m_key->accels().empty()) {
-      size.w += font()->textLength(m_key->accels().front().toString());
+    if (m_key && !m_key->shortcuts().empty()) {
+      size.w += font()->textLength(m_key->shortcuts().front().toString());
     }
   }
 
diff --git a/src/app/ui/browser_view.cpp b/src/app/ui/browser_view.cpp
index 784f988b3..911f2b71e 100644
--- a/src/app/ui/browser_view.cpp
+++ b/src/app/ui/browser_view.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2016-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -65,7 +65,7 @@ private:
 class BrowserView::CMarkBox : public Widget {
   class Break : public Widget {
   public:
-    Break() { setMinSize(gfx::Size(0, font()->height())); }
+    Break() { setMinSize(gfx::Size(0, font()->lineHeight())); }
   };
   class OpenList : public Widget {};
   class CloseList : public Widget {};
@@ -439,7 +439,8 @@ private:
   void addSeparator()
   {
     auto sep = new SeparatorInView(std::string(), HORIZONTAL);
-    sep->setBorder(gfx::Border(0, font()->height(), 0, font()->height()));
+    float h = font()->lineHeight() / 2.0f;
+    sep->setBorder(gfx::Border(0, h, 0, h));
     sep->setExpansive(true);
     addChild(sep);
   }
diff --git a/src/app/ui/brush_popup.cpp b/src/app/ui/brush_popup.cpp
index 9fbc6f43d..8415cdafb 100644
--- a/src/app/ui/brush_popup.cpp
+++ b/src/app/ui/brush_popup.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -431,8 +431,8 @@ void BrushPopup::regenerate(ui::Display* display, const gfx::Point& pos)
       params.set("change", "custom");
       params.set("slot", base::convert_to<std::string>(slot).c_str());
       KeyPtr key = KeyboardShortcuts::instance()->command(CommandId::ChangeBrush(), params);
-      if (key && !key->accels().empty())
-        shortcut = key->accels().front().toString();
+      if (key && !key->shortcuts().empty())
+        shortcut = key->shortcuts().front().toString();
     }
     m_customBrushes->addItem(new SelectBrushItem(brush, slot));
     m_customBrushes->addItem(new BrushShortcutItem(shortcut, slot));
@@ -514,7 +514,7 @@ os::SurfaceRef BrushPopup::createSurfaceForBrush(const BrushRef& origBrush,
     if (image->pixelFormat() == IMAGE_BITMAP)
       delete palette;
 
-    surface->applyScale(guiscale());
+    surface = surface->applyScale(guiscale());
   }
   else {
     surface->clear();
diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index 64008b002..b41ea7eb3 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -72,6 +72,7 @@
 #include "ui/menu.h"
 #include "ui/message.h"
 #include "ui/paint_event.h"
+#include "ui/resize_event.h"
 #include "ui/separator.h"
 #include "ui/splitter.h"
 #include "ui/system.h"
@@ -138,8 +139,8 @@ void ColorBar::ScrollableView::onInitTheme(InitThemeEvent& ev)
 
 ColorBar* ColorBar::m_instance = NULL;
 
-ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
-  : Box(align)
+ColorBar::ColorBar(TooltipManager* tooltipManager)
+  : Box(VERTICAL)
   , m_editPal(1)
   , m_buttons(int(PalButton::MAX))
   , m_tilesButton(1)
@@ -299,7 +300,7 @@ ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
   InitTheme.connect([this, fgBox, bgBox] {
     auto theme = SkinTheme::get(this);
 
-    setBorder(gfx::Border(2 * guiscale(), 0, 0, 0));
+    setBorder(gfx::Border(0));
     setChildSpacing(2 * guiscale());
 
     m_fgColor.resetSizeHint();
@@ -644,6 +645,18 @@ void ColorBar::onSizeHint(ui::SizeHintEvent& ev)
   Box::onSizeHint(ev);
 }
 
+void ColorBar::onResize(ui::ResizeEvent& ev)
+{
+  // Docked at left side
+  // TODO improve this how this is calculated
+  if (ev.bounds().x == 0)
+    setBorder(gfx::Border(2 * guiscale(), 0, 0, 0));
+  else
+    setBorder(gfx::Border(0, 0, 2 * guiscale(), 0));
+
+  Box::onResize(ev);
+}
+
 void ColorBar::onActiveSiteChange(const Site& site)
 {
   if (m_lastDocument != site.document()) {
diff --git a/src/app/ui/color_bar.h b/src/app/ui/color_bar.h
index 9895db55b..ed4fa4d51 100644
--- a/src/app/ui/color_bar.h
+++ b/src/app/ui/color_bar.h
@@ -17,6 +17,7 @@
 #include "app/tileset_mode.h"
 #include "app/ui/button_set.h"
 #include "app/ui/color_button.h"
+#include "app/ui/dockable.h"
 #include "app/ui/input_chain_element.h"
 #include "app/ui/palette_view.h"
 #include "app/ui/tile_button.h"
@@ -50,7 +51,8 @@ class ColorBar : public ui::Box,
                  public PaletteViewDelegate,
                  public ContextObserver,
                  public DocObserver,
-                 public InputChainElement {
+                 public InputChainElement,
+                 public Dockable {
   static ColorBar* m_instance;
 
 public:
@@ -65,7 +67,7 @@ public:
 
   static ColorBar* instance() { return m_instance; }
 
-  ColorBar(int align, ui::TooltipManager* tooltipManager);
+  ColorBar(ui::TooltipManager* tooltipManager);
   ~ColorBar();
 
   void setPixelFormat(doc::PixelFormat pixelFormat);
@@ -123,10 +125,18 @@ public:
   bool onClear(Context* ctx) override;
   void onCancel(Context* ctx) override;
 
+  // Dockable impl
+  int dockableAt() const override
+  {
+    // TODO split the ColorBar in different dockable widgets
+    return ui::LEFT | ui::RIGHT | ui::EXPANSIVE;
+  }
+
   obs::signal<void()> ChangeSelection;
 
 protected:
   void onSizeHint(ui::SizeHintEvent& ev) override;
+  void onResize(ui::ResizeEvent& ev) override;
   void onAppPaletteChange();
   void onFocusPaletteView(ui::Message* msg);
   void onFocusTilesView(ui::Message* msg);
diff --git a/src/app/ui/color_shades.cpp b/src/app/ui/color_shades.cpp
index 4065ef160..76ef0d157 100644
--- a/src/app/ui/color_shades.cpp
+++ b/src/app/ui/color_shades.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2023  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2018  David Capello
 //
 // This program is distributed under the terms of
@@ -287,6 +287,7 @@ void ColorShades::onPaint(ui::PaintEvent& ev)
     ui::PaintWidgetPartInfo info;
     const std::string& text = this->text();
     info.text = &text;
+    info.baseline = textBaseline();
     theme->paintWidgetPart(g, theme->styles.shadeEmpty(), bounds, info);
   }
 }
diff --git a/src/app/ui/color_sliders.cpp b/src/app/ui/color_sliders.cpp
index fb5900e58..5af153f9f 100644
--- a/src/app/ui/color_sliders.cpp
+++ b/src/app/ui/color_sliders.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -391,7 +391,8 @@ void ColorSliders::addSlider(const Channel channel,
   gfx::Size sz(std::numeric_limits<int>::max(), theme->dimensions.colorSliderHeight());
   item.label->setMaxSize(sz);
   item.box->setMaxSize(sz);
-  item.entry->setMaxSize(sz);
+  // Don't limit the entry size as it will be too small for UI Scaling=200%
+  // item.entry->setMaxSize(sz);
 
   m_grid.addChildInCell(item.label, 1, 1, LEFT | MIDDLE);
   m_grid.addChildInCell(item.box, 1, 1, HORIZONTAL | VERTICAL);
diff --git a/src/app/ui/configure_timeline_popup.cpp b/src/app/ui/configure_timeline_popup.cpp
index b8deb613b..dde94da1e 100644
--- a/src/app/ui/configure_timeline_popup.cpp
+++ b/src/app/ui/configure_timeline_popup.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2021  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -53,7 +53,7 @@ ConfigureTimelinePopup::ConfigureTimelinePopup()
   m_box = new app::gen::TimelineConf();
   addChild(m_box);
 
-  m_box->position()->ItemChange.connect([this] { onChangePosition(); });
+  m_box->layout()->Click.connect([this] { onWorkspaceLayout(); });
   m_box->firstFrame()->Change.connect([this] { onChangeFirstFrame(); });
   m_box->merge()->Click.connect([this] { onChangeType(); });
   m_box->tint()->Click.connect([this] { onChangeType(); });
@@ -69,10 +69,13 @@ ConfigureTimelinePopup::ConfigureTimelinePopup()
   m_box->thumbEnabled()->Click.connect([this] { onThumbEnabledChange(); });
   m_box->thumbOverlayEnabled()->Click.connect([this] { onThumbOverlayEnabledChange(); });
   m_box->thumbOverlaySize()->Change.connect([this] { onThumbOverlaySizeChange(); });
+  m_box->thumbScaleUpToFit()->Click.connect([this] { onScaleUpToFitChange(); });
 
   const bool visibleThumb = docPref().thumbnails.enabled();
   m_box->thumbHSeparator()->setVisible(visibleThumb);
   m_box->thumbBox()->setVisible(visibleThumb);
+
+  m_box->defaults()->Click.connect([this] { onSetAsDefaults(); });
 }
 
 Doc* ConfigureTimelinePopup::doc()
@@ -90,15 +93,6 @@ void ConfigureTimelinePopup::updateWidgetsFromCurrentSettings()
   DocumentPreferences& docPref = this->docPref();
   base::ScopedValue lockUpdates(m_lockUpdates, true);
 
-  auto position = Preferences::instance().general.timelinePosition();
-  int selItem = 2;
-  switch (position) {
-    case gen::TimelinePosition::LEFT:   selItem = 0; break;
-    case gen::TimelinePosition::RIGHT:  selItem = 1; break;
-    case gen::TimelinePosition::BOTTOM: selItem = 2; break;
-  }
-  m_box->position()->setSelectedItem(selItem, false);
-
   m_box->firstFrame()->setTextf("%d", docPref.timeline.firstFrame());
 
   switch (docPref.onionskin.type()) {
@@ -128,6 +122,7 @@ void ConfigureTimelinePopup::updateWidgetsFromCurrentSettings()
   m_box->thumbBox()->setVisible(visibleThumb);
   m_box->thumbOverlayEnabled()->setSelected(docPref.thumbnails.overlayEnabled());
   m_box->thumbOverlaySize()->setValue(docPref.thumbnails.overlaySize());
+  m_box->thumbScaleUpToFit()->setSelected(docPref.thumbnails.scaleUpToFit());
 
   expandWindow(sizeHint());
 }
@@ -143,17 +138,10 @@ bool ConfigureTimelinePopup::onProcessMessage(ui::Message* msg)
   return PopupWindow::onProcessMessage(msg);
 }
 
-void ConfigureTimelinePopup::onChangePosition()
+void ConfigureTimelinePopup::onWorkspaceLayout()
 {
-  gen::TimelinePosition newTimelinePos = gen::TimelinePosition::BOTTOM;
-
-  int selITem = m_box->position()->selectedItem();
-  switch (selITem) {
-    case 0: newTimelinePos = gen::TimelinePosition::LEFT; break;
-    case 1: newTimelinePos = gen::TimelinePosition::RIGHT; break;
-    case 2: newTimelinePos = gen::TimelinePosition::BOTTOM; break;
-  }
-  Preferences::instance().general.timelinePosition(newTimelinePos);
+  UIContext::instance()->executeCommand(
+    Commands::instance()->byId(CommandId::ToggleWorkspaceLayout()));
 }
 
 void ConfigureTimelinePopup::onChangeFirstFrame()
@@ -237,4 +225,33 @@ void ConfigureTimelinePopup::onThumbOverlaySizeChange()
   docPref().thumbnails.overlaySize(m_box->thumbOverlaySize()->getValue());
 }
 
+void ConfigureTimelinePopup::onScaleUpToFitChange()
+{
+  docPref().thumbnails.scaleUpToFit(m_box->thumbScaleUpToFit()->isSelected());
+}
+
+void ConfigureTimelinePopup::onSetAsDefaults()
+{
+  const auto& docPref = this->docPref();
+  auto& defaults = Preferences::instance().document(nullptr);
+
+  defaults.timeline.firstFrame(docPref.timeline.firstFrame());
+
+  defaults.thumbnails.enabled(docPref.thumbnails.enabled());
+  defaults.thumbnails.zoom(docPref.thumbnails.zoom());
+  defaults.thumbnails.overlayEnabled(docPref.thumbnails.overlayEnabled());
+  defaults.thumbnails.overlaySize(docPref.thumbnails.overlaySize());
+  defaults.thumbnails.scaleUpToFit(docPref.thumbnails.scaleUpToFit());
+
+  defaults.onionskin.active(docPref.onionskin.active());
+  defaults.onionskin.prevFrames(docPref.onionskin.prevFrames());
+  defaults.onionskin.nextFrames(docPref.onionskin.nextFrames());
+  defaults.onionskin.opacityBase(docPref.onionskin.opacityBase());
+  defaults.onionskin.opacityStep(docPref.onionskin.opacityStep());
+  defaults.onionskin.type(docPref.onionskin.type());
+  defaults.onionskin.loopTag(docPref.onionskin.loopTag());
+  defaults.onionskin.currentLayer(docPref.onionskin.currentLayer());
+  defaults.onionskin.position(docPref.onionskin.position());
+}
+
 } // namespace app
diff --git a/src/app/ui/configure_timeline_popup.h b/src/app/ui/configure_timeline_popup.h
index eae779bf6..4107637ee 100644
--- a/src/app/ui/configure_timeline_popup.h
+++ b/src/app/ui/configure_timeline_popup.h
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2022-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -32,7 +33,7 @@ public:
 
 protected:
   bool onProcessMessage(ui::Message* msg) override;
-  void onChangePosition();
+  void onWorkspaceLayout();
   void onChangeFirstFrame();
   void onChangeType();
   void onOpacity();
@@ -46,6 +47,8 @@ protected:
   void onThumbEnabledChange();
   void onThumbOverlayEnabledChange();
   void onThumbOverlaySizeChange();
+  void onScaleUpToFitChange();
+  void onSetAsDefaults();
 
 private:
   void updateWidgetsFromCurrentSettings();
diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index 31aa207bd..127188a9a 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -1001,12 +1001,12 @@ public:
     m_angle.setSuffix("°");
     m_skew.setSuffix("°");
 
-    addChild(new Label("P:"));
+    addChild(new Label(Strings::context_bar_position_label()));
     addChild(&m_x);
     addChild(&m_y);
     addChild(&m_w);
     addChild(&m_h);
-    addChild(new Label("R:"));
+    addChild(new Label(Strings::context_bar_rotation_label()));
     addChild(&m_angle);
     addChild(&m_skew);
 
@@ -1047,6 +1047,16 @@ public:
     m_skew.Change.connect([this] { onChangeSkew(); });
   }
 
+  void setupTooltips(TooltipManager* tooltipManager)
+  {
+    tooltipManager->addTooltipFor(&m_x, Strings::context_bar_position_x(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_y, Strings::context_bar_position_y(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_w, Strings::context_bar_size_width(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_h, Strings::context_bar_size_height(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_angle, Strings::context_bar_rotation_angle(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_skew, Strings::context_bar_rotation_skew(), BOTTOM);
+  }
+
   void update(const Transformation& t)
   {
     auto rc = t.bounds();
@@ -1530,14 +1540,10 @@ public:
 
     DocumentPreferences& docPref = Preferences::instance().document(doc);
 
-    at(0)->setSelected(
-      int(docPref.symmetry.mode()) & int(app::gen::SymmetryMode::HORIZONTAL) ? true : false);
-    at(1)->setSelected(
-      int(docPref.symmetry.mode()) & int(app::gen::SymmetryMode::VERTICAL) ? true : false);
-    at(2)->setSelected(
-      int(docPref.symmetry.mode()) & int(app::gen::SymmetryMode::RIGHT_DIAG) ? true : false);
-    at(3)->setSelected(
-      int(docPref.symmetry.mode()) & int(app::gen::SymmetryMode::LEFT_DIAG) ? true : false);
+    at(0)->setSelected(int(docPref.symmetry.mode()) & int(app::gen::SymmetryMode::HORIZONTAL));
+    at(1)->setSelected(int(docPref.symmetry.mode()) & int(app::gen::SymmetryMode::VERTICAL));
+    at(2)->setSelected(int(docPref.symmetry.mode()) & int(app::gen::SymmetryMode::RIGHT_DIAG));
+    at(3)->setSelected(int(docPref.symmetry.mode()) & int(app::gen::SymmetryMode::LEFT_DIAG));
   }
 
 private:
@@ -1551,60 +1557,7 @@ private:
 
     DocumentPreferences& docPref = Preferences::instance().document(doc);
 
-    auto oldMode = docPref.symmetry.mode();
     int mode = 0;
-    if (at(0)->isSelected())
-      mode |= int(app::gen::SymmetryMode::HORIZONTAL);
-    if (at(1)->isSelected())
-      mode |= int(app::gen::SymmetryMode::VERTICAL);
-    if (at(2)->isSelected())
-      mode |= int(app::gen::SymmetryMode::RIGHT_DIAG);
-    if (at(3)->isSelected())
-      mode |= int(app::gen::SymmetryMode::LEFT_DIAG);
-
-    // Non sense symmetries filter:
-    //  - H + 1Diag
-    //  - V + 1Diag
-    //  - H + V + 1Diag
-    const bool HorV = (mode & int(app::gen::SymmetryMode::HORIZONTAL)) ||
-                      (mode & int(app::gen::SymmetryMode::VERTICAL));
-    const bool HxorV = !(mode & int(app::gen::SymmetryMode::HORIZONTAL)) !=
-                       !(mode & int(app::gen::SymmetryMode::VERTICAL));
-    const bool RDxorLD = !(mode & int(app::gen::SymmetryMode::RIGHT_DIAG)) !=
-                         !(mode & int(app::gen::SymmetryMode::LEFT_DIAG));
-    if (oldMode == gen::SymmetryMode::HORIZONTAL || oldMode == gen::SymmetryMode::VERTICAL ||
-        oldMode == gen::SymmetryMode::BOTH) {
-      if (HorV && RDxorLD) {
-        mode = int(app::gen::SymmetryMode::ALL);
-        at(0)->setSelected(true);
-        at(1)->setSelected(true);
-        at(2)->setSelected(true);
-        at(3)->setSelected(true);
-      }
-    }
-    else if (oldMode == gen::SymmetryMode::ALL) {
-      if (HxorV) {
-        mode = int(app::gen::SymmetryMode::BOTH_DIAG);
-        at(0)->setSelected(false);
-        at(1)->setSelected(false);
-      }
-      else if (RDxorLD) {
-        mode = int(app::gen::SymmetryMode::BOTH);
-        at(2)->setSelected(false);
-        at(3)->setSelected(false);
-      }
-    }
-    else if ((oldMode == gen::SymmetryMode::RIGHT_DIAG || oldMode == gen::SymmetryMode::LEFT_DIAG ||
-              oldMode == gen::SymmetryMode::BOTH_DIAG) &&
-             HorV) {
-      mode = int(app::gen::SymmetryMode::ALL);
-      at(0)->setSelected(true);
-      at(1)->setSelected(true);
-      at(2)->setSelected(true);
-      at(3)->setSelected(true);
-    }
-    // Non sense symmetries filter end
-
     if (at(0)->isSelected())
       mode |= int(app::gen::SymmetryMode::HORIZONTAL);
     if (at(1)->isSelected())
@@ -1914,7 +1867,7 @@ private:
 
 class ContextBar::FontSelector : public FontEntry {
 public:
-  FontSelector(ContextBar* contextBar)
+  FontSelector(ContextBar* contextBar) : FontEntry(true) // With stroke and fill options
   {
     // Load the font from the preferences
     setInfo(FontInfo::getFromPreferences(), FontEntry::From::Init);
@@ -2019,6 +1972,12 @@ void ContextBar::onInitTheme(ui::InitThemeEvent& ev)
   auto theme = SkinTheme::get(this);
   gfx::Border border = this->border();
   border.bottom(2 * guiscale());
+
+  // Docked at the left side
+  // TODO improve this how this is calculated
+  if (bounds().x == 0)
+    border.left(border.left() + 2 * guiscale());
+
   setBorder(border);
   setBgColor(theme->colors.workspace());
   m_sprayLabel->setStyle(theme->styles.miniLabel());
@@ -2616,6 +2575,11 @@ FontInfo ContextBar::fontInfo() const
   return m_fontSelector->info();
 }
 
+FontEntry* ContextBar::fontEntry()
+{
+  return m_fontSelector;
+}
+
 render::DitheringMatrix ContextBar::ditheringMatrix()
 {
   return m_ditheringSelector->ditheringMatrix();
@@ -2678,6 +2642,7 @@ void ContextBar::setupTooltips(TooltipManager* tooltipManager)
   m_dropPixels->setupTooltips(tooltipManager);
   m_symmetry->setupTooltips(tooltipManager);
   m_sliceFields->setupTooltips(tooltipManager);
+  m_transformation->setupTooltips(tooltipManager);
 }
 
 void ContextBar::registerCommands()
diff --git a/src/app/ui/context_bar.h b/src/app/ui/context_bar.h
index 1bb0d3496..89eb4000f 100644
--- a/src/app/ui/context_bar.h
+++ b/src/app/ui/context_bar.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -17,6 +17,7 @@
 #include "app/tools/tool_loop_modifiers.h"
 #include "app/ui/context_bar_observer.h"
 #include "app/ui/doc_observer_widget.h"
+#include "app/ui/dockable.h"
 #include "app/ui/font_entry.h"
 #include "doc/brush.h"
 #include "obs/connection.h"
@@ -60,7 +61,8 @@ class Transformation;
 
 class ContextBar : public DocObserverWidget<ui::HBox>,
                    public obs::observable<ContextBarObserver>,
-                   public tools::ActiveToolObserver {
+                   public tools::ActiveToolObserver,
+                   public Dockable {
 public:
   ContextBar(ui::TooltipManager* tooltipManager, ColorBar* colorBar);
   ~ContextBar();
@@ -90,6 +92,7 @@ public:
 
   // For text tool
   FontInfo fontInfo() const;
+  FontEntry* fontEntry();
 
   // For gradients
   render::DitheringMatrix ditheringMatrix();
@@ -99,6 +102,10 @@ public:
   // For freehand with dynamics
   const tools::DynamicsOptions& getDynamics() const;
 
+  // Dockable impl
+  int dockableAt() const override { return ui::TOP | ui::BOTTOM; }
+  int dockHandleSide() const override { return ui::LEFT; }
+
   // Signals
   obs::signal<void()> BrushChange;
   obs::signal<void(const FontInfo&, FontEntry::From)> FontChange;
diff --git a/src/app/ui/doc_view.cpp b/src/app/ui/doc_view.cpp
index 18aebbda0..549b7136c 100644
--- a/src/app/ui/doc_view.cpp
+++ b/src/app/ui/doc_view.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -41,10 +41,10 @@
 #include "doc/layer.h"
 #include "doc/sprite.h"
 #include "fmt/format.h"
-#include "ui/accelerator.h"
 #include "ui/alert.h"
 #include "ui/menu.h"
 #include "ui/message.h"
+#include "ui/shortcut.h"
 #include "ui/system.h"
 #include "ui/view.h"
 
@@ -147,11 +147,11 @@ protected:
           KeyPtr rmb = keys->action(KeyAction::RightMouseButton, KeyContext::Any);
 
           // Convert action keys into mouse messages.
-          if (lmb->isPressed(msg, *keys) || rmb->isPressed(msg, *keys)) {
+          if (lmb->isPressed(msg) || rmb->isPressed(msg)) {
             MouseMessage mouseMsg(
               (msg->type() == kKeyDownMessage ? kMouseDownMessage : kMouseUpMessage),
               PointerType::Unknown,
-              (lmb->isPressed(msg, *keys) ? kButtonLeft : kButtonRight),
+              (lmb->isPressed(msg) ? kButtonLeft : kButtonRight),
               msg->modifiers(),
               mousePosInDisplay());
 
diff --git a/src/app/ui/dock.cpp b/src/app/ui/dock.cpp
new file mode 100644
index 000000000..335672c8b
--- /dev/null
+++ b/src/app/ui/dock.cpp
@@ -0,0 +1,866 @@
+// Aseprite
+// Copyright (C) 2021-2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/ui/dock.h"
+
+#include "app/app.h"
+#include "app/i18n/strings.h"
+#include "app/ini_file.h"
+#include "app/modules/gfx.h"
+#include "app/pref/preferences.h"
+#include "app/ui/dockable.h"
+#include "app/ui/layout_selector.h"
+#include "app/ui/main_window.h"
+#include "app/ui/skin/skin_theme.h"
+#include "os/system.h"
+#include "ui/cursor_type.h"
+#include "ui/label.h"
+#include "ui/menu.h"
+#include "ui/message.h"
+#include "ui/paint_event.h"
+#include "ui/resize_event.h"
+#include "ui/scale.h"
+#include "ui/size_hint_event.h"
+#include "ui/system.h"
+#include "ui/widget.h"
+
+namespace app {
+
+using namespace app::skin;
+using namespace ui;
+
+namespace {
+
+enum { kTopIndex, kBottomIndex, kLeftIndex, kRightIndex, kCenterIndex };
+
+int side_index(int side)
+{
+  switch (side) {
+    case ui::TOP:    return kTopIndex;
+    case ui::BOTTOM: return kBottomIndex;
+    case ui::LEFT:   return kLeftIndex;
+    case ui::RIGHT:  return kRightIndex;
+  }
+  return kCenterIndex; // ui::CENTER
+}
+
+int side_from_index(int index)
+{
+  switch (index) {
+    case kTopIndex:    return ui::TOP;
+    case kBottomIndex: return ui::BOTTOM;
+    case kLeftIndex:   return ui::LEFT;
+    case kRightIndex:  return ui::RIGHT;
+  }
+  return ui::CENTER; // kCenterIndex
+}
+
+} // anonymous namespace
+
+// TODO: Duplicated from main_window.cpp
+static constexpr auto kLegacyLayoutMainWindowSection = "layout:main_window";
+static constexpr auto kLegacyLayoutTimelineSplitter = "timeline_splitter";
+
+Dock::DropzonePlaceholder::DropzonePlaceholder(Widget* dragWidget, const gfx::Point& mousePosition)
+  : Widget(kGenericWidget)
+{
+  setExpansive(true);
+  setSizeHint(dragWidget->sizeHint());
+  setMinSize(dragWidget->size());
+
+  m_mouseOffset = mousePosition - dragWidget->bounds().origin();
+
+  const os::SurfaceRef surface = os::System::instance()->makeRgbaSurface(dragWidget->size().w,
+                                                                         dragWidget->size().h);
+  {
+    const os::SurfaceLock lock(surface.get());
+    Paint paint;
+    paint.color(gfx::rgba(0, 0, 0, 0));
+    paint.style(os::Paint::Fill);
+    surface->drawRect(gfx::Rect(0, 0, surface->width(), surface->height()), paint);
+  }
+
+  {
+    Graphics g(display(), surface, 0, 0);
+    g.setFont(font());
+
+    Paint paint;
+    paint.color(gfx::rgba(0, 0, 0, 200));
+
+    // TODO: This will render any open things, especially the preview editor, need to close or hide
+    // that for a frame or paint the widget itself to a surface instead of croppping the backLayer.
+    auto backLayerSurface = display()->backLayer()->surface();
+    g.drawSurface(backLayerSurface.get(),
+                  dragWidget->bounds(),
+                  gfx::Rect(0, 0, surface->width(), surface->height()),
+                  os::Sampling(),
+                  &paint);
+  }
+
+  m_floatingUILayer = UILayer::Make();
+  m_floatingUILayer->setSurface(surface);
+  m_floatingUILayer->setPosition(dragWidget->bounds().origin());
+  display()->addLayer(m_floatingUILayer);
+}
+
+Dock::DropzonePlaceholder::~DropzonePlaceholder()
+{
+  display()->removeLayer(m_floatingUILayer);
+}
+
+void Dock::DropzonePlaceholder::setGhostPosition(const gfx::Point& position) const
+{
+  ASSERT(m_floatingUILayer);
+
+  display()->dirtyRect(m_floatingUILayer->bounds());
+  m_floatingUILayer->setPosition(position - m_mouseOffset);
+  display()->dirtyRect(m_floatingUILayer->bounds());
+}
+
+void Dock::DropzonePlaceholder::onPaint(PaintEvent& ev)
+{
+  Graphics* g = ev.graphics();
+  gfx::Rect bounds = clientBounds();
+
+  g->fillRect(bgColor(), bounds);
+
+  bounds.shrink(2 * guiscale());
+
+  const auto* theme = SkinTheme::get(this);
+  const gfx::Color color = theme->colors.workspaceText();
+
+  g->drawRect(color, bounds);
+  g->drawLine(color, bounds.center(), bounds.origin());
+  g->drawLine(color, bounds.center(), bounds.point2());
+  g->drawLine(color, bounds.center(), bounds.point2() - gfx::Point(bounds.w, 0));
+  g->drawLine(color, bounds.center(), bounds.origin() + gfx::Point(bounds.w, 0));
+  g->drawRect(
+    color,
+    gfx::Rect(bounds.center() - gfx::Point(2, 2) * guiscale(), gfx::Size(4, 4) * guiscale()));
+}
+
+Dock::Dock()
+{
+  for (int i = 0; i < kSides; ++i) {
+    m_sides[i] = nullptr;
+    m_aligns[i] = 0;
+    m_sizes[i] = gfx::Size(0, 0);
+  }
+
+  initTheme();
+}
+
+void Dock::setCustomizing(bool enable, bool doLayout)
+{
+  m_customizing = enable;
+
+  for (int i = 0; i < kSides; ++i) {
+    auto* child = m_sides[i];
+    if (!child)
+      continue;
+
+    if (auto* subdock = dynamic_cast<Dock*>(child))
+      subdock->setCustomizing(enable, false);
+  }
+
+  if (doLayout)
+    layout();
+}
+
+void Dock::resetDocks()
+{
+  for (int i = 0; i < kSides; ++i) {
+    auto* child = m_sides[i];
+    if (!child)
+      continue;
+
+    if (auto* subdock = dynamic_cast<Dock*>(child)) {
+      subdock->resetDocks();
+      if (subdock->m_autoDelete)
+        delete subdock;
+    }
+
+    m_sides[i] = nullptr;
+  }
+  removeAllChildren();
+}
+
+void Dock::dock(int side, ui::Widget* widget, const gfx::Size& prefSize)
+{
+  ASSERT(widget);
+
+  const int i = side_index(side);
+  if (!m_sides[i]) {
+    setSide(i, widget);
+    addChild(widget);
+
+    if (prefSize != gfx::Size(0, 0))
+      m_sizes[i] = prefSize;
+  }
+  else if (auto subdock = dynamic_cast<Dock*>(m_sides[i])) {
+    subdock->dock(CENTER, widget, prefSize);
+  }
+  else {
+    ASSERT(false); // Docking failure!
+  }
+}
+
+void Dock::dockRelativeTo(ui::Widget* relative,
+                          int side,
+                          ui::Widget* widget,
+                          const gfx::Size& prefSize)
+{
+  ASSERT(relative);
+
+  Widget* parent = relative->parent();
+  ASSERT(parent);
+
+  auto* subdock = new Dock;
+  subdock->m_autoDelete = true;
+  subdock->m_customizing = m_customizing;
+  parent->replaceChild(relative, subdock);
+  subdock->dock(CENTER, relative);
+  subdock->dock(side, widget, prefSize);
+
+  // Fix the m_sides item if the parent is a Dock
+  if (auto* relativeDock = dynamic_cast<Dock*>(parent)) {
+    for (int i = 0; i < kSides; ++i) {
+      if (relativeDock->m_sides[i] == relative) {
+        relativeDock->setSide(i, subdock);
+        break;
+      }
+    }
+  }
+}
+
+void Dock::undock(Widget* widget)
+{
+  Widget* parent = widget->parent();
+  if (!parent)
+    return; // Already undocked
+
+  if (auto* parentDock = dynamic_cast<Dock*>(parent)) {
+    parentDock->removeChild(widget);
+
+    for (int i = 0; i < kSides; ++i) {
+      if (parentDock->m_sides[i] == widget) {
+        parentDock->setSide(i, nullptr);
+        m_sizes[i] = gfx::Size();
+        break;
+      }
+    }
+
+    if (parentDock != this && parentDock->children().empty()) {
+      undock(parentDock);
+    }
+  }
+  else {
+    parent->removeChild(widget);
+  }
+}
+
+int Dock::whichSideChildIsDocked(const ui::Widget* widget) const
+{
+  for (int i = 0; i < kSides; ++i)
+    if (m_sides[i] == widget)
+      return side_from_index(i);
+  return 0;
+}
+
+const gfx::Size Dock::getUserDefinedSizeAtSide(int side) const
+{
+  int i = side_index(side);
+  // Only EXPANSIVE sides can be user-defined (has a splitter so the
+  // user can expand or shrink it)
+  if (m_aligns[i] & EXPANSIVE)
+    return m_sizes[i];
+
+  return gfx::Size();
+}
+
+Dock* Dock::subdock(int side)
+{
+  int i = side_index(side);
+  if (auto* subdock = dynamic_cast<Dock*>(m_sides[i]))
+    return subdock;
+
+  auto* oldWidget = m_sides[i];
+  auto* newSubdock = new Dock;
+  newSubdock->m_autoDelete = true;
+  newSubdock->m_customizing = m_customizing;
+  setSide(i, newSubdock);
+
+  if (oldWidget) {
+    replaceChild(oldWidget, newSubdock);
+    newSubdock->dock(CENTER, oldWidget);
+  }
+  else
+    addChild(newSubdock);
+
+  return newSubdock;
+}
+
+void Dock::onSizeHint(ui::SizeHintEvent& ev)
+{
+  gfx::Size fitIn = ev.fitInSize();
+  gfx::Size sz;
+
+  for (int i = 0; i < kSides; ++i) {
+    auto* widget = m_sides[i];
+    if (!widget || !widget->isVisible() || widget->isDecorative())
+      continue;
+
+    const int spacing = (m_aligns[i] & EXPANSIVE ? childSpacing() : 0);
+    const auto hint = (m_aligns[i] & EXPANSIVE ? m_sizes[i] : widget->sizeHint(fitIn));
+
+    switch (i) {
+      case kTopIndex:
+      case kBottomIndex:
+        sz.h += hint.h;
+        fitIn.h = std::max(0, fitIn.h - hint.h);
+        if (spacing > 0) {
+          sz.h += spacing;
+          fitIn.h = std::max(0, fitIn.h - spacing);
+        }
+        break;
+      case kLeftIndex:
+      case kRightIndex:
+        sz.w += hint.w;
+        fitIn.w = std::max(0, fitIn.w - hint.w);
+        if (spacing > 0) {
+          sz.w += spacing;
+          fitIn.w = std::max(0, fitIn.w - spacing);
+        }
+        break;
+      case kCenterIndex:
+        sz += gfx::Size(std::max(hint.w, std::max(m_sizes[kTopIndex].w, m_sizes[kBottomIndex].w)),
+                        std::max(hint.h, std::max(m_sizes[kLeftIndex].h, m_sizes[kRightIndex].h)));
+        break;
+    }
+  }
+
+  sz += border();
+  ev.setSizeHint(sz);
+}
+
+void Dock::onResize(ui::ResizeEvent& ev)
+{
+  gfx::Rect bounds = ev.bounds();
+  setBoundsQuietly(bounds);
+  bounds = childrenBounds();
+
+  updateDockVisibility();
+
+  forEachSide(bounds,
+              [this](ui::Widget* widget,
+                     const gfx::Rect& widgetBounds,
+                     const gfx::Rect& separator,
+                     const int index) {
+                gfx::Rect rc = widgetBounds;
+                auto th = textHeight();
+                if (isCustomizing()) {
+                  int handleSide = 0;
+                  if (auto* dockable = dynamic_cast<Dockable*>(widget))
+                    handleSide = dockable->dockHandleSide();
+                  switch (handleSide) {
+                    case ui::TOP:
+                      rc.y += th;
+                      rc.h -= th;
+                      break;
+                    case ui::LEFT:
+                      rc.x += th;
+                      rc.w -= th;
+                      break;
+                  }
+                }
+                widget->setBounds(rc);
+              });
+}
+
+void Dock::onPaint(ui::PaintEvent& ev)
+{
+  Graphics* g = ev.graphics();
+
+  const gfx::Rect& bounds = clientBounds();
+  g->fillRect(bgColor(), bounds);
+
+  if (isCustomizing()) {
+    forEachSide(bounds,
+                [this, g](ui::Widget* widget,
+                          const gfx::Rect& widgetBounds,
+                          const gfx::Rect& separator,
+                          const int index) {
+                  gfx::Rect rc = widgetBounds;
+                  auto th = textHeight();
+                  if (isCustomizing()) {
+                    auto* theme = SkinTheme::get(this);
+                    const gfx::Color color = theme->colors.workspaceText();
+                    int handleSide = 0;
+                    if (auto* dockable = dynamic_cast<Dockable*>(widget))
+                      handleSide = dockable->dockHandleSide();
+                    switch (handleSide) {
+                      case ui::TOP:
+                        rc.h = th;
+                        for (int y = rc.y; y + 1 < rc.y2(); y += 2)
+                          g->drawHLine(color,
+                                       rc.x + widget->border().left(),
+                                       y,
+                                       rc.w - widget->border().width());
+                        break;
+                      case ui::LEFT:
+                        rc.w = th;
+                        for (int x = rc.x; x + 1 < rc.x2(); x += 2)
+                          g->drawVLine(color,
+                                       x,
+                                       rc.y + widget->border().top(),
+                                       rc.h - widget->border().height());
+                        break;
+                    }
+                  }
+                });
+  }
+}
+
+void Dock::onInitTheme(ui::InitThemeEvent& ev)
+{
+  Widget::onInitTheme(ev);
+  setBorder(gfx::Border(0));
+  setChildSpacing(4 * ui::guiscale());
+
+  for (int i = 0; i < kSides; ++i) {
+    Widget* widget = m_sides[i];
+    if (widget)
+      widget->initTheme();
+  }
+}
+
+bool Dock::onProcessMessage(ui::Message* msg)
+{
+  switch (msg->type()) {
+    case kMouseDownMessage: {
+      auto* mouseMessage = static_cast<MouseMessage*>(msg);
+      const gfx::Point& pos = mouseMessage->position();
+
+      if (m_hit.sideIndex >= 0 || m_hit.dockable) {
+        m_startPos = pos;
+
+        if (m_hit.sideIndex >= 0)
+          m_startSize = m_sizes[m_hit.sideIndex];
+
+        captureMouse();
+
+        if (m_hit.dockable && !mouseMessage->right()) {
+          m_dragging = true;
+        }
+
+        return true;
+      }
+      break;
+    }
+
+    case kMouseMoveMessage: {
+      if (hasCapture()) {
+        const gfx::Point& pos = static_cast<MouseMessage*>(msg)->position();
+
+        if (m_dropzonePlaceholder)
+          m_dropzonePlaceholder->setGhostPosition(pos);
+
+        if (m_hit.sideIndex >= 0) {
+          if (!display()->bounds().contains(pos) ||
+              (m_hit.widget && m_hit.widget->parent() &&
+               !m_hit.widget->parent()->bounds().contains(pos)))
+            break; // Do not handle anything outside bounds.
+
+          gfx::Size& sz = m_sizes[m_hit.sideIndex];
+          gfx::Size minSize(16 * guiscale(), 16 * guiscale());
+
+          if (m_hit.widget) {
+            minSize.w = std::max(m_hit.widget->minSize().w, minSize.w);
+            minSize.h = std::max(m_hit.widget->minSize().h, minSize.h);
+          }
+
+          switch (m_hit.sideIndex) {
+            case kTopIndex: sz.h = std::max(m_startSize.h + pos.y - m_startPos.y, minSize.h); break;
+            case kBottomIndex:
+              sz.h = std::max(m_startSize.h - pos.y + m_startPos.y, minSize.h);
+              break;
+            case kLeftIndex:
+              sz.w = std::max(m_startSize.w + pos.x - m_startPos.x, minSize.w);
+              break;
+            case kRightIndex:
+              sz.w = std::max(m_startSize.w - pos.x + m_startPos.x, minSize.w);
+              break;
+          }
+
+          layout();
+          Resize();
+        }
+        else if (m_hit.dockable && m_dragging) {
+          invalidate();
+
+          auto* parentDock = dynamic_cast<Dock*>(m_hit.widget->parent());
+          ASSERT(parentDock);
+
+          if (!parentDock)
+            break;
+
+          if (!m_dropzonePlaceholder)
+            m_dropzonePlaceholder.reset(new DropzonePlaceholder(m_hit.widget, pos));
+
+          auto dockedAt = parentDock->whichSideChildIsDocked(m_hit.widget);
+          const auto& bounds = parentDock->bounds();
+
+          if (!bounds.contains(pos))
+            break; // Do not handle anything outside the bounds of the dock.
+
+          const int kBufferZone =
+            std::max(12 * guiscale(), std::min(m_hit.widget->size().w, m_hit.widget->size().h));
+
+          int newTargetSide = -1;
+          if (m_hit.dockable->dockableAt() & LEFT && !(dockedAt & LEFT) &&
+              pos.x < bounds.x + kBufferZone) {
+            newTargetSide = LEFT;
+          }
+          else if (m_hit.dockable->dockableAt() & RIGHT && !(dockedAt & RIGHT) &&
+                   pos.x > (bounds.w - kBufferZone)) {
+            newTargetSide = RIGHT;
+          }
+          else if (m_hit.dockable->dockableAt() & TOP && !(dockedAt & TOP) &&
+                   pos.y < bounds.y + kBufferZone) {
+            newTargetSide = TOP;
+          }
+          else if (m_hit.dockable->dockableAt() & BOTTOM && !(dockedAt & BOTTOM) &&
+                   pos.y > (bounds.h - kBufferZone)) {
+            newTargetSide = BOTTOM;
+          }
+
+          if (m_hit.targetSide == newTargetSide)
+            break;
+
+          m_hit.targetSide = newTargetSide;
+
+          // Always undock the placeholder
+          if (m_dropzonePlaceholder && m_dropzonePlaceholder->parent()) {
+            auto* placeholderCurrentDock = dynamic_cast<Dock*>(m_dropzonePlaceholder->parent());
+            placeholderCurrentDock->undock(m_dropzonePlaceholder.get());
+          }
+
+          if (m_dropzonePlaceholder && m_hit.targetSide != -1) {
+            parentDock->dock(m_hit.targetSide,
+                             m_dropzonePlaceholder.get(),
+                             m_hit.widget->sizeHint());
+          }
+
+          layout();
+        }
+      }
+      break;
+    }
+
+    case kMouseUpMessage: {
+      if (hasCapture()) {
+        releaseMouse();
+
+        if (m_dropzonePlaceholder && m_dropzonePlaceholder->parent()) {
+          // Always undock the dropzone placeholder to avoid dangling sizes.
+          auto* placeholderCurrentDock = dynamic_cast<Dock*>(m_dropzonePlaceholder->parent());
+          placeholderCurrentDock->undock(m_dropzonePlaceholder.get());
+        }
+
+        if (m_hit.dockable) {
+          auto* dockableWidget = dynamic_cast<Widget*>(m_hit.dockable);
+          auto* widgetDock = dynamic_cast<Dock*>(dockableWidget->parent());
+
+          int currentSide = widgetDock->whichSideChildIsDocked(dockableWidget);
+
+          assert(dockableWidget && widgetDock);
+
+          const auto* mouseMessage = static_cast<MouseMessage*>(msg);
+          if (mouseMessage->right() && !m_dragging) {
+            Menu menu;
+            MenuItem left(Strings::dock_left());
+            MenuItem right(Strings::dock_right());
+            MenuItem top(Strings::dock_top());
+            MenuItem bottom(Strings::dock_bottom());
+
+            if (m_hit.dockable->dockableAt() & ui::LEFT) {
+              menu.addChild(&left);
+            }
+            if (m_hit.dockable->dockableAt() & ui::RIGHT) {
+              menu.addChild(&right);
+            }
+            if (m_hit.dockable->dockableAt() & ui::TOP) {
+              menu.addChild(&top);
+            }
+            if (m_hit.dockable->dockableAt() & ui::BOTTOM) {
+              menu.addChild(&bottom);
+            }
+
+            switch (currentSide) {
+              case ui::LEFT:   left.setEnabled(false); break;
+              case ui::RIGHT:  right.setEnabled(false); break;
+              case ui::TOP:    top.setEnabled(false); break;
+              case ui::BOTTOM: bottom.setEnabled(false); break;
+            }
+
+            left.Click.connect([&] { redockWidget(widgetDock, dockableWidget, ui::LEFT); });
+            right.Click.connect([&] { redockWidget(widgetDock, dockableWidget, ui::RIGHT); });
+            top.Click.connect([&] { redockWidget(widgetDock, dockableWidget, ui::TOP); });
+            bottom.Click.connect([&] { redockWidget(widgetDock, dockableWidget, ui::BOTTOM); });
+
+            menu.showPopup(mouseMessage->position(), display());
+            return false;
+          }
+          else if (m_hit.targetSide > 0 && m_dragging) {
+            ASSERT(m_hit.dockable->dockableAt() & m_hit.targetSide);
+            redockWidget(widgetDock, dockableWidget, m_hit.targetSide);
+            m_dropzonePlaceholder = nullptr;
+            m_dragging = false;
+            m_hit = Hit();
+            return false;
+          }
+        }
+
+        m_dropzonePlaceholder = nullptr;
+        m_dragging = false;
+
+        // Call UserResizedDock signal after resizing a Dock splitter
+        if (m_hit.sideIndex >= 0)
+          onUserResizedDock();
+
+        m_hit = Hit();
+      }
+      break;
+    }
+
+    case kSetCursorMessage: {
+      const gfx::Point& pos = static_cast<MouseMessage*>(msg)->position();
+      ui::CursorType cursor = ui::kArrowCursor;
+
+      if (!hasCapture())
+        m_hit = calcHit(pos);
+
+      if (m_hit.sideIndex >= 0) {
+        switch (m_hit.sideIndex) {
+          case kTopIndex:
+          case kBottomIndex: cursor = ui::kSizeNSCursor; break;
+          case kLeftIndex:
+          case kRightIndex:  cursor = ui::kSizeWECursor; break;
+        }
+      }
+      else if (m_hit.dockable && m_hit.targetSide == -1) {
+        cursor = ui::kMoveCursor;
+      }
+
+      ui::set_mouse_cursor(cursor);
+      return true;
+    }
+  }
+  return Widget::onProcessMessage(msg);
+}
+
+void Dock::onUserResizedDock()
+{
+  // Generate the UserResizedDock signal, this can be used to know
+  // when the user modified the dock configuration to save the new
+  // layout in a user/preference file.
+  UserResizedDock();
+
+  // Send the same notification for the parent (as probably eh
+  // MainWindow is listening the signal of just the root dock).
+  if (auto* parentDock = dynamic_cast<Dock*>(parent())) {
+    parentDock->onUserResizedDock();
+  }
+}
+
+void Dock::setSide(const int i, Widget* newWidget)
+{
+  m_sides[i] = newWidget;
+  m_aligns[i] = calcAlign(i);
+
+  if (newWidget) {
+    m_sizes[i] = newWidget->sizeHint();
+  }
+}
+
+int Dock::calcAlign(const int i)
+{
+  Widget* widget = m_sides[i];
+  int align = 0;
+  if (!widget) {
+    // Do nothing
+  }
+  else if (auto* subdock = dynamic_cast<Dock*>(widget)) {
+    align = subdock->calcAlign(i);
+  }
+  else if (auto* dockable2 = dynamic_cast<Dockable*>(widget)) {
+    align = dockable2->dockableAt();
+  }
+  return align;
+}
+
+void Dock::updateDockVisibility()
+{
+  bool visible = false;
+  setVisible(true);
+  for (int i = 0; i < kSides; ++i) {
+    Widget* widget = m_sides[i];
+    if (!widget)
+      continue;
+
+    if (auto* subdock = dynamic_cast<Dock*>(widget)) {
+      subdock->updateDockVisibility();
+    }
+
+    if (widget->isVisible()) {
+      visible = true;
+    }
+  }
+
+  setVisible(visible);
+}
+
+void Dock::forEachSide(gfx::Rect bounds,
+                       std::function<void(ui::Widget* widget,
+                                          const gfx::Rect& widgetBounds,
+                                          const gfx::Rect& separator,
+                                          const int index)> f)
+{
+  for (int i = 0; i < kSides; ++i) {
+    auto* widget = m_sides[i];
+    if (!widget || !widget->isVisible() || widget->isDecorative()) {
+      continue;
+    }
+
+    const int spacing = (m_aligns[i] & EXPANSIVE ? childSpacing() : 0);
+    const gfx::Size sz = (m_aligns[i] & EXPANSIVE ? m_sizes[i] : widget->sizeHint(bounds.size()));
+
+    gfx::Rect rc, separator;
+    switch (i) {
+      case kTopIndex:
+        rc = gfx::Rect(bounds.x, bounds.y, bounds.w, sz.h);
+        bounds.y += rc.h;
+        bounds.h -= rc.h;
+
+        if (spacing > 0) {
+          separator = gfx::Rect(bounds.x, bounds.y, bounds.w, spacing);
+          bounds.y += spacing;
+          bounds.h -= spacing;
+        }
+        break;
+      case kBottomIndex:
+        rc = gfx::Rect(bounds.x, bounds.y2() - sz.h, bounds.w, sz.h);
+        bounds.h -= rc.h;
+
+        if (spacing > 0) {
+          separator = gfx::Rect(bounds.x, bounds.y2() - spacing, bounds.w, spacing);
+          bounds.h -= spacing;
+        }
+        break;
+      case kLeftIndex:
+        rc = gfx::Rect(bounds.x, bounds.y, sz.w, bounds.h);
+        bounds.x += rc.w;
+        bounds.w -= rc.w;
+
+        if (spacing > 0) {
+          separator = gfx::Rect(bounds.x, bounds.y, spacing, bounds.h);
+          bounds.x += spacing;
+          bounds.w -= spacing;
+        }
+        break;
+      case kRightIndex:
+        rc = gfx::Rect(bounds.x2() - sz.w, bounds.y, sz.w, bounds.h);
+        bounds.w -= rc.w;
+
+        if (spacing > 0) {
+          separator = gfx::Rect(bounds.x2() - spacing, bounds.y, spacing, bounds.h);
+          bounds.w -= spacing;
+        }
+        break;
+      case kCenterIndex: rc = bounds; break;
+    }
+
+    f(widget, rc, separator, i);
+  }
+}
+
+void Dock::redockWidget(app::Dock* widgetDock, ui::Widget* dockableWidget, const int side)
+{
+  gfx::Size size;
+
+  if (dockableWidget->id() == "timeline") {
+    const gfx::Rect workspaceBounds = widgetDock->bounds();
+
+    size.w = 64;
+    size.h = 64;
+    const auto timelineSplitterPos =
+      get_config_double(kLegacyLayoutMainWindowSection, kLegacyLayoutTimelineSplitter, 75.0) /
+      100.0;
+
+    auto pos = gen::TimelinePosition::LEFT;
+    size.w = (workspaceBounds.w * (1.0 - timelineSplitterPos)) / guiscale();
+
+    if (side & RIGHT) {
+      pos = gen::TimelinePosition::RIGHT;
+    }
+    if (side & BOTTOM || side & TOP) {
+      pos = gen::TimelinePosition::BOTTOM;
+      size.h = (workspaceBounds.h * (1.0 - timelineSplitterPos)) / guiscale();
+    }
+    Preferences::instance().general.timelinePosition(pos);
+  }
+
+  widgetDock->undock(dockableWidget);
+  widgetDock->dock(side, dockableWidget, size);
+
+  App::instance()->mainWindow()->invalidate();
+  layout();
+  onUserResizedDock();
+}
+
+Dock::Hit Dock::calcHit(const gfx::Point& pos)
+{
+  Hit hit;
+  forEachSide(childrenBounds(),
+              [this, pos, &hit](ui::Widget* widget,
+                                const gfx::Rect& widgetBounds,
+                                const gfx::Rect& separator,
+                                const int index) {
+                if (separator.contains(pos)) {
+                  hit.widget = widget;
+                  hit.sideIndex = index;
+                }
+                else if (isCustomizing()) {
+                  auto th = textHeight();
+                  gfx::Rect rc = widgetBounds;
+                  if (auto* dockable = dynamic_cast<Dockable*>(widget)) {
+                    switch (dockable->dockHandleSide()) {
+                      case ui::TOP:
+                        rc.h = th;
+                        if (rc.contains(pos)) {
+                          hit.widget = widget;
+                          hit.dockable = dockable;
+                        }
+                        break;
+                      case ui::LEFT:
+                        rc.w = th;
+                        if (rc.contains(pos)) {
+                          hit.widget = widget;
+                          hit.dockable = dockable;
+                        }
+                        break;
+                    }
+                  }
+                }
+              });
+  return hit;
+}
+
+} // namespace app
diff --git a/src/app/ui/dock.h b/src/app/ui/dock.h
new file mode 100644
index 000000000..a52af9413
--- /dev/null
+++ b/src/app/ui/dock.h
@@ -0,0 +1,129 @@
+// Aseprite
+// Copyright (C) 2021-2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_DOCK_H_INCLUDED
+#define APP_UI_DOCK_H_INCLUDED
+#pragma once
+
+#include "app/ui/dockable.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
+#include "ui/widget.h"
+
+#include <array>
+#include <functional>
+#include <string>
+#include <vector>
+
+namespace app {
+
+class Dockable;
+
+class Dock : public ui::Widget {
+public:
+  static constexpr const int kSides = 5;
+
+  class DropzonePlaceholder final : public Widget,
+                                    public Dockable {
+  public:
+    DropzonePlaceholder(Widget* dragWidget, const gfx::Point& mousePosition);
+    ~DropzonePlaceholder() override;
+
+    void setGhostPosition(const gfx::Point& position) const;
+
+  private:
+    void onPaint(ui::PaintEvent& ev) override;
+    int dockHandleSide() const override { return 0; }
+
+    gfx::Point m_mouseOffset;
+    ui::UILayerRef m_floatingUILayer;
+  };
+
+  Dock();
+
+  bool isCustomizing() const { return m_customizing; }
+  void setCustomizing(bool enable, bool doLayout = true);
+
+  void resetDocks();
+
+  // side = ui::LEFT, or ui::RIGHT, etc.
+  void dock(int side, ui::Widget* widget, const gfx::Size& prefSize = gfx::Size());
+
+  void dockRelativeTo(ui::Widget* relative,
+                      int side,
+                      ui::Widget* widget,
+                      const gfx::Size& prefSize = gfx::Size());
+
+  void undock(ui::Widget* widget);
+
+  Dock* subdock(int side);
+
+  Dock* top() { return subdock(ui::TOP); }
+  Dock* bottom() { return subdock(ui::BOTTOM); }
+  Dock* left() { return subdock(ui::LEFT); }
+  Dock* right() { return subdock(ui::RIGHT); }
+  Dock* center() { return subdock(ui::CENTER); }
+
+  // Functions useful to query/save the dock layout.
+  int whichSideChildIsDocked(const ui::Widget* widget) const;
+  const gfx::Size getUserDefinedSizeAtSide(int side) const;
+
+  obs::signal<void()> Resize;
+  obs::signal<void()> UserResizedDock;
+
+protected:
+  void onSizeHint(ui::SizeHintEvent& ev) override;
+  void onResize(ui::ResizeEvent& ev) override;
+  void onPaint(ui::PaintEvent& ev) override;
+  void onInitTheme(ui::InitThemeEvent& ev) override;
+  bool onProcessMessage(ui::Message* msg) override;
+  void onUserResizedDock();
+
+private:
+  void setSide(int i, ui::Widget* newWidget);
+  int calcAlign(int i);
+  void updateDockVisibility();
+  void forEachSide(gfx::Rect bounds,
+                   std::function<void(ui::Widget* widget,
+                                      const gfx::Rect& widgetBounds,
+                                      const gfx::Rect& separator,
+                                      const int index)> f);
+
+  bool hasVisibleSide(const int i) const { return (m_sides[i] && m_sides[i]->isVisible()); }
+  void redockWidget(app::Dock* widgetDock, ui::Widget* dockableWidget, const int side);
+
+  struct Hit {
+    ui::Widget* widget = nullptr;
+    Dockable* dockable = nullptr;
+    int sideIndex = -1;
+    int targetSide = -1;
+  };
+
+  Hit calcHit(const gfx::Point& pos);
+
+  std::array<Widget*, kSides> m_sides;
+  std::array<int, kSides> m_aligns;
+  std::array<gfx::Size, kSides> m_sizes;
+  bool m_autoDelete = false;
+
+  // Use to drag-and-drop stuff (splitters and dockable widgets)
+  Hit m_hit;
+
+  // Used to resize sizes splitters.
+  gfx::Size m_startSize;
+  gfx::Point m_startPos;
+
+  // True when we paint/can drag-and-drop dockable widgets from handles.
+  bool m_customizing = false;
+
+  // True when we're dragging a widget to attempt to dock it somewhere else.
+  bool m_dragging = false;
+  std::unique_ptr<DropzonePlaceholder> m_dropzonePlaceholder;
+};
+
+} // namespace app
+
+#endif
diff --git a/src/app/ui/dockable.h b/src/app/ui/dockable.h
new file mode 100644
index 000000000..4cedd55e3
--- /dev/null
+++ b/src/app/ui/dockable.h
@@ -0,0 +1,37 @@
+// Aseprite
+// Copyright (C) 2021  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_DOCKABLE_H_INCLUDED
+#define APP_UI_DOCKABLE_H_INCLUDED
+#pragma once
+
+#include "ui/base.h"
+
+namespace app {
+
+class Dockable {
+public:
+  virtual ~Dockable() {}
+
+  // LEFT = can be docked at the left side
+  // TOP = can be docked at the top
+  // RIGHT = can be docked at the right side
+  // BOTTOM = can be docked at the bottom
+  // CENTER = can be docked at the center
+  // EXPANSIVE = can be resized (e.g. add a splitter when docked at sides)
+  virtual int dockableAt() const
+  {
+    return ui::LEFT | ui::TOP | ui::RIGHT | ui::BOTTOM | ui::CENTER | ui::EXPANSIVE;
+  }
+
+  // Returns the preferred side where the dock handle to move the
+  // widget should be.
+  virtual int dockHandleSide() const { return ui::TOP; }
+};
+
+} // namespace app
+
+#endif
diff --git a/src/app/ui/dynamics_popup.cpp b/src/app/ui/dynamics_popup.cpp
index 3edeb597b..c80c50692 100644
--- a/src/app/ui/dynamics_popup.cpp
+++ b/src/app/ui/dynamics_popup.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -131,11 +131,12 @@ private:
                       theme->parts.miniSliderFull().get());
     }
 
+    const int sensorH = guiscaled_div(rc.h, 4);
     g->fillRect(theme->colors.sliderEmptyText(),
-                gfx::Rect(rc.x, rc.y + rc.h / 2 - rc.h / 8, sensorW, rc.h / 4));
+                gfx::Rect(rc.x, guiscaled_center(rc.y, rc.h, sensorH), sensorW, sensorH));
 
-    g->drawRgbaSurface(thumb, minX - thumb->width() / 2, thumb_y);
-    g->drawRgbaSurface(thumb, maxX - thumb->width() / 2, thumb_y);
+    g->drawRgbaSurface(thumb, minX - guiscaled_div(thumb->width(), 2), thumb_y);
+    g->drawRgbaSurface(thumb, maxX - guiscaled_div(thumb->width(), 2), thumb_y);
   }
 
   bool onProcessMessage(Message* msg) override
diff --git a/src/app/ui/editor/brush_preview.cpp b/src/app/ui/editor/brush_preview.cpp
index 3f7be6ef7..509b86332 100644
--- a/src/app/ui/editor/brush_preview.cpp
+++ b/src/app/ui/editor/brush_preview.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -457,6 +457,8 @@ void BrushPreview::show(const gfx::Point& screenPos)
 
       // Here we re-use the cached surface
       if (!cached && m_uiLayer->surface()) {
+        m_uiLayer->surface()->clear();
+
         gfx::Rect layerBounds = m_uiLayer->surface()->bounds();
         ui::Graphics g(display, m_uiLayer->surface(), 0, 0);
 
diff --git a/src/app/ui/editor/delayed_mouse_move.cpp b/src/app/ui/editor/delayed_mouse_move.cpp
index 96b28f4c6..7d60ba18b 100644
--- a/src/app/ui/editor/delayed_mouse_move.cpp
+++ b/src/app/ui/editor/delayed_mouse_move.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2022-2024  Igara Studio S.A.
+// Copyright (C) 2022-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -25,10 +25,10 @@ DelayedMouseMove::DelayedMouseMove(DelayedMouseMoveDelegate* delegate,
   : m_delegate(delegate)
   , m_editor(editor)
   , m_timer(interval)
-  , m_spritePos(std::numeric_limits<float>::min(), std::numeric_limits<float>::min())
   , m_mouseMoveReceived(false)
   , m_mouseDownPos(kNoPosReceived)
   , m_mouseDownTime(base::current_tick())
+  , m_spritePos(std::numeric_limits<float>::min(), std::numeric_limits<float>::min())
 {
   ASSERT(m_delegate);
   m_timer.Tick.connect([this] { commitMouseMove(); });
diff --git a/src/app/ui/editor/drawing_state.cpp b/src/app/ui/editor/drawing_state.cpp
index 6a82c87bb..fb7e3c16c 100644
--- a/src/app/ui/editor/drawing_state.cpp
+++ b/src/app/ui/editor/drawing_state.cpp
@@ -219,6 +219,8 @@ bool DrawingState::onMouseUp(Editor* editor, MouseMessage* msg)
     if (m_toolLoopManager->releaseButton(m_lastPointer))
       return true;
   }
+  if (m_toolLoop->isSelectionToolLoop())
+    m_toolLoop->clearSelectionToolMask(true);
 
   destroyLoop(editor);
 
@@ -403,6 +405,9 @@ void DrawingState::destroyLoopIfCanceled(Editor* editor)
 {
   // Cancel drawing loop
   if (m_toolLoopManager->isCanceled()) {
+    if (m_toolLoop->isSelectionToolLoop())
+      m_toolLoop->clearSelectionToolMask(true);
+
     destroyLoop(editor);
 
     // Change to standby state
diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index 6ce1e6622..b5865a9e9 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -31,6 +31,7 @@
 #include "app/tools/active_tool.h"
 #include "app/tools/controller.h"
 #include "app/tools/ink.h"
+#include "app/tools/symmetry.h"
 #include "app/tools/tool.h"
 #include "app/tools/tool_box.h"
 #include "app/ui/color_bar.h"
@@ -58,6 +59,7 @@
 #include "base/chrono.h"
 #include "base/convert_to.h"
 #include "base/pi.h"
+#include "base/scoped_value.h"
 #include "doc/algo.h"
 #include "doc/doc.h"
 #include "doc/mask_boundaries.h"
@@ -135,6 +137,8 @@ private:
 
 // static
 Editor* Editor::m_activeEditor = nullptr;
+std::unique_ptr<Mask> Editor::m_selectionToolMask = nullptr;
+std::unique_ptr<MaskBoundaries> Editor::m_selectionToolMaskBoundaries = nullptr;
 
 // static
 std::unique_ptr<EditorRender> Editor::m_renderEngine = nullptr;
@@ -267,6 +271,23 @@ void Editor::setStateInternal(const EditorStatePtr& newState)
 {
   m_brushPreview.hide();
 
+  // Some onLeaveState impls (like the ones from MovingPixelsState,
+  // WritingTextState, MovingSelectionState) might generate a
+  // Tx/Transaction::commit(), which will add a new undo state,
+  // triggering a sprite change scripting event
+  // (SpriteEvents::onAddUndoState). This event could be handled by an
+  // extension and that extension might want to save the current
+  // sprite (e.g. calling Sprite_saveCopyAs, the kind of extension
+  // that takes snapshots after each sprite change). That will be a
+  // new Context::executeCommand() for the save command, generating a
+  // BeforeCommandExecution signal, getting back to onLeaveState
+  // again. In that case, we just ignore the reentry as the first
+  // onLeaveState should handle everything (to avoid an stack
+  // overflow/infinite recursion).
+  if (m_leavingState)
+    return;
+  base::ScopedValue leaving(m_leavingState, true);
+
   // Fire before change state event, set the state, and fire after
   // change state event.
   EditorState::LeaveAction leaveAction = m_state->onLeaveState(this, newState.get());
@@ -784,7 +805,7 @@ void Editor::drawOneSpriteUnclippedRect(ui::Graphics* g,
     }
   }
 
-  // Draw grids
+  // Draw  Slices and Grids
   {
     gfx::Rect enclosingRect(m_padding.x + dx,
                             m_padding.y + dy,
@@ -793,6 +814,11 @@ void Editor::drawOneSpriteUnclippedRect(ui::Graphics* g,
 
     IntersectClip clip(g, dest);
     if (clip) {
+      // Draw slices
+      if (m_docPref.show.slices() && dx == m_proj.applyX(mainTilePosition().x) &&
+          dy == m_proj.applyY(mainTilePosition().y))
+        drawSlices(g);
+
       // Draw the pixel grid
       if ((m_proj.zoom().scale() > 2.0) && m_docPref.show.pixelGrid()) {
         int alpha = m_docPref.pixelGrid.opacity();
@@ -833,6 +859,86 @@ void Editor::drawOneSpriteUnclippedRect(ui::Graphics* g,
         m_docPref.grid.forceSection();
       }
       m_docPref.show.grid.forceDirtyFlag();
+
+      // Symmetry mode
+      if (isActive() && (m_flags & Editor::kShowSymmetryLine) &&
+          Preferences::instance().symmetryMode.enabled()) {
+        const int symmetryButtons = int(m_docPref.symmetry.mode());
+        // Symmetry::resolveMode is to calculate the right symmetry
+        // mode. This is necessary because some symmetry settings
+        // do not make sense and should be forced to 'ALL'
+        const int mode = int(tools::Symmetry::resolveMode(m_docPref.symmetry.mode()));
+        const gfx::Color color = color_utils::color_for_ui(m_docPref.grid.color());
+        const gfx::Color semiTransparentColor =
+          gfx::rgba(rgba_getr(color), rgba_getg(color), rgba_getb(color), rgba_geta(color) / 4);
+        const double x = int(m_proj.applyX<double>(m_docPref.symmetry.xAxis()));
+        const double y = int(m_proj.applyY<double>(m_docPref.symmetry.yAxis()));
+
+        if (mode & int(app::gen::SymmetryMode::HORIZONTAL) && x > 0) {
+          g->drawVLine(symmetryButtons & int(app::gen::SymmetryMode::HORIZONTAL) ?
+                         color :
+                         semiTransparentColor,
+                       enclosingRect.x + x,
+                       enclosingRect.y,
+                       enclosingRect.h);
+        }
+        if (mode & int(app::gen::SymmetryMode::VERTICAL) && y > 0) {
+          g->drawHLine(
+            symmetryButtons & int(app::gen::SymmetryMode::VERTICAL) ? color : semiTransparentColor,
+            enclosingRect.x,
+            enclosingRect.y + y,
+            enclosingRect.w);
+        }
+        if (mode & int(app::gen::SymmetryMode::RIGHT_DIAG)) {
+          // Bottom point intersection:
+          gfx::Point bottomLeft(
+            enclosingRect.x + x + m_proj.turnYinTermsOfX<int>(y - enclosingRect.h),
+            enclosingRect.y2());
+          if (bottomLeft.x < enclosingRect.x) {
+            // Left intersection
+            bottomLeft.y = enclosingRect.y2() +
+                           m_proj.turnXinTermsOfY<int>(bottomLeft.x - enclosingRect.x);
+            bottomLeft.x = enclosingRect.x;
+          }
+          // Top intersection
+          gfx::Point topRight(enclosingRect.x + x + m_proj.turnYinTermsOfX<int>(y),
+                              enclosingRect.y);
+          if (enclosingRect.x2() < topRight.x) {
+            // Right intersection
+            topRight.y = enclosingRect.y +
+                         m_proj.applyY<int>(m_proj.removeX<int>(topRight.x - enclosingRect.x2()));
+            topRight.x = enclosingRect.x2();
+          }
+          g->drawLine(symmetryButtons & int(app::gen::SymmetryMode::RIGHT_DIAG) ?
+                        color :
+                        semiTransparentColor,
+                      bottomLeft,
+                      topRight);
+        }
+        if (mode & int(app::gen::SymmetryMode::LEFT_DIAG)) {
+          // Bottom point intersection:
+          gfx::Point bottomRight(
+            enclosingRect.x + x + m_proj.turnYinTermsOfX<int>(enclosingRect.h - y),
+            enclosingRect.y2());
+          if (enclosingRect.x2() < bottomRight.x) {
+            // Left intersection
+            bottomRight.y = enclosingRect.y2() +
+                            m_proj.turnXinTermsOfY<int>(enclosingRect.x2() - bottomRight.x);
+            bottomRight.x = enclosingRect.x2();
+          }
+          // Top intersection
+          gfx::Point topLeft(enclosingRect.x + x - m_proj.turnYinTermsOfX<int>(y), enclosingRect.y);
+          if (topLeft.x < enclosingRect.x) {
+            // Right intersection
+            topLeft.y = enclosingRect.y + m_proj.turnXinTermsOfY<int>(enclosingRect.x - topLeft.x);
+            topLeft.x = enclosingRect.x;
+          }
+          g->drawLine(
+            symmetryButtons & int(app::gen::SymmetryMode::LEFT_DIAG) ? color : semiTransparentColor,
+            topLeft,
+            bottomRight);
+        }
+      }
     }
   }
 }
@@ -878,6 +984,13 @@ void Editor::drawSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& _rc)
                        m_proj.applyY(m_sprite->height()));
   gfx::Rect enclosingRect = spriteRect;
 
+  // Redraw the background when the selection tool mask draws over it
+  static bool redrawBackground = false;
+  if (redrawBackground) {
+    drawBackground(g);
+    redrawBackground = false;
+  }
+
   // Draw the main sprite at the center.
   drawOneSpriteUnclippedRect(g, rc, 0, 0);
 
@@ -905,90 +1018,6 @@ void Editor::drawSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& _rc)
     enclosingRect = gfx::Rect(spriteRect.x, spriteRect.y, spriteRect.w * 3, spriteRect.h * 3);
   }
 
-  // Draw slices
-  if (m_docPref.show.slices())
-    drawSlices(g);
-
-  // Symmetry mode
-  if (isActive() && (m_flags & Editor::kShowSymmetryLine) &&
-      Preferences::instance().symmetryMode.enabled()) {
-    int mode = int(m_docPref.symmetry.mode());
-    if (mode & int(app::gen::SymmetryMode::HORIZONTAL)) {
-      double x = m_docPref.symmetry.xAxis();
-      if (x > 0) {
-        gfx::Color color = color_utils::color_for_ui(m_docPref.grid.color());
-        g->drawVLine(
-          color,
-          spriteRect.x + m_proj.applyX(mainTilePosition().x) + int(m_proj.applyX<double>(x)),
-          enclosingRect.y,
-          enclosingRect.h);
-      }
-    }
-    if (mode & int(app::gen::SymmetryMode::VERTICAL)) {
-      double y = m_docPref.symmetry.yAxis();
-      if (y > 0) {
-        gfx::Color color = color_utils::color_for_ui(m_docPref.grid.color());
-        g->drawHLine(
-          color,
-          enclosingRect.x,
-          spriteRect.y + m_proj.applyY(mainTilePosition().y) + int(m_proj.applyY<double>(y)),
-          enclosingRect.w);
-      }
-    }
-    if (mode & int(app::gen::SymmetryMode::RIGHT_DIAG)) {
-      double y = m_docPref.symmetry.yAxis();
-      double x = m_docPref.symmetry.xAxis();
-      gfx::Color color = color_utils::color_for_ui(m_docPref.grid.color());
-      // Bottom point intersection:
-      gfx::Point bottomLeft(
-        enclosingRect.x + m_proj.applyY(mainTilePosition().x) + int(m_proj.applyX<double>(x)) -
-          (enclosingRect.h - m_proj.applyY(mainTilePosition().y) - int(m_proj.applyY<double>(y))),
-        enclosingRect.y2());
-      if (bottomLeft.x < enclosingRect.x) {
-        // Left intersection
-        bottomLeft.y = enclosingRect.y2() - enclosingRect.x + bottomLeft.x;
-        bottomLeft.x = enclosingRect.x;
-      }
-      // Top intersection
-      gfx::Point topRight(enclosingRect.x + m_proj.applyY(mainTilePosition().x) +
-                            int(m_proj.applyX<double>(x)) + m_proj.applyY(mainTilePosition().y) +
-                            int(m_proj.applyY<double>(y)),
-                          enclosingRect.y);
-      if (enclosingRect.x2() < topRight.x) {
-        // Right intersection
-        topRight.y = enclosingRect.y + topRight.x - enclosingRect.x2();
-        topRight.x = enclosingRect.x2();
-      }
-      g->drawLine(color, bottomLeft, topRight);
-    }
-    if (mode & int(app::gen::SymmetryMode::LEFT_DIAG)) {
-      double y = m_docPref.symmetry.yAxis();
-      double x = m_docPref.symmetry.xAxis();
-      gfx::Color color = color_utils::color_for_ui(m_docPref.grid.color());
-      // Bottom point intersection:
-      gfx::Point bottomRight(
-        enclosingRect.x + m_proj.applyY(mainTilePosition().x) + int(m_proj.applyX<double>(x)) +
-          (enclosingRect.h - m_proj.applyY(mainTilePosition().y) - int(m_proj.applyX<double>(y))),
-        enclosingRect.y2());
-      if (enclosingRect.x2() < bottomRight.x) {
-        // Left intersection
-        bottomRight.y = enclosingRect.y2() - bottomRight.x + enclosingRect.x2();
-        bottomRight.x = enclosingRect.x2();
-      }
-      // Top intersection
-      gfx::Point topLeft(enclosingRect.x + m_proj.applyY(mainTilePosition().x) +
-                           int(m_proj.applyX<double>(x)) - m_proj.applyY(mainTilePosition().y) -
-                           int(m_proj.applyY<double>(y)),
-                         enclosingRect.y);
-      if (topLeft.x < enclosingRect.x) {
-        // Right intersection
-        topLeft.y = enclosingRect.y + enclosingRect.x - topLeft.x;
-        topLeft.x = enclosingRect.x;
-      }
-      g->drawLine(color, topLeft, bottomRight);
-    }
-  }
-
   // Draw active layer/cel edges
   if ((m_docPref.show.layerEdges() || m_showAutoCelGuides) &&
       // Show layer edges and possibly cel guides only on states that
@@ -1012,10 +1041,21 @@ void Editor::drawSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& _rc)
     }
   }
 
-  // Draw the mask
+  // Draw the current selection mask
   if (m_document->hasMaskBoundaries())
     drawMask(g);
 
+  // If we are in a selection tool and the user has the new selection
+  // feedback...
+  if (hasSelectionToolMask()) {
+    m_selectionToolMaskBoundaries->regen(m_selectionToolMask.get());
+    drawMaskBoundaries(g, *m_selectionToolMaskBoundaries, 0);
+
+    const gfx::Point prevPoint(m_selectionToolMask->bounds().point2());
+    if (prevPoint.x >= m_sprite->width() || prevPoint.y >= m_sprite->height())
+      redrawBackground = true;
+  }
+
   // Post-render decorator.
   if ((m_flags & kShowDecorators) && m_decorator) {
     EditorPostRenderImpl postRender(this, g);
@@ -1042,13 +1082,7 @@ void Editor::drawSpriteClipped(const gfx::Region& updateRegion)
   }
 }
 
-/**
- * Draws the boundaries, really this routine doesn't use the "mask"
- * field of the sprite, only the "bound" field (so you can have other
- * mask in the sprite and could be showed other boundaries), to
- * regenerate boundaries, use the sprite_generate_mask_boundaries()
- * routine.
- */
+// Draws the current sprite mask boundaries (the active selection).
 void Editor::drawMask(Graphics* g)
 {
   if ((m_flags & kShowMask) == 0 || !m_docPref.show.selectionEdges())
@@ -1056,18 +1090,22 @@ void Editor::drawMask(Graphics* g)
 
   ASSERT(m_document->hasMaskBoundaries());
 
+  drawMaskBoundaries(g, m_document->maskBoundaries(), m_antsOffset);
+}
+
+void Editor::drawMaskBoundaries(ui::Graphics* g, doc::MaskBoundaries& segs, const int antsOffset)
+{
   gfx::Point pt = mainTilePosition();
   pt.x = m_padding.x + m_proj.applyX(pt.x);
   pt.y = m_padding.y + m_proj.applyY(pt.y);
 
   // Create the mask boundaries path
-  auto& segs = m_document->maskBoundaries();
   segs.createPathIfNeeeded();
 
   ui::Paint paint;
   paint.style(ui::Paint::Stroke);
   set_checkered_paint_mode(paint,
-                           m_antsOffset,
+                           antsOffset,
                            gfx::rgba(0, 0, 0, 255),
                            gfx::rgba(255, 255, 255, 255));
 
@@ -1081,10 +1119,11 @@ void Editor::drawMask(Graphics* g)
 
 void Editor::drawMaskSafe()
 {
-  if ((m_flags & kShowMask) == 0)
+  if (((m_flags & kShowMask) == 0 && !hasSelectionToolMask()) || !(isVisible() && m_document))
     return;
 
-  if (isVisible() && m_document && m_document->hasMaskBoundaries()) {
+  const bool haveSegs = m_document->hasMaskBoundaries();
+  if (haveSegs || hasSelectionToolMask()) {
     Region region;
     getDrawableRegion(region, kCutTopWindows);
     region.offset(-bounds().origin());
@@ -1092,10 +1131,21 @@ void Editor::drawMaskSafe()
     HideBrushPreview hide(m_brushPreview);
     GraphicsPtr g = getGraphics(clientBounds());
 
-    for (const gfx::Rect& rc : region) {
-      IntersectClip clip(g.get(), rc);
-      if (clip)
-        drawMask(g.get());
+    if (haveSegs) {
+      for (const gfx::Rect& rc : region) {
+        IntersectClip clip(g.get(), rc);
+        if (clip)
+          drawMask(g.get());
+      }
+    }
+
+    if (hasSelectionToolMask()) {
+      m_selectionToolMaskBoundaries->regen(m_selectionToolMask.get());
+      for (const gfx::Rect& rc : region) {
+        IntersectClip clip(g.get(), rc);
+        if (clip)
+          drawMaskBoundaries(g.get(), *m_selectionToolMaskBoundaries, 0);
+      }
     }
   }
 }
@@ -1380,9 +1430,9 @@ void Editor::drawTileNumbers(ui::Graphics* g, const Cel* cel)
   const text::FontRef& font = g->font();
   const doc::Grid grid = getSite().grid();
   const gfx::Size tileSize = editorToScreen(grid.tileToCanvas(gfx::Rect(0, 0, 1, 1))).size();
-  const int th = font->height();
+  const int th = font->lineHeight();
   if (tileSize.h > th) {
-    const gfx::Point offset = gfx::Point(tileSize.w / 2, tileSize.h / 2 - font->height() / 2) +
+    const gfx::Point offset = gfx::Point(tileSize.w / 2, tileSize.h / 2 - font->size() / 2) +
                               mainTilePosition();
 
     int ti_offset = static_cast<LayerTilemap*>(cel->layer())->tileset()->baseIndex() - 1;
@@ -2134,6 +2184,23 @@ void Editor::showUnhandledException(const std::exception& ex, const ui::Message*
                  (state ? typeid(*state).name() : "None"));
 }
 
+void Editor::makeSelectionToolMask()
+{
+  m_selectionToolMask = std::make_unique<Mask>();
+  m_selectionToolMaskBoundaries = std::make_unique<MaskBoundaries>();
+}
+
+void Editor::deleteSelectionToolMask()
+{
+  m_selectionToolMask.reset();
+  m_selectionToolMaskBoundaries.reset();
+}
+
+bool Editor::hasSelectionToolMask()
+{
+  return m_selectionToolMask && !m_selectionToolMask->isEmpty();
+}
+
 //////////////////////////////////////////////////////////////////////
 // Message handler for the editor
 
@@ -2592,6 +2659,12 @@ void Editor::onTiledModeChange()
   spritePos += mainTilePosition();
   screenPos = editorToScreen(spritePos);
 
+  auto lastPoint = document()->lastDrawingPoint();
+  if (lastPoint != Doc::NoLastDrawingPoint()) {
+    lastPoint += mainTilePosition() - m_oldMainTilePos;
+    document()->setLastDrawingPoint(lastPoint);
+  }
+
   centerInSpritePoint(spritePos);
 }
 
@@ -2673,8 +2746,6 @@ void Editor::onBeforeLayerEditableChange(DocEvent& ev, bool newState)
 
 void Editor::setCursor(const gfx::Point& mouseDisplayPos)
 {
-  Rect vp = View::getView(this)->viewportBounds();
-
   bool used = false;
   if (m_sprite)
     used = m_state->onSetCursor(this, mouseDisplayPos);
diff --git a/src/app/ui/editor/editor.h b/src/app/ui/editor/editor.h
index 90d70c611..ef39621a5 100644
--- a/src/app/ui/editor/editor.h
+++ b/src/app/ui/editor/editor.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -44,6 +44,7 @@
 
 namespace doc {
 class Layer;
+class MaskBoundaries;
 class Sprite;
 } // namespace doc
 namespace gfx {
@@ -317,6 +318,11 @@ public:
   // an Editor or EditorState event.
   void showUnhandledException(const std::exception& ex, const ui::Message* msg);
 
+  Mask* getSelectionToolMask() { return m_selectionToolMask.get(); }
+  void makeSelectionToolMask();
+  void deleteSelectionToolMask();
+  bool hasSelectionToolMask();
+
   static void registerCommands();
 
 protected:
@@ -362,6 +368,7 @@ private:
   void drawSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& rc);
   void drawMaskSafe();
   void drawMask(ui::Graphics* g);
+  void drawMaskBoundaries(ui::Graphics* g, doc::MaskBoundaries& segs, int antsOffset = 0);
   void drawGrid(ui::Graphics* g,
                 const gfx::Rect& spriteBounds,
                 const gfx::Rect& gridBounds,
@@ -460,6 +467,13 @@ private:
 
   DocView* m_docView;
 
+  // Special flag to avoid re-entering a new state when we are leaving
+  // the current one. This avoids an infinite onLeaveState() recursion
+  // in some special cases when an extension (third-party code)
+  // creates a new sprite change in the same sprite change scripting
+  // event.
+  bool m_leavingState = false;
+
   // Last known mouse position received by this editor when the
   // mouse button was pressed. Used for auto-scrolling. To get the
   // current mouse position on the editor you can use
@@ -506,6 +520,11 @@ private:
   // same document can show the same preview image/stroke being drawn
   // (search for Render::setPreviewImage()).
   static std::unique_ptr<EditorRender> m_renderEngine;
+
+  // Used for selection tool feedback.
+  // TODO move this to SelectionToolLoopImpl
+  static std::unique_ptr<doc::Mask> m_selectionToolMask;
+  static std::unique_ptr<doc::MaskBoundaries> m_selectionToolMaskBoundaries;
 };
 
 } // namespace app
diff --git a/src/app/ui/editor/moving_pixels_state.cpp b/src/app/ui/editor/moving_pixels_state.cpp
index 45a662e4e..d9d3dfe3d 100644
--- a/src/app/ui/editor/moving_pixels_state.cpp
+++ b/src/app/ui/editor/moving_pixels_state.cpp
@@ -286,9 +286,6 @@ bool MovingPixelsState::onMouseDown(Editor* editor, MouseMessage* msg)
   UIContext* ctx = UIContext::instance();
   ctx->setActiveView(editor->getDocView());
 
-  ContextBar* contextBar = App::instance()->contextBar();
-  contextBar->updateForMovingPixels(getTransformation(editor));
-
   // Start scroll loop
   if (editor->checkForScroll(msg) || editor->checkForZoom(msg))
     return true;
@@ -442,10 +439,6 @@ void MovingPixelsState::onCommitMouseMove(Editor* editor, const gfx::PointF& spr
   // Drag the image to that position
   m_pixelsMovement->moveImage(spritePos, moveModifier);
 
-  // Update context bar and status bar
-  ContextBar* contextBar = App::instance()->contextBar();
-  contextBar->updateForMovingPixels(transformation);
-
   m_editor->updateStatusBar();
 }
 
@@ -529,6 +522,10 @@ bool MovingPixelsState::onUpdateStatusBar(Editor* editor)
   const Transformation& transform(getTransformation(editor));
   gfx::Size imageSize = m_pixelsMovement->getInitialImageSize();
 
+  // Update the context bar along with the status bar
+  ContextBar* contextBar = App::instance()->contextBar();
+  contextBar->updateForMovingPixels(transform);
+
   int w = int(transform.bounds().w);
   int h = int(transform.bounds().h);
   int gcd = base::gcd(w, h);
diff --git a/src/app/ui/editor/moving_slice_state.cpp b/src/app/ui/editor/moving_slice_state.cpp
index c67726be5..ebd564247 100644
--- a/src/app/ui/editor/moving_slice_state.cpp
+++ b/src/app/ui/editor/moving_slice_state.cpp
@@ -428,8 +428,8 @@ bool MovingSliceState::onMouseMove(Editor* editor, MouseMessage* msg)
   if (editor->slicesTransforms())
     drawExtraCel();
 
-  // Redraw the editor.
-  editor->invalidate();
+  // Notify changes
+  m_site.document()->notifyGeneralUpdate();
 
   // Use StandbyState implementation
   return StandbyState::onMouseMove(editor, msg);
diff --git a/src/app/ui/editor/pixels_movement.cpp b/src/app/ui/editor/pixels_movement.cpp
index a64b4b0f3..cca9d0127 100644
--- a/src/app/ui/editor/pixels_movement.cpp
+++ b/src/app/ui/editor/pixels_movement.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -420,10 +420,12 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
         // Now we calculate the difference from x1,y1 point and we can
         // use it to adjust all coordinates (x1, y1, x2, y2).
         bounds.setOrigin(gridOffset);
+        newTransformation.pivot(abs_initial_pivot - m_initialData.bounds().origin() + gridOffset);
       }
+      else
+        newTransformation.pivot(abs_initial_pivot + gfx::PointF(dx, dy));
 
       newTransformation.bounds(bounds);
-      newTransformation.pivot(abs_initial_pivot + gfx::PointF(dx, dy));
       break;
     }
 
diff --git a/src/app/ui/editor/select_text_box_state.cpp b/src/app/ui/editor/select_text_box_state.cpp
index 053dc450c..3568ed478 100644
--- a/src/app/ui/editor/select_text_box_state.cpp
+++ b/src/app/ui/editor/select_text_box_state.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2022-2024  Igara Studio S.A.
+// Copyright (c) 2022-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -11,7 +11,8 @@
 #include "app/ui/editor/select_text_box_state.h"
 
 #include "app/app.h"
-#include "app/font_info.h"
+#include "app/fonts/font_info.h"
+#include "app/fonts/fonts.h"
 #include "app/ui/context_bar.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/editor/writing_text_state.h"
@@ -62,9 +63,9 @@ void SelectTextBoxState::onQuickboxEnd(Editor* editor, const gfx::Rect& rect0, u
   gfx::Rect rect = rect0;
   if (rect.w <= 3 || rect.h <= 3) {
     FontInfo fontInfo = App::instance()->contextBar()->fontInfo();
-    if (auto font = get_font_from_info(fontInfo)) {
-      rect.w = std::min(4 * font->height(), editor->sprite()->width());
-      rect.h = font->height();
+    if (auto font = Fonts::instance()->fontFromInfo(fontInfo)) {
+      rect.w = std::min<float>(4 * std::ceil(font->size()), editor->sprite()->width());
+      rect.h = std::ceil(font->size());
     }
   }
 
diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index 9e1ef307e..c601d0e89 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -464,8 +464,7 @@ bool StandbyState::onKeyDown(Editor* editor, KeyMessage* msg)
       checkStartDrawingStraightLine(editor, nullptr, nullptr))
     return false;
 
-  Keys keys = KeyboardShortcuts::instance()->getDragActionsFromKeyMessage(KeyContext::MouseWheel,
-                                                                          msg);
+  Keys keys = KeyboardShortcuts::instance()->getDragActionsFromKeyMessage(msg);
   if (editor->hasMouse() && !keys.empty()) {
     // Don't enter DraggingValueState to change brush size if we are
     // in a selection-like tool
diff --git a/src/app/ui/editor/tool_loop_impl.cpp b/src/app/ui/editor/tool_loop_impl.cpp
index 71d9150e4..55bfbdbbd 100644
--- a/src/app/ui/editor/tool_loop_impl.cpp
+++ b/src/app/ui/editor/tool_loop_impl.cpp
@@ -426,6 +426,11 @@ public:
 
   const app::TiledModeHelper& getTiledModeHelper() override { return m_tiledModeHelper; }
 
+  // Used by selection tools
+  bool isSelectionToolLoop() const override { return false; }
+  void addSelectionToolPoint(const gfx::Rect& rc) override {};
+  void clearSelectionToolMask(const bool finalStep) override {};
+
 protected:
   void updateAllVisibleRegion()
   {
@@ -444,31 +449,26 @@ protected:
 };
 
 //////////////////////////////////////////////////////////////////////
-// For drawing
+// Common properties between drawing/selection ToolLoop impl
 
-class ToolLoopImpl final : public ToolLoopBase,
-                           public EditorObserver {
+class PaintToolLoopBase : public ToolLoopBase,
+                          public EditorObserver {
+protected:
   Context* m_context;
-  bool m_filled;
-  bool m_previewFilled;
-  int m_sprayWidth;
-  int m_spraySpeed;
-  bool m_useMask;
   Mask* m_mask;
   gfx::Point m_maskOrigin;
   bool m_internalCancel = false;
   Tx m_tx;
-  std::unique_ptr<ExpandCelCanvas> m_expandCelCanvas;
   Image* m_floodfillSrcImage;
   bool m_saveLastPoint;
 
 public:
-  ToolLoopImpl(Editor* editor,
-               Site& site,
-               const doc::Grid& grid,
-               Context* context,
-               ToolLoopParams& params,
-               const bool saveLastPoint)
+  PaintToolLoopBase(Editor* editor,
+                    Site& site,
+                    const doc::Grid& grid,
+                    Context* context,
+                    ToolLoopParams& params,
+                    const bool saveLastPoint)
     : ToolLoopBase(editor, site, grid, params)
     , m_context(context)
     , m_tx(Tx::DontLockDoc,
@@ -481,9 +481,19 @@ public:
               ModifyDocument))
     , m_floodfillSrcImage(nullptr)
     , m_saveLastPoint(saveLastPoint)
+  {
+  }
+
+  ~PaintToolLoopBase()
+  {
+    if (m_editor)
+      m_editor->remove_observer(this);
+  }
+
+  void constructor_prologue()
   {
     if (m_pointShape->isFloodFill()) {
-      if (m_tilesMode) {
+      if (m_tilesMode && !isSelectionToolLoop()) {
         // This will be set later to getSrcImage()
         m_floodfillSrcImage = nullptr;
       }
@@ -502,7 +512,104 @@ public:
       else if (Cel* cel = m_layer->cel(m_frame)) {
         m_floodfillSrcImage = render::rasterize_with_sprite_bounds(cel);
       }
+      else if (isSelectionToolLoop() && !m_layer->cel(m_frame)) {
+        m_floodfillSrcImage =
+          Image::create(m_sprite->pixelFormat(), m_sprite->width(), m_sprite->height());
+
+        m_floodfillSrcImage->clear(m_sprite->transparentColor());
+      }
     }
+  }
+
+  void constructor_epilogue()
+  {
+    m_mask = m_document->mask();
+    m_maskOrigin = (!m_mask->isEmpty() ? gfx::Point(m_mask->bounds().x - m_celOrigin.x,
+                                                    m_mask->bounds().y - m_celOrigin.y) :
+                                         gfx::Point(0, 0));
+
+    if (m_editor)
+      m_editor->add_observer(this);
+  }
+
+  // IToolLoop interface
+  bool needsCelCoordinates() override
+  {
+    if (m_tilesMode) {
+      // When we are painting with tiles, we don't need to adjust the
+      // coordinates by the cel position in PointShape (points will be
+      // in tiles position relative to the tilemap origin already).
+      return false;
+    }
+    else
+      return ToolLoopBase::needsCelCoordinates();
+  }
+
+  const Image* getFloodFillSrcImage() override { return m_floodfillSrcImage; }
+  Mask* getMask() override { return m_mask; }
+  void setMask(Mask* newMask) override { m_tx(new cmd::SetMask(m_document, newMask)); }
+  gfx::Point getMaskOrigin() override { return m_maskOrigin; }
+
+  void onSliceRect(const gfx::Rect& bounds) override
+  {
+    // TODO add support for slice tool from batch scripts without UI?
+    if (m_editor && getMouseButton() == ToolLoop::Left) {
+      // Try to select slices, but if it returns false, it means that
+      // there are no slices in the box to be selected, so we show a
+      // popup menu to create a new one.
+      if (!m_editor->selectSliceBox(bounds) && (bounds.w > 1 || bounds.h > 1)) {
+        Slice* slice = new Slice;
+        slice->setName(getUniqueSliceName());
+
+        SliceKey key(bounds);
+        slice->insert(getFrame(), key);
+
+        auto color = Preferences::instance().slices.defaultColor();
+        slice->userData().setColor(
+          doc::rgba(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()));
+
+        m_tx(new cmd::AddSlice(m_sprite, slice));
+        return;
+      }
+    }
+
+    // Cancel the operation (do not create a new transaction for this
+    // no-op, e.g. just change the set of selected slices).
+    m_internalCancel = true;
+  }
+
+private:
+  // EditorObserver impl
+  void onScrollChanged(Editor* editor) override { updateAllVisibleRegion(); }
+  void onZoomChanged(Editor* editor) override { updateAllVisibleRegion(); }
+
+  std::string getUniqueSliceName() const
+  {
+    std::string prefix = "Slice";
+    int max = 0;
+
+    for (Slice* slice : m_sprite->slices())
+      if (std::strncmp(slice->name().c_str(), prefix.c_str(), prefix.size()) == 0)
+        max = std::max(max, (int)std::strtol(slice->name().c_str() + prefix.size(), nullptr, 10));
+
+    return fmt::format("{} {}", prefix, max + 1);
+  }
+};
+
+//////////////////////////////////////////////////////////////////////
+// For drawing
+
+class ToolLoopImpl final : public PaintToolLoopBase {
+public:
+  ToolLoopImpl(Editor* editor,
+               Site& site,
+               const doc::Grid& grid,
+               Context* context,
+               ToolLoopParams& params,
+               const bool saveLastPoint)
+    : PaintToolLoopBase(editor, site, grid, context, params, saveLastPoint)
+  {
+    constructor_prologue();
 
     // 'isSelectionPreview = true' if the intention is to show a preview
     // of Selection tools or Slice tool.
@@ -547,7 +654,7 @@ public:
     // Start with an empty mask if the user is selecting with "default selection mode"
     if (isSelectionPreview &&
         (!m_document->isMaskVisible() ||
-         (int(getModifiers()) & int(tools::ToolLoopModifiers::kReplaceSelection)))) {
+         (int(getModifiers()) & int(tools::ToolLoopModifiers::kReplaceSelection)) != 0)) {
       Mask emptyMask;
       m_tx(new cmd::SetMask(m_document, &emptyMask));
     }
@@ -557,20 +664,11 @@ public:
     m_grid = m_expandCelCanvas->getGrid();
     m_celOrigin = m_expandCelCanvas->getCelOrigin();
 
-    m_mask = m_document->mask();
-    m_maskOrigin = (!m_mask->isEmpty() ? gfx::Point(m_mask->bounds().x - m_celOrigin.x,
-                                                    m_mask->bounds().y - m_celOrigin.y) :
-                                         gfx::Point(0, 0));
-
-    if (m_editor)
-      m_editor->add_observer(this);
+    constructor_epilogue();
   }
 
   ~ToolLoopImpl()
   {
-    if (m_editor)
-      m_editor->remove_observer(this);
-
     // getSrcImage() is a virtual member function but ToolLoopImpl is
     // marked as final to avoid not calling a derived version from
     // this destructor.
@@ -579,18 +677,6 @@ public:
   }
 
   // IToolLoop interface
-  bool needsCelCoordinates() override
-  {
-    if (m_tilesMode) {
-      // When we are painting with tiles, we don't need to adjust the
-      // coordinates by the cel position in PointShape (points will be
-      // in tiles position relative to the tilemap origin already).
-      return false;
-    }
-    else
-      return ToolLoopBase::needsCelCoordinates();
-  }
-
   void commit() override
   {
     bool redraw = false;
@@ -650,7 +736,6 @@ public:
 
   const Cel* getCel() override { return m_expandCelCanvas->getCel(); }
   const Image* getSrcImage() override { return m_expandCelCanvas->getSourceCanvas(); }
-  const Image* getFloodFillSrcImage() override { return m_floodfillSrcImage; }
   Image* getDstImage() override { return m_expandCelCanvas->getDestCanvas(); }
   Tileset* getDstTileset() override { return m_expandCelCanvas->getDestTileset(); }
   void validateSrcImage(const gfx::Region& rgn) override
@@ -676,58 +761,110 @@ public:
   }
 
   bool useMask() override { return m_useMask; }
-  Mask* getMask() override { return m_mask; }
-  void setMask(Mask* newMask) override { m_tx(new cmd::SetMask(m_document, newMask)); }
-  gfx::Point getMaskOrigin() override { return m_maskOrigin; }
   bool getFilled() override { return m_filled; }
   bool getPreviewFilled() override { return m_previewFilled; }
   int getSprayWidth() override { return m_sprayWidth; }
   int getSpraySpeed() override { return m_spraySpeed; }
 
-  void onSliceRect(const gfx::Rect& bounds) override
+private:
+  bool m_filled;
+  bool m_previewFilled;
+  int m_sprayWidth;
+  int m_spraySpeed;
+  bool m_useMask;
+  std::unique_ptr<ExpandCelCanvas> m_expandCelCanvas;
+};
+
+//////////////////////////////////////////////////////////////////////
+// For selection tools
+
+class SelectionToolLoopImpl final : public PaintToolLoopBase {
+public:
+  SelectionToolLoopImpl(Editor* editor,
+                        Site& site,
+                        const doc::Grid& grid,
+                        Context* context,
+                        ToolLoopParams& params,
+                        const bool saveLastPoint)
+    : PaintToolLoopBase(editor, site, grid, context, params, saveLastPoint)
   {
-    // TODO add support for slice tool from batch scripts without UI?
-    if (m_editor && getMouseButton() == ToolLoop::Left) {
-      // Try to select slices, but if it returns false, it means that
-      // there are no slices in the box to be selected, so we show a
-      // popup menu to create a new one.
-      if (!m_editor->selectSliceBox(bounds) && (bounds.w > 1 || bounds.h > 1)) {
-        Slice* slice = new Slice;
-        slice->setName(getUniqueSliceName());
+    constructor_prologue();
 
-        SliceKey key(bounds);
-        slice->insert(getFrame(), key);
-
-        auto color = Preferences::instance().slices.defaultColor();
-        slice->userData().setColor(
-          doc::rgba(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()));
-
-        m_tx(new cmd::AddSlice(m_sprite, slice));
-        return;
-      }
+    // Start with an empty mask if the user is selecting with "default selection mode"
+    if (!m_document->isMaskVisible() ||
+        (int(getModifiers()) & int(tools::ToolLoopModifiers::kReplaceSelection)) != 0) {
+      Mask emptyMask;
+      m_tx(new cmd::SetMask(m_document, &emptyMask));
     }
 
-    // Cancel the operation (do not create a new transaction for this
-    // no-op, e.g. just change the set of selected slices).
-    m_internalCancel = true;
+    m_editor->makeSelectionToolMask();
+    constructor_epilogue();
   }
 
-private:
-  // EditorObserver impl
-  void onScrollChanged(Editor* editor) override { updateAllVisibleRegion(); }
-  void onZoomChanged(Editor* editor) override { updateAllVisibleRegion(); }
-
-  std::string getUniqueSliceName() const
+  ~SelectionToolLoopImpl()
   {
-    std::string prefix = "Slice";
-    int max = 0;
-
-    for (Slice* slice : m_sprite->slices())
-      if (std::strncmp(slice->name().c_str(), prefix.c_str(), prefix.size()) == 0)
-        max = std::max(max, (int)std::strtol(slice->name().c_str() + prefix.size(), nullptr, 10));
-
-    return fmt::format("{} {}", prefix, max + 1);
+    m_editor->deleteSelectionToolMask();
+    delete m_floodfillSrcImage;
   }
+
+  // For drawing the selection to second mask
+  bool isSelectionToolLoop() const override { return true; }
+  void addSelectionToolPoint(const gfx::Rect& rc) override
+  {
+    if (rc.w >= 1 && rc.h >= 1)
+      m_editor->getSelectionToolMask()->add(rc);
+  }
+
+  void clearSelectionToolMask(const bool finalStep) override
+  {
+    if (finalStep || getTracePolicy() == tools::TracePolicy::Last)
+      m_editor->getSelectionToolMask()->clear();
+  }
+
+  // IToolLoop interface
+  void commit() override
+  {
+    bool redraw = false;
+
+    if (!m_internalCancel) {
+      // Freehand changes the last point
+      if (m_saveLastPoint) {
+        m_tx(new cmd::SetLastPoint(m_document, getController()->getLastPoint().toPoint()));
+      }
+
+      // Selection ink
+      redraw = true;
+      if (m_ink->isSelection() && Preferences::instance().selection.autoShowSelectionEdges()) {
+        // Show selection edges
+        m_docPref.show.selectionEdges(true);
+      }
+
+      m_tx.commit();
+    }
+    else {
+      rollback();
+    }
+
+    if (redraw)
+      update_screen_for_document(m_document);
+  }
+  void rollback() override {}
+
+  const Image* getSrcImage() override { return m_floodfillSrcImage; }
+  Image* getDstImage() override { return nullptr; }
+  Tileset* getDstTileset() override { return nullptr; }
+  void validateSrcImage(const gfx::Region& rgn) override {}
+  void validateDstImage(const gfx::Region& rgn) override {}
+  void validateDstTileset(const gfx::Region& rgn) override {}
+  void invalidateDstImage() override {}
+  void invalidateDstImage(const gfx::Region& rgn) override {}
+  void copyValidDstToSrcImage(const gfx::Region& rgn) override {}
+
+  bool useMask() override { return false; }
+  bool getFilled() override { return true; }
+  bool getPreviewFilled() override { return getTracePolicy() == tools::TracePolicy::Last; }
+  int getSprayWidth() override { return 0; }
+  int getSpraySpeed() override { return 0; }
 };
 
 //////////////////////////////////////////////////////////////////////
@@ -850,8 +987,16 @@ tools::ToolLoop* create_tool_loop(Editor* editor,
     fill_toolloop_params_from_tool_preferences(params);
 
     ASSERT(context->activeDocument() == editor->document());
-    auto toolLoop = new ToolLoopImpl(editor, site, grid, context, params, saveLastPoint);
+    if (Preferences::instance().experimental.useSelectionToolLoop() &&
+        (params.ink->isSelection() || params.ink->isSlice())) {
+      auto* toolLoop =
+        new SelectionToolLoopImpl(editor, site, grid, context, params, saveLastPoint);
+      if (selectTiles)
+        toolLoop->forceSnapToTiles();
 
+      return toolLoop;
+    }
+    auto* toolLoop = new ToolLoopImpl(editor, site, grid, context, params, saveLastPoint);
     if (selectTiles)
       toolLoop->forceSnapToTiles();
 
diff --git a/src/app/ui/editor/writing_text_state.cpp b/src/app/ui/editor/writing_text_state.cpp
index c54448ef7..4bc46a5ca 100644
--- a/src/app/ui/editor/writing_text_state.cpp
+++ b/src/app/ui/editor/writing_text_state.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2022-2024  Igara Studio S.A.
+// Copyright (C) 2022-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -14,7 +14,8 @@
 #include "app/color_utils.h"
 #include "app/commands/command.h"
 #include "app/extra_cel.h"
-#include "app/font_info.h"
+#include "app/fonts/font_info.h"
+#include "app/i18n/strings.h"
 #include "app/pref/preferences.h"
 #include "app/site.h"
 #include "app/tx.h"
@@ -31,6 +32,7 @@
 #include "render/dithering.h"
 #include "render/quantization.h"
 #include "render/render.h"
+#include "text/font_metrics.h"
 #include "ui/entry.h"
 #include "ui/message.h"
 #include "ui/paint_event.h"
@@ -42,12 +44,42 @@
   #include "os/skia/skia_surface.h"
 #endif
 
+#include <cmath>
+
 namespace app {
 
 using namespace ui;
 
+// Get ui::Paint to render text from context bar options / preferences
+static ui::Paint get_paint_for_text()
+{
+  ui::Paint paint;
+  if (auto* app = App::instance()) {
+    if (auto* ctxBar = app->contextBar())
+      paint = ctxBar->fontEntry()->paint();
+  }
+  paint.color(color_utils::color_for_ui(Preferences::instance().colorBar.fgColor()));
+  return paint;
+}
+
+static gfx::RectF calc_blob_bounds(const text::TextBlobRef& blob)
+{
+  gfx::RectF bounds = get_text_blob_required_bounds(blob);
+  ui::Paint paint = get_paint_for_text();
+  if (paint.style() == ui::Paint::Style::Stroke ||
+      paint.style() == ui::Paint::Style::StrokeAndFill) {
+    bounds.enlarge(std::ceil(paint.strokeWidth()));
+  }
+  return bounds;
+}
+
 class WritingTextState::TextEditor : public Entry {
 public:
+  enum TextPreview {
+    Intermediate, // With selection preview / user interface
+    Final,        // Final to be rendered in the cel
+  };
+
   TextEditor(Editor* editor, const Site& site, const gfx::Rect& bounds)
     : Entry(4096, "")
     , m_editor(editor)
@@ -60,10 +92,10 @@ public:
     setPersistSelection(true);
 
     createExtraCel(site, bounds);
-    renderExtraCelBase();
+    renderExtraCel(TextPreview::Intermediate);
 
     FontInfo fontInfo = App::instance()->contextBar()->fontInfo();
-    if (auto font = get_font_from_info(fontInfo))
+    if (auto font = Fonts::instance()->fontFromInfo(fontInfo))
       setFont(font);
   }
 
@@ -75,35 +107,37 @@ public:
 
   // Returns the extra cel with the text rendered (but without the
   // selected text highlighted).
-  ExtraCelRef extraCel()
+  ExtraCelRef extraCel(const TextPreview textPreview)
   {
-    renderExtraCelBase();
-    renderExtraCelText(false);
+    renderExtraCel(textPreview);
     return m_extraCel;
   }
 
-  void setExtraCelBounds(const gfx::Rect& bounds)
+  void setExtraCelBounds(const gfx::RectF& bounds)
   {
-    if (bounds.w != m_extraCel->image()->width() || bounds.h != m_extraCel->image()->height()) {
+    doc::Image* extraImg = m_extraCel->image();
+    if (!extraImg || std::ceil(bounds.w) != extraImg->width() ||
+        std::ceil(bounds.h) != extraImg->height()) {
       createExtraCel(m_editor->getSite(), bounds);
     }
     else {
+      m_baseBounds = bounds;
       m_extraCel->cel()->setBounds(bounds);
     }
-    renderExtraCelBase();
-    renderExtraCelText(true);
+    renderExtraCel(TextPreview::Intermediate);
   }
 
-  obs::signal<void(const gfx::Size&)> NewRequiredBounds;
+  obs::signal<void(const gfx::RectF&)> NewRequiredBounds;
 
 private:
   void createExtraCel(const Site& site, const gfx::Rect& bounds)
   {
+    m_baseBounds = bounds;
     m_extraCel->create(ExtraCel::Purpose::TextPreview,
                        site.tilemapMode(),
                        site.sprite(),
                        bounds,
-                       bounds.size(),
+                       gfx::Size(std::ceil(bounds.w), std::ceil(bounds.h)),
                        site.frame(),
                        255);
 
@@ -133,6 +167,13 @@ private:
     return Entry::onProcessMessage(msg);
   }
 
+  float onGetTextBaseline() const override
+  {
+    text::FontMetrics metrics;
+    font()->metrics(&metrics);
+    return scale().y * -metrics.ascent;
+  }
+
   void onInitTheme(InitThemeEvent& ev) override
   {
     Entry::onInitTheme(ev);
@@ -167,7 +208,7 @@ private:
 
     // Notify that we could make the text editor bigger to show this
     // text blob.
-    NewRequiredBounds(get_text_blob_required_size(blob));
+    NewRequiredBounds(calc_blob_bounds(blob));
   }
 
   void onPaint(PaintEvent& ev) override
@@ -196,8 +237,7 @@ private:
       }
 
       // Render extra cel with text + selected text
-      renderExtraCelBase();
-      renderExtraCelText(true);
+      renderExtraCel(TextPreview::Intermediate);
       m_doc->setExtraCel(m_extraCel);
 
       // Paint caret
@@ -218,62 +258,80 @@ private:
     }
   }
 
-  void renderExtraCelBase()
+  void renderExtraCel(const TextPreview textPreview)
   {
-    auto extraImg = m_extraCel->image();
-    extraImg->clear(extraImg->maskColor());
-    render::Render().renderLayer(extraImg,
-                                 m_editor->layer(),
-                                 m_editor->frame(),
-                                 gfx::Clip(0, 0, m_extraCel->cel()->bounds()),
-                                 doc::BlendMode::SRC);
-  }
+    doc::Image* extraImg = m_extraCel->image();
+    ASSERT(extraImg);
+    if (!extraImg)
+      return;
 
-  void renderExtraCelText(const bool withSelection)
-  {
-    const auto textColor = color_utils::color_for_image(Preferences::instance().colorBar.fgColor(),
-                                                        IMAGE_RGB);
+    extraImg->clear(extraImg->maskColor());
 
     text::TextBlobRef blob = textBlob();
-    if (!blob)
-      return;
+    doc::ImageRef blobImage;
+    gfx::RectF bounds;
+    if (blob) {
+      const ui::Paint paint = get_paint_for_text();
+      bounds = calc_blob_bounds(blob);
+      blobImage = render_text_blob(blob, bounds, get_paint_for_text());
+      if (!blobImage)
+        return;
 
-    doc::ImageRef image = render_text_blob(blob, textColor);
-    if (!image)
-      return;
+      // Invert selected range in the image
+      if (textPreview == TextPreview::Intermediate) {
+        Range range;
+        getEntryThemeInfo(nullptr, nullptr, nullptr, &range);
+        if (!range.isEmpty()) {
+          gfx::RectF selectedBounds = getCharBoxBounds(range.from) | getCharBoxBounds(range.to - 1);
 
-    // Invert selected range in the image
-    if (withSelection) {
-      Range range;
-      getEntryThemeInfo(nullptr, nullptr, nullptr, &range);
-      if (!range.isEmpty()) {
-        gfx::RectF selectedBounds = getCharBoxBounds(range.from) | getCharBoxBounds(range.to - 1);
+          if (!selectedBounds.isEmpty()) {
+            selectedBounds.offset(-bounds.origin());
 
-        if (!selectedBounds.isEmpty()) {
 #ifdef LAF_SKIA
-          sk_sp<SkSurface> skSurface = wrap_docimage_in_sksurface(image.get());
-          os::SurfaceRef surface = base::make_ref<os::SkiaSurface>(skSurface);
+            sk_sp<SkSurface> skSurface = wrap_docimage_in_sksurface(blobImage.get());
+            os::SurfaceRef surface = base::make_ref<os::SkiaSurface>(skSurface);
 
-          os::Paint paint;
-          paint.blendMode(os::BlendMode::Xor);
-          paint.color(textColor);
-          surface->drawRect(selectedBounds, paint);
+            os::Paint paint2 = paint;
+            paint2.blendMode(os::BlendMode::Xor);
+            paint2.style(os::Paint::Style::Fill);
+            surface->drawRect(selectedBounds, paint2);
 #endif // LAF_SKIA
+          }
         }
       }
     }
 
-    doc::blend_image(m_extraCel->image(),
-                     image.get(),
-                     gfx::Clip(image->bounds().size()),
-                     m_doc->sprite()->palette(m_editor->frame()),
-                     255,
-                     doc::BlendMode::NORMAL);
+    doc::Cel* extraCel = m_extraCel->cel();
+    ASSERT(extraCel);
+    if (!extraCel)
+      return;
+
+    extraCel->setPosition(m_baseBounds.x + bounds.x, m_baseBounds.y + bounds.y);
+
+    render::Render().renderLayer(extraImg,
+                                 m_editor->layer(),
+                                 m_editor->frame(),
+                                 gfx::Clip(0, 0, extraCel->bounds()),
+                                 doc::BlendMode::SRC);
+
+    if (blobImage) {
+      doc::blend_image(extraImg,
+                       blobImage.get(),
+                       gfx::Clip(blobImage->bounds().size()),
+                       m_doc->sprite()->palette(m_editor->frame()),
+                       255,
+                       doc::BlendMode::NORMAL);
+    }
   }
 
   Editor* m_editor;
   Doc* m_doc;
   ExtraCelRef m_extraCel;
+
+  // Initial bounds for the entry field. This can be modified later to
+  // render the text in case some initial letter/glyph needs some
+  // extra room at the left side.
+  gfx::Rect m_baseBounds;
 };
 
 WritingTextState::WritingTextState(Editor* editor, const gfx::Rect& bounds)
@@ -289,10 +347,10 @@ WritingTextState::WritingTextState(Editor* editor, const gfx::Rect& bounds)
   m_fontChangeConn =
     App::instance()->contextBar()->FontChange.connect(&WritingTextState::onFontChange, this);
 
-  m_entry->NewRequiredBounds.connect([this](const gfx::Size& blobSize) {
-    if (m_bounds.w < blobSize.w || m_bounds.h < blobSize.h) {
-      m_bounds.w = std::max(m_bounds.w, blobSize.w);
-      m_bounds.h = std::max(m_bounds.h, blobSize.h);
+  m_entry->NewRequiredBounds.connect([this](const gfx::RectF& blobBounds) {
+    if (m_bounds.w < blobBounds.w || m_bounds.h < blobBounds.h) {
+      m_bounds.w = std::max(m_bounds.w, blobBounds.w);
+      m_bounds.h = std::max(m_bounds.h, blobBounds.h);
       m_entry->setExtraCelBounds(m_bounds);
       m_entry->setBounds(calcEntryBounds());
     }
@@ -365,11 +423,11 @@ void WritingTextState::onCommitMouseMove(Editor* editor, const gfx::PointF& spri
   if (!m_movingBounds)
     return;
 
-  gfx::Point delta(spritePos - m_cursorStart);
+  gfx::PointF delta(spritePos - m_cursorStart);
   if (delta.x == 0 && delta.y == 0)
     return;
 
-  m_bounds.setOrigin(gfx::Point(delta + m_boundsOrigin));
+  m_bounds.setOrigin(delta + m_boundsOrigin);
   m_entry->setExtraCelBounds(m_bounds);
   m_entry->setBounds(calcEntryBounds());
 }
@@ -385,12 +443,7 @@ bool WritingTextState::onSetCursor(Editor* editor, const gfx::Point& mouseScreen
   return true;
 }
 
-bool WritingTextState::onKeyDown(Editor*, KeyMessage*)
-{
-  return false;
-}
-
-bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
+bool WritingTextState::onKeyDown(Editor*, KeyMessage* msg)
 {
   // Cancel loop pressing Esc key
   if (msg->scancode() == ui::kKeyEsc) {
@@ -399,7 +452,17 @@ bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
   // Drop text pressing Enter key
   else if (msg->scancode() == ui::kKeyEnter) {
     drop();
+    return true;
   }
+  return false;
+}
+
+bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
+{
+  // Note: We cannot process kKeyEnter key here to drop the text as it
+  // could be received after the Enter key is pressed in the IME
+  // dialog to accept the composition (not to accept the text). So we
+  // process kKeyEnter in onKeyDown().
   return true;
 }
 
@@ -452,8 +515,8 @@ EditorState::LeaveAction WritingTextState::onLeaveState(Editor* editor, EditorSt
       // Paints the text in the active layer/sprite creating an
       // undoable transaction.
       Site site = m_editor->getSite();
-      ExtraCelRef extraCel = m_entry->extraCel();
-      Tx tx(site.document(), "Text Tool");
+      ExtraCelRef extraCel = m_entry->extraCel(TextEditor::Final);
+      Tx tx(site.document(), Strings::tools_text());
       ExpandCelCanvas expand(site, site.layer(), TiledMode::NONE, tx, ExpandCelCanvas::None);
 
       expand.validateDestCanvas(gfx::Region(extraCel->cel()->bounds()));
@@ -497,14 +560,14 @@ void WritingTextState::onBeforeCommandExecution(CommandExecutionEvent& ev)
 
 void WritingTextState::onFontChange(const FontInfo& fontInfo, FontEntry::From fromField)
 {
-  if (auto font = get_font_from_info(fontInfo)) {
+  if (auto font = Fonts::instance()->fontFromInfo(fontInfo)) {
     m_entry->setFont(font);
     m_entry->invalidate();
     m_editor->invalidate();
 
     // This is useful to show changes to the anti-alias option
     // immediately.
-    auto dummy = m_entry->extraCel();
+    auto dummy = m_entry->extraCel(TextEditor::Intermediate);
 
     if (fromField == FontEntry::From::Popup) {
       if (m_entry)
diff --git a/src/app/ui/editor/writing_text_state.h b/src/app/ui/editor/writing_text_state.h
index bd01bc918..3422acab1 100644
--- a/src/app/ui/editor/writing_text_state.h
+++ b/src/app/ui/editor/writing_text_state.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2022-2024  Igara Studio S.A.
+// Copyright (c) 2022-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -59,7 +59,7 @@ private:
 
   DelayedMouseMove m_delayedMouseMove;
   Editor* m_editor;
-  gfx::Rect m_bounds;
+  gfx::RectF m_bounds;
   std::unique_ptr<TextEditor> m_entry;
 
   // True if the text was discarded.
@@ -71,7 +71,7 @@ private:
   bool m_mouseMoveReceived = false;
   bool m_movingBounds = false;
   gfx::PointF m_cursorStart;
-  gfx::Point m_boundsOrigin;
+  gfx::PointF m_boundsOrigin;
 
   obs::scoped_connection m_beforeCmdConn;
   obs::scoped_connection m_fontChangeConn;
diff --git a/src/app/ui/export_file_window.cpp b/src/app/ui/export_file_window.cpp
index 989723acb..734ef4971 100644
--- a/src/app/ui/export_file_window.cpp
+++ b/src/app/ui/export_file_window.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2018  David Capello
 //
 // This program is distributed under the terms of
@@ -46,7 +46,7 @@ ExportFileWindow::ExportFileWindow(const Doc* doc)
     base = base::join_path(basePath, base::get_file_title(base));
 
     std::string newFn = base::replace_extension(base, defaultExtension());
-    if (newFn == base) {
+    if (newFn == base::replace_extension(base, base::get_file_extension(doc->filename()))) {
       newFn = base::join_path(
         base::get_file_path(newFn),
         base::get_file_title(newFn) + "-export." + base::get_file_extension(newFn));
diff --git a/src/app/ui/file_list.cpp b/src/app/ui/file_list.cpp
index c68d89444..80334cc0d 100644
--- a/src/app/ui/file_list.cpp
+++ b/src/app/ui/file_list.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -18,6 +18,7 @@
 #include "base/time.h"
 #include "os/surface.h"
 #include "text/font.h"
+#include "text/font_metrics.h"
 #include "ui/ui.h"
 
 #include <algorithm>
@@ -44,6 +45,7 @@ FileList::FileList()
   , m_multiselect(false)
   , m_zoom(1.0)
   , m_itemsPerRow(0)
+  , m_showHidden(Preferences::instance().fileSelector.showHidden())
 {
   setFocusStop(true);
   setDoubleBuffered(true);
@@ -172,6 +174,14 @@ void FileList::animateToZoom(const double zoom)
   startAnimation(ANI_ZOOM, 10);
 }
 
+void FileList::setShowHidden(const bool show)
+{
+  m_showHidden = show;
+  m_req_valid = false;
+  m_selected = nullptr;
+  regenerateList();
+}
+
 bool FileList::onProcessMessage(Message* msg)
 {
   switch (msg->type()) {
@@ -401,7 +411,6 @@ void FileList::onPaint(ui::PaintEvent& ev)
   gfx::Rect bounds = clientBounds();
 
   g->fillRect(theme->colors.background(), bounds);
-  // g->fillRect(bgcolor, gfx::Rect(bounds.x, y, bounds.w, itemSize.h));
 
   int i = 0, selectedIndex = -1;
   for (IFileItem* fi : m_list) {
@@ -506,17 +515,28 @@ void FileList::paintItem(ui::Graphics* g, IFileItem* fi, const int i)
 
   // item name
   if (isIconView() && textBounds.w > info.bounds.w) {
-    g->drawAlignedUIText(fi->displayName().c_str(),
+    g->drawAlignedUIText(fi->displayName(),
                          fgcolor,
                          bgcolor,
                          (textBounds & gfx::Rect(info.bounds).shrink(2 * guiscale())),
                          ui::CENTER | ui::TOP | ui::CHARWRAP);
   }
   else {
-    g->drawText(fi->displayName().c_str(),
-                fgcolor,
-                bgcolor,
-                gfx::Point(textBounds.x + 2 * guiscale(), textBounds.y + 2 * guiscale()));
+    auto blob = text::TextBlob::MakeWithShaper(theme->fontMgr(), font(), fi->displayName());
+    if (blob) {
+      Paint paint;
+      paint.color(fgcolor);
+      paint.style(os::Paint::Fill);
+
+      text::FontMetrics metrics;
+      font()->metrics(&metrics);
+      const float baselineDelta = -metrics.ascent - blob->baseline();
+
+      g->drawTextBlob(
+        blob,
+        gfx::PointF(textBounds.x + 2 * guiscale(), textBounds.y + 2 * guiscale() + baselineDelta),
+        paint);
+    }
   }
 
   // Draw thumbnail progress bar
@@ -814,7 +834,7 @@ void FileList::regenerateList()
     for (FileItemList::iterator it = m_list.begin(); it != m_list.end();) {
       IFileItem* fileitem = *it;
 
-      if (fileitem->isHidden())
+      if (fileitem->isHidden() && !m_showHidden)
         it = m_list.erase(it);
       else if (!fileitem->isFolder() && !fileitem->hasExtension(m_exts)) {
         it = m_list.erase(it);
diff --git a/src/app/ui/file_list.h b/src/app/ui/file_list.h
index 7d47c3e11..4ba58dbfb 100644
--- a/src/app/ui/file_list.h
+++ b/src/app/ui/file_list.h
@@ -54,6 +54,7 @@ public:
   double zoom() const { return m_zoom; }
   void setZoom(const double zoom);
   void animateToZoom(const double zoom);
+  void setShowHidden(const bool show);
 
   obs::signal<void()> FileSelected;
   obs::signal<void()> FileAccepted;
@@ -137,6 +138,7 @@ private:
   double m_toZoom;
 
   int m_itemsPerRow;
+  bool m_showHidden;
 };
 
 } // namespace app
diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index 93b9737ca..95f07d72c 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -316,6 +316,7 @@ FileSelector::FileSelector(FileSelectorType type) : m_type(type), m_navigationLo
   for (auto child : viewType()->children())
     child->setFocusStop(false);
 
+  showHiddenCheck()->setSelected(Preferences::instance().fileSelector.showHidden());
   m_fileList = new FileList();
   m_fileList->setId("fileview");
   m_fileName->setAssociatedFileList(m_fileList);
@@ -334,6 +335,10 @@ FileSelector::FileSelector(FileSelectorType type) : m_type(type), m_navigationLo
   viewType()->ItemChange.connect([this] { onChangeViewType(); });
   location()->CloseListBox.connect([this] { onLocationCloseListBox(); });
   fileType()->Change.connect([this] { onFileTypeChange(); });
+  showHiddenCheck()->Click.connect([this] {
+    Preferences::instance().fileSelector.showHidden(showHiddenCheck()->isSelected());
+    m_fileList->setShowHidden(showHiddenCheck()->isSelected());
+  });
   m_fileList->FileSelected.connect([this] { onFileListFileSelected(); });
   m_fileList->FileAccepted.connect([this] { onFileListFileAccepted(); });
   m_fileList->CurrentFolderChanged.connect([this] { onFileListCurrentFolderChanged(); });
@@ -408,7 +413,8 @@ bool FileSelector::show(const std::string& title,
 
   remapWindow();
   centerWindow();
-  load_window_pos(this, kConfigSection);
+  // The minimum size is large, so do not limit the minimum loaded size
+  load_window_pos(this, kConfigSection, false);
 
   // Change the file formats/extensions to be shown
   std::string initialExtension = base::get_file_extension(initialPath);
diff --git a/src/app/ui/filename_field.cpp b/src/app/ui/filename_field.cpp
index cd706b7c6..770bde317 100644
--- a/src/app/ui/filename_field.cpp
+++ b/src/app/ui/filename_field.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -10,8 +10,10 @@
 
 #include "app/ui/filename_field.h"
 
+#include "app/app.h"
 #include "app/i18n/strings.h"
 #include "app/pref/preferences.h"
+#include "app/recent_files.h"
 #include "app/ui/skin/skin_theme.h"
 #include "base/fs.h"
 #include "ui/box.h"
@@ -24,6 +26,11 @@ namespace app {
 
 using namespace ui;
 
+FilenameField::FilenameButton::FilenameButton(const std::string& text) : ButtonSet(1)
+{
+  addItem(text);
+}
+
 FilenameField::FilenameField(const Type type, const std::string& pathAndFilename)
   : m_entry(type == EntryAndButton ? new ui::Entry(1024, "") : nullptr)
   , m_button(type == EntryAndButton ? Strings::select_file_browse() : Strings::select_file_text())
@@ -46,7 +53,10 @@ FilenameField::FilenameField(const Type type, const std::string& pathAndFilename
   if (m_entry)
     m_entry->Change.connect([this] { setFilename(updatedFilename()); });
 
-  m_button.Click.connect([this] { onBrowse(); });
+  m_button.ItemChange.connect([this](ButtonSet::Item* item) {
+    m_button.setSelectedItem(nullptr);
+    onBrowse();
+  });
   initTheme();
 
   m_editFullPathChangeConn = Preferences::instance().general.editFullPath.AfterChange.connect(
@@ -94,7 +104,6 @@ void FilenameField::onSetEditFullPath()
 void FilenameField::onBrowse()
 {
   const gfx::Rect bounds = m_button.bounds();
-  m_button.setSelected(false);
 
   ui::Menu menu;
   ui::MenuItem choose(Strings::select_file_choose());
@@ -107,6 +116,11 @@ void FilenameField::onBrowse()
   menu.addChild(&relative);
   menu.addChild(&absolute);
 
+  if (auto* recent = App::instance()->recentFiles()) {
+    addFoldersToMenu(&menu, recent->pinnedFolders(), Strings::file_selector_pinned_folders());
+    addFoldersToMenu(&menu, recent->recentFolders(), Strings::file_selector_recent_folders());
+  }
+
   choose.Click.connect([this] {
     std::string fn = SelectOutputFile();
     if (!fn.empty()) {
@@ -120,6 +134,21 @@ void FilenameField::onBrowse()
   menu.showPopup(gfx::Point(bounds.x, bounds.y2()), display());
 }
 
+void FilenameField::addFoldersToMenu(ui::Menu* menu,
+                                     const base::paths& folders,
+                                     const std::string& separatorTitle)
+{
+  if (folders.empty())
+    return;
+
+  menu->addChild(new ui::Separator(separatorTitle, ui::HORIZONTAL));
+  for (const std::string& folder : folders) {
+    MenuItem* folderItem = new MenuItem(folder);
+    folderItem->Click.connect([this, folder] { setFilename(base::join_path(folder, m_file)); });
+    menu->addChild(folderItem);
+  }
+}
+
 void FilenameField::setFilename(const std::string& pathAndFilename)
 {
   const std::string spritePath = base::get_file_path(m_docFilename);
@@ -164,11 +193,6 @@ void FilenameField::onInitTheme(ui::InitThemeEvent& ev)
 {
   HBox::onInitTheme(ev);
   setChildSpacing(0);
-
-  auto theme = skin::SkinTheme::get(this);
-  ui::Style* style = theme->styles.miniButton();
-  if (style)
-    m_button.setStyle(style);
 }
 
 void FilenameField::onUpdateText()
@@ -181,9 +205,9 @@ void FilenameField::updateWidgets()
   if (m_entry)
     m_entry->setText(displayedFilename());
   else if (m_file.empty())
-    m_button.setText(Strings::select_file_text());
+    m_button.getItem(0)->setText(Strings::select_file_text());
   else
-    m_button.setText(displayedFilename());
+    m_button.getItem(0)->setText(displayedFilename());
 
   Change();
 }
diff --git a/src/app/ui/filename_field.h b/src/app/ui/filename_field.h
index d69e6f7f2..746e016c0 100644
--- a/src/app/ui/filename_field.h
+++ b/src/app/ui/filename_field.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -8,14 +8,19 @@
 #define APP_UI_FILENAME_FIELD_H_INCLUDED
 #pragma once
 
+#include "app/ui/button_set.h"
+#include "base/paths.h"
 #include "obs/connection.h"
 #include "obs/signal.h"
 #include "ui/box.h"
-#include "ui/button.h"
 #include "ui/entry.h"
 
 #include <string>
 
+namespace ui {
+class Menu;
+}
+
 namespace app {
 
 class FilenameField : public ui::HBox {
@@ -44,17 +49,25 @@ protected:
   void onSetEditFullPath();
 
 private:
+  class FilenameButton : public ButtonSet {
+  public:
+    FilenameButton(const std::string& text);
+  };
+
   void setEditFullPath(const bool on);
   void updateWidgets();
   void onBrowse();
   std::string updatedFilename() const;
+  void addFoldersToMenu(ui::Menu* menu,
+                        const base::paths& folders,
+                        const std::string& separatorTitle);
 
   std::string m_path;
   std::string m_pathBase;
   std::string m_file;
   std::string m_docFilename;
   ui::Entry* m_entry;
-  ui::Button m_button;
+  FilenameButton m_button;
   bool m_editFullPath;
   bool m_askOverwrite;
 
diff --git a/src/app/ui/font_entry.cpp b/src/app/ui/font_entry.cpp
index f3a342724..24dcafeb9 100644
--- a/src/app/ui/font_entry.cpp
+++ b/src/app/ui/font_entry.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2024  Igara Studio S.A.
+// Copyright (c) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -12,18 +12,25 @@
 
 #include "app/app.h"
 #include "app/console.h"
+#include "app/i18n/strings.h"
 #include "app/recent_files.h"
 #include "app/ui/font_popup.h"
 #include "app/ui/skin/skin_theme.h"
+#include "base/contains.h"
+#include "base/convert_to.h"
 #include "base/scoped_value.h"
 #include "fmt/format.h"
 #include "ui/display.h"
+#include "ui/fit_bounds.h"
 #include "ui/manager.h"
 #include "ui/message.h"
 #include "ui/scale.h"
 
+#include "font_style.xml.h"
+
 #include <algorithm>
 #include <cstdlib>
+#include <vector>
 
 namespace app {
 
@@ -51,18 +58,12 @@ bool FontEntry::FontFace::onProcessMessage(Message* msg)
         MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
         const gfx::Point screenPos = mouseMsg->display()->nativeWindow()->pointToScreen(
           mouseMsg->position());
-        Widget* pick = manager()->pickFromScreenPos(screenPos);
+        Manager* mgr = manager();
+        Widget* pick = mgr->pickFromScreenPos(screenPos);
         Widget* target = m_popup->getListBox();
 
         if (pick && (pick == target || pick->hasAncestor(target))) {
-          releaseMouse();
-
-          MouseMessage mouseMsg2(kMouseDownMessage,
-                                 *mouseMsg,
-                                 mouseMsg->positionForDisplay(pick->display()));
-          mouseMsg2.setRecipient(pick);
-          mouseMsg2.setDisplay(pick->display());
-          pick->sendMessage(&mouseMsg2);
+          mgr->transferAsMouseDownMessage(this, pick, mouseMsg);
           return true;
         }
       }
@@ -70,6 +71,9 @@ bool FontEntry::FontFace::onProcessMessage(Message* msg)
 
     case kMouseDownMessage:
     case kFocusEnterMessage:
+      if (!isEnabled())
+        break;
+
       if (!m_popup) {
         try {
           const FontInfo info = fontEntry()->info();
@@ -164,6 +168,12 @@ void FontEntry::FontFace::onChange()
   base::ScopedValue lock(m_fromEntryChange, true);
   SearchEntry::onChange();
 
+  // This shouldn't happen, but we received crash reports where the
+  // m_popup is nullptr here.
+  ASSERT(m_popup);
+  if (!m_popup)
+    return;
+
   m_popup->setSearchText(text());
 
   // Changing the search text doesn't generate a FontChange
@@ -205,8 +215,13 @@ void FontEntry::FontFace::onCloseIconPressed()
     std::sort(pinnedFonts.begin(), pinnedFonts.end());
   }
 
-  // Refill the list with the new pinned/unpinned item
-  m_popup->recreatePinnedItems();
+  // This shouldn't happen, but we received crash reports where the
+  // m_popup is nullptr here.
+  ASSERT(m_popup);
+  if (m_popup) {
+    // Refill the list with the new pinned/unpinned item
+    m_popup->recreatePinnedItems();
+  }
 
   invalidate();
 }
@@ -214,8 +229,33 @@ void FontEntry::FontFace::onCloseIconPressed()
 FontEntry::FontSize::FontSize()
 {
   setEditable(true);
-  for (int i : { 8, 9, 10, 11, 12, 14, 16, 18, 22, 24, 26, 28, 36, 48, 72 })
-    addItem(fmt::format("{}", i));
+}
+
+void FontEntry::FontSize::updateForFont(const FontInfo& info)
+{
+  std::vector<int> values = { 8, 9, 10, 11, 12, 14, 16, 18, 22, 24, 26, 28, 36, 48, 72 };
+  int h = 0;
+
+  // For SpriteSheet fonts we can offer the specific size that matches
+  // the bitmap font (+ x2 + x3)
+  text::FontRef font = Fonts::instance()->fontFromInfo(info);
+  if (font && font->type() == text::FontType::SpriteSheet) {
+    h = int(font->defaultSize());
+    if (h > 0) {
+      for (int i = h; i < h * 4; i += h) {
+        if (!base::contains(values, i))
+          values.insert(std::upper_bound(values.begin(), values.end(), i), i);
+      }
+    }
+  }
+
+  deleteAllItems();
+  for (int i : values) {
+    if (h && (i % h) == 0)
+      addItem(fmt::format("{}*", i));
+    else
+      addItem(fmt::format("{}", i));
+  }
 }
 
 void FontEntry::FontSize::onEntryChange()
@@ -224,31 +264,91 @@ void FontEntry::FontSize::onEntryChange()
   Change();
 }
 
-FontEntry::FontStyle::FontStyle() : ButtonSet(2, true)
+FontEntry::FontStyle::FontStyle(ui::TooltipManager* tooltips) : ButtonSet(3, true)
 {
   addItem("B");
   addItem("I");
+  addItem("...");
   setMultiMode(MultiMode::Set);
+
+  tooltips->addTooltipFor(getItem(0), Strings::text_tool_bold(), BOTTOM);
+  tooltips->addTooltipFor(getItem(1), Strings::text_tool_italic(), BOTTOM);
+  tooltips->addTooltipFor(getItem(2), Strings::text_tool_more_options(), BOTTOM);
 }
 
-FontEntry::FontLigatures::FontLigatures() : ButtonSet(1, true)
+FontEntry::FontStroke::FontStroke(ui::TooltipManager* tooltips) : m_fill(2)
 {
-  addItem("fi");
-  setMultiMode(MultiMode::Set);
+  auto* theme = skin::SkinTheme::get(this);
+
+  m_fill.addItem(theme->parts.toolFilledRectangle(), theme->styles.contextBarButton());
+  m_fill.addItem(theme->parts.toolRectangle(), theme->styles.contextBarButton());
+  m_fill.setSelectedItem(0);
+  m_fill.ItemChange.connect([this] { Change(); });
+
+  m_stroke.setText("0");
+  m_stroke.setSuffix("pt");
+  m_stroke.ValueChange.connect([this] { Change(); });
+
+  addChild(&m_fill);
+  addChild(&m_stroke);
+
+  tooltips->addTooltipFor(m_fill.getItem(0), Strings::shape_fill(), BOTTOM);
+  tooltips->addTooltipFor(m_fill.getItem(1), Strings::shape_stroke(), BOTTOM);
+  tooltips->addTooltipFor(&m_stroke, Strings::shape_stroke_width(), BOTTOM);
 }
 
-FontEntry::FontEntry() : m_antialias("Antialias")
+bool FontEntry::FontStroke::fill() const
+{
+  return const_cast<FontStroke*>(this)->m_fill.getItem(0)->isSelected();
+}
+
+float FontEntry::FontStroke::stroke() const
+{
+  return m_stroke.textDouble();
+}
+
+FontEntry::FontStroke::WidthEntry::WidthEntry() : ui::IntEntry(0, 100, this)
+{
+}
+
+void FontEntry::FontStroke::WidthEntry::onValueChange()
+{
+  ui::IntEntry::onValueChange();
+  ValueChange();
+}
+
+bool FontEntry::FontStroke::WidthEntry::onAcceptUnicodeChar(int unicodeChar)
+{
+  return (IntEntry::onAcceptUnicodeChar(unicodeChar) || unicodeChar == '.');
+}
+
+std::string FontEntry::FontStroke::WidthEntry::onGetTextFromValue(int value)
+{
+  return fmt::format("{:.1f}", value / 10.0);
+}
+
+int FontEntry::FontStroke::WidthEntry::onGetValueFromText(const std::string& text)
+{
+  return int(10.0 * base::convert_to<double>(text));
+}
+
+FontEntry::FontEntry(const bool withStrokeAndFill)
+  : m_style(&m_tooltips)
+  , m_stroke(withStrokeAndFill ? std::make_unique<FontStroke>(&m_tooltips) : nullptr)
 {
   m_face.setExpansive(true);
   m_size.setExpansive(false);
   m_style.setExpansive(false);
-  m_ligatures.setExpansive(false);
-  m_antialias.setExpansive(false);
+
+  addChild(&m_tooltips);
   addChild(&m_face);
   addChild(&m_size);
   addChild(&m_style);
-  addChild(&m_ligatures);
-  addChild(&m_antialias);
+  if (m_stroke)
+    addChild(m_stroke.get());
+
+  m_tooltips.addTooltipFor(&m_face, Strings::text_tool_font_family(), BOTTOM);
+  m_tooltips.addTooltipFor(m_size.getEntryWidget(), Strings::text_tool_font_size(), BOTTOM);
 
   m_face.setMinSize(gfx::Size(128 * guiscale(), 0));
 
@@ -256,52 +356,22 @@ FontEntry::FontEntry() : m_antialias("Antialias")
     if (newTypeName.size() > 0)
       setInfo(newTypeName, from);
     else {
-      setInfo(FontInfo(newTypeName, m_info.size(), m_info.style(), m_info.flags()), from);
+      setInfo(
+        FontInfo(newTypeName, m_info.size(), m_info.style(), m_info.flags(), m_info.hinting()),
+        from);
     }
     invalidate();
   });
 
   m_size.Change.connect([this]() {
     const float newSize = std::strtof(m_size.getValue().c_str(), nullptr);
-    setInfo(FontInfo(m_info, newSize, m_info.style(), m_info.flags()), From::Size);
+    setInfo(FontInfo(m_info, newSize, m_info.style(), m_info.flags(), m_info.hinting()),
+            From::Size);
   });
 
-  m_style.ItemChange.connect([this](ButtonSet::Item* item) {
-    text::FontStyle style = m_info.style();
-    switch (m_style.getItemIndex(item)) {
-      // Bold button changed
-      case 0: {
-        const bool bold = m_style.getItem(0)->isSelected();
-        style = text::FontStyle(
-          bold ? text::FontStyle::Weight::Bold : text::FontStyle::Weight::Normal,
-          style.width(),
-          style.slant());
-        break;
-      }
-      // Italic button changed
-      case 1: {
-        const bool italic = m_style.getItem(1)->isSelected();
-        style = text::FontStyle(
-          style.weight(),
-          style.width(),
-          italic ? text::FontStyle::Slant::Italic : text::FontStyle::Slant::Upright);
-        break;
-      }
-    }
-
-    setInfo(FontInfo(m_info, m_info.size(), style, m_info.flags()), From::Style);
-  });
-
-  auto flagsChange = [this]() {
-    FontInfo::Flags flags = FontInfo::Flags::None;
-    if (m_antialias.isSelected())
-      flags |= FontInfo::Flags::Antialias;
-    if (m_ligatures.getItem(0)->isSelected())
-      flags |= FontInfo::Flags::Ligatures;
-    setInfo(FontInfo(m_info, m_info.size(), m_info.style(), flags), From::Flags);
-  };
-  m_ligatures.ItemChange.connect(flagsChange);
-  m_antialias.Click.connect(flagsChange);
+  m_style.ItemChange.connect(&FontEntry::onStyleItemClick, this);
+  if (m_stroke)
+    m_stroke->Change.connect(&FontEntry::onStrokeChange, this);
 }
 
 // Defined here as FontPopup type is not fully defined in the header
@@ -317,20 +387,122 @@ void FontEntry::setInfo(const FontInfo& info, const From fromField)
   if (fromField != From::Face)
     m_face.setText(info.title());
 
-  if (fromField != From::Size)
+  if (fromField != From::Size) {
+    m_size.updateForFont(info);
     m_size.setValue(fmt::format("{}", info.size()));
+  }
 
   if (fromField != From::Style) {
     m_style.getItem(0)->setSelected(info.style().weight() >= text::FontStyle::Weight::SemiBold);
     m_style.getItem(1)->setSelected(info.style().slant() != text::FontStyle::Slant::Upright);
   }
 
-  if (fromField != From::Flags) {
-    m_ligatures.getItem(0)->setSelected(info.ligatures());
-    m_antialias.setSelected(info.antialias());
-  }
-
   FontChange(m_info, fromField);
 }
 
+ui::Paint FontEntry::paint()
+{
+  ui::Paint paint;
+  ui::Paint::Style style = ui::Paint::Fill;
+
+  if (m_stroke) {
+    const float stroke = m_stroke->stroke();
+    if (m_stroke->fill()) {
+      if (stroke > 0.0f) {
+        style = ui::Paint::StrokeAndFill;
+        paint.strokeWidth(stroke);
+      }
+    }
+    else {
+      style = ui::Paint::Stroke;
+      paint.strokeWidth(stroke);
+    }
+  }
+
+  paint.style(style);
+  return paint;
+}
+
+void FontEntry::onStyleItemClick(ButtonSet::Item* item)
+{
+  text::FontStyle style = m_info.style();
+
+  switch (m_style.getItemIndex(item)) {
+    // Bold button changed
+    case 0: {
+      const bool bold = m_style.getItem(0)->isSelected();
+      style = text::FontStyle(
+        bold ? text::FontStyle::Weight::Bold : text::FontStyle::Weight::Normal,
+        style.width(),
+        style.slant());
+
+      setInfo(FontInfo(m_info, m_info.size(), style, m_info.flags(), m_info.hinting()),
+              From::Style);
+      break;
+    }
+      // Italic button changed
+    case 1: {
+      const bool italic = m_style.getItem(1)->isSelected();
+      style = text::FontStyle(
+        style.weight(),
+        style.width(),
+        italic ? text::FontStyle::Slant::Italic : text::FontStyle::Slant::Upright);
+
+      setInfo(FontInfo(m_info, m_info.size(), style, m_info.flags(), m_info.hinting()),
+              From::Style);
+      break;
+    }
+    case 2: {
+      item->setSelected(false); // Unselect the "..." button
+
+      ui::PopupWindow popup;
+      app::gen::FontStyle content;
+
+      content.antialias()->setSelected(m_info.antialias());
+      content.ligatures()->setSelected(m_info.ligatures());
+      content.hinting()->setSelected(m_info.hinting() == text::FontHinting::Normal);
+
+      auto flagsChange = [this, &content]() {
+        FontInfo::Flags flags = FontInfo::Flags::None;
+        if (content.antialias()->isSelected())
+          flags |= FontInfo::Flags::Antialias;
+        if (content.ligatures()->isSelected())
+          flags |= FontInfo::Flags::Ligatures;
+        setInfo(FontInfo(m_info, m_info.size(), m_info.style(), flags, m_info.hinting()),
+                From::Flags);
+      };
+
+      auto hintingChange = [this, &content]() {
+        auto hinting = (content.hinting()->isSelected() ? text::FontHinting::Normal :
+                                                          text::FontHinting::None);
+
+        setInfo(FontInfo(m_info, m_info.size(), m_info.style(), m_info.flags(), hinting),
+                From::Hinting);
+      };
+
+      content.antialias()->Click.connect(flagsChange);
+      content.ligatures()->Click.connect(flagsChange);
+      content.hinting()->Click.connect(hintingChange);
+
+      popup.addChild(&content);
+      popup.remapWindow();
+
+      gfx::Rect rc = item->bounds();
+      rc.y += rc.h - popup.border().bottom();
+
+      ui::fit_bounds(display(), &popup, gfx::Rect(rc.origin(), popup.sizeHint()));
+
+      popup.Open.connect([&popup] { popup.setHotRegion(gfx::Region(popup.boundsOnScreen())); });
+
+      popup.openWindowInForeground();
+      break;
+    }
+  }
+}
+
+void FontEntry::onStrokeChange()
+{
+  FontChange(m_info, From::Paint);
+}
+
 } // namespace app
diff --git a/src/app/ui/font_entry.h b/src/app/ui/font_entry.h
index dcd71606e..7bd94beb2 100644
--- a/src/app/ui/font_entry.h
+++ b/src/app/ui/font_entry.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2024  Igara Studio S.A.
+// Copyright (c) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -8,13 +8,17 @@
 #define APP_UI_FONT_ENTRY_H_INCLUDED
 #pragma once
 
-#include "app/font_info.h"
+#include "app/fonts/font_info.h"
 #include "app/ui/button_set.h"
 #include "app/ui/search_entry.h"
 #include "ui/box.h"
 #include "ui/button.h"
 #include "ui/combobox.h"
+#include "ui/int_entry.h"
+#include "ui/paint.h"
+#include "ui/tooltips.h"
 
+#include <memory>
 #include <string>
 
 namespace app {
@@ -28,18 +32,25 @@ public:
     Size,
     Style,
     Flags,
+    Hinting,
     Popup,
+    Paint,
   };
 
-  FontEntry();
+  FontEntry(bool withStrokeAndFill);
   ~FontEntry();
 
   FontInfo info() { return m_info; }
   void setInfo(const FontInfo& info, From from);
 
+  ui::Paint paint();
+
   obs::signal<void(const FontInfo&, From)> FontChange;
 
 private:
+  void onStyleItemClick(ButtonSet::Item* item);
+  void onStrokeChange();
+
   class FontFace : public SearchEntry {
   public:
     FontFace();
@@ -62,6 +73,7 @@ private:
   class FontSize : public ui::ComboBox {
   public:
     FontSize();
+    void updateForFont(const FontInfo& info);
 
   protected:
     void onEntryChange() override;
@@ -69,20 +81,40 @@ private:
 
   class FontStyle : public ButtonSet {
   public:
-    FontStyle();
+    FontStyle(ui::TooltipManager* tooltips);
   };
 
-  class FontLigatures : public ButtonSet {
+  class FontStroke : public HBox {
   public:
-    FontLigatures();
+    FontStroke(ui::TooltipManager* tooltips);
+    bool fill() const;
+    float stroke() const;
+    obs::signal<void()> Change;
+
+  private:
+    class WidthEntry : public ui::IntEntry,
+                       public ui::SliderDelegate {
+    public:
+      WidthEntry();
+      obs::signal<void()> ValueChange;
+
+    private:
+      void onValueChange() override;
+      bool onAcceptUnicodeChar(int unicodeChar) override;
+      // SliderDelegate impl
+      std::string onGetTextFromValue(int value) override;
+      int onGetValueFromText(const std::string& text) override;
+    };
+    ButtonSet m_fill;
+    WidthEntry m_stroke;
   };
 
+  ui::TooltipManager m_tooltips;
   FontInfo m_info;
   FontFace m_face;
   FontSize m_size;
   FontStyle m_style;
-  FontLigatures m_ligatures;
-  ui::CheckBox m_antialias;
+  std::unique_ptr<FontStroke> m_stroke;
   bool m_lockFace = false;
 };
 
diff --git a/src/app/ui/font_popup.cpp b/src/app/ui/font_popup.cpp
index cd083de70..891b5bb80 100644
--- a/src/app/ui/font_popup.cpp
+++ b/src/app/ui/font_popup.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -13,13 +13,14 @@
 
 #include "app/app.h"
 #include "app/file_selector.h"
-#include "app/font_info.h"
-#include "app/font_path.h"
+#include "app/fonts/font_data.h"
+#include "app/fonts/font_info.h"
+#include "app/fonts/font_path.h"
+#include "app/fonts/fonts.h"
 #include "app/i18n/strings.h"
 #include "app/match_words.h"
 #include "app/recent_files.h"
 #include "app/ui/separator_in_view.h"
-#include "app/ui/skin/font_data.h"
 #include "app/ui/skin/skin_theme.h"
 #include "app/util/conversion_to_surface.h"
 #include "app/util/render_text.h"
@@ -38,6 +39,7 @@
 #include "ui/message.h"
 #include "ui/paint_event.h"
 #include "ui/size_hint_event.h"
+#include "ui/system.h"
 #include "ui/theme.h"
 #include "ui/view.h"
 
@@ -56,7 +58,18 @@ namespace app {
 
 using namespace ui;
 
-static std::map<std::string, os::SurfaceRef> g_thumbnails;
+namespace {
+
+struct ThumbnailInfo {
+  os::SurfaceRef surface;
+  float baseline = 0.0f;
+  float descent = 0.0f;
+  float ascent = 0.0f;
+};
+
+static std::map<std::string, ThumbnailInfo> g_thumbnails;
+
+} // namespace
 
 class FontItem : public ListItem {
 public:
@@ -108,52 +121,100 @@ public:
   obs::signal<void()> ThumbnailGenerated;
 
 private:
-  void getCachedThumbnail() { m_thumbnail = g_thumbnails[m_fontInfo.thumbnailId()]; }
+  void getCachedThumbnail()
+  {
+    auto it = g_thumbnails.find(m_fontInfo.thumbnailId());
+    if (it == g_thumbnails.end())
+      return;
+    m_thumbnail = it->second;
+  }
+
+  float onGetTextBaseline() const override
+  {
+    text::FontMetrics metrics;
+    font()->metrics(&metrics);
+    const float descent = std::max<float>(metrics.descent, m_thumbnail.descent);
+    return bounds().h - descent;
+  }
 
   void onPaint(PaintEvent& ev) override
   {
     ListItem::onPaint(ev);
 
     generateThumbnail();
+    if (!m_thumbnail.surface)
+      return;
 
-    if (m_thumbnail) {
-      const auto* theme = app::skin::SkinTheme::get(this);
-      Graphics* g = ev.graphics();
-      g->drawColoredRgbaSurface(m_thumbnail.get(), theme->colors.text(), textWidth() + 4, 0);
-    }
+    Graphics* g = ev.graphics();
+    const auto* theme = app::skin::SkinTheme::get(this);
+    const float y = textBaseline() - m_thumbnail.baseline;
+
+    g->drawColoredRgbaSurface(m_thumbnail.surface.get(),
+                              theme->colors.text(),
+                              textWidth() + 4 * guiscale(),
+                              y);
   }
 
   void onSizeHint(SizeHintEvent& ev) override
   {
     ListItem::onSizeHint(ev);
-    if (m_thumbnail) {
-      gfx::Size sz = ev.sizeHint();
-      ev.setSizeHint(sz.w + 4 + m_thumbnail->width(), std::max(sz.h, m_thumbnail->height()));
-    }
+    if (!m_thumbnail.surface)
+      return;
+
+    text::FontMetrics metrics;
+    font()->metrics(&metrics);
+    const float lineHeight = std::max<float>(metrics.descent, m_thumbnail.descent) -
+                             std::min<float>(metrics.ascent, m_thumbnail.ascent);
+
+    gfx::Size sz = ev.sizeHint();
+    ev.setSizeHint(sz.w + 4 * guiscale() + m_thumbnail.surface->width(),
+                   std::max<float>(sz.h, lineHeight));
   }
 
   void generateThumbnail()
   {
-    if (m_thumbnail)
+    if (m_thumbnail.surface)
       return;
 
-    const auto* theme = app::skin::SkinTheme::get(this);
-
     try {
+      Fonts* fonts = Fonts::instance();
       const FontInfo fontInfoDefSize(m_fontInfo,
                                      FontInfo::kDefaultSize,
                                      text::FontStyle(),
-                                     FontInfo::Flags::Antialias);
+                                     FontInfo::Flags::Antialias,
+                                     text::FontHinting::Normal);
+      const text::FontRef font = fonts->fontFromInfo(fontInfoDefSize);
+      if (!font)
+        return;
 
-      doc::ImageRef image = render_text(fontInfoDefSize, text(), gfx::rgba(0, 0, 0));
+      if (font->type() != text::FontType::SpriteSheet)
+        font->setSize(12.0f);
+
+      text::TextBlobRef blob = text::TextBlob::MakeWithShaper(fonts->fontMgr(), font, text());
+      if (!blob)
+        return;
+
+      ui::Paint paint;
+      paint.color(gfx::rgba(0, 0, 0));
+      paint.style(ui::Paint::Fill);
+      const gfx::RectF textBounds = get_text_blob_required_bounds(blob);
+      doc::ImageRef image = render_text_blob(blob, textBounds, paint);
       if (!image)
         return;
 
+      // This font metrics
+      text::FontMetrics metrics;
+      font->metrics(&metrics);
+      m_thumbnail.baseline = blob->baseline();
+      m_thumbnail.descent = metrics.descent;
+      m_thumbnail.ascent = metrics.ascent;
+
       // Convert the doc::Image into a os::Surface
-      m_thumbnail = os::System::instance()->makeRgbaSurface(image->width(), image->height());
+      m_thumbnail.surface = os::System::instance()->makeRgbaSurface(image->width(),
+                                                                    image->height());
       convert_image_to_surface(image.get(),
                                nullptr,
-                               m_thumbnail.get(),
+                               m_thumbnail.surface.get(),
                                0,
                                0,
                                0,
@@ -173,7 +234,7 @@ private:
 
   void onSelect(bool selected) override
   {
-    if (!selected || m_thumbnail)
+    if (!selected || m_thumbnail.surface)
       return;
 
     ListBox* listbox = static_cast<ListBox*>(parent());
@@ -185,7 +246,7 @@ private:
   }
 
 private:
-  os::SurfaceRef m_thumbnail;
+  ThumbnailInfo m_thumbnail;
   FontInfo m_fontInfo;
   text::FontStyleSetRef m_set;
 };
@@ -242,8 +303,9 @@ FontPopup::FontPopup(const FontInfo& fontInfo)
   m_listBox.addChild(m_pinnedSeparator);
 
   // Default fonts
+  Fonts* fonts = Fonts::instance();
   bool first = true;
-  for (auto kv : skin::SkinTheme::get(this)->getWellKnownFonts()) {
+  for (const auto& kv : fonts->definedFonts()) {
     if (!kv.second->filename().empty()) {
       if (first) {
         m_listBox.addChild(new SeparatorInView(Strings::font_popup_theme_fonts()));
@@ -254,75 +316,17 @@ FontPopup::FontPopup(const FontInfo& fontInfo)
   }
 
   // Create one FontItem for each font
-  m_listBox.addChild(new SeparatorInView(Strings::font_popup_system_fonts()));
-  bool empty = true;
+  m_systemFontsSeparator = new SeparatorInView(Strings::font_popup_system_fonts());
+  m_listBox.addChild(m_systemFontsSeparator);
 
-  // Get system fonts from laf-text module
-  const text::FontMgrRef fontMgr = theme()->fontMgr();
-  const int n = fontMgr->countFamilies();
-  if (n > 0) {
-    for (int i = 0; i < n; ++i) {
-      std::string name = fontMgr->familyName(i);
-      text::FontStyleSetRef set = fontMgr->familyStyleSet(i);
-      if (set && set->count() > 0) {
-        // Match the typeface with the default FontStyle (Normal
-        // weight, Upright slant, etc.)
-        auto typeface = set->matchStyle(text::FontStyle());
-        if (typeface) {
-          auto* item = new FontItem(name, typeface->fontStyle(), set);
-          item->ThumbnailGenerated.connect([this] { onThumbnailGenerated(); });
-          m_listBox.addChild(item);
-          empty = false;
-        }
-      }
-    }
-  }
-  // Get fonts listing .ttf files TODO we should be able to remove
-  // this code in the future (probably after DirectWrite API is always
-  // available).
-  else {
-    base::paths fontDirs;
-    get_font_dirs(fontDirs);
-
-    // Create a list of fullpaths to every font found in all font
-    // directories (fontDirs)
-    base::paths files;
-    for (const auto& fontDir : fontDirs) {
-      for (const auto& file : base::list_files(fontDir, base::ItemType::Files)) {
-        files.push_back(base::join_path(fontDir, file));
-      }
-    }
-
-    // Sort all files by "file title"
-    std::sort(files.begin(), files.end(), [](const std::string& a, const std::string& b) {
-      return base::utf8_icmp(base::get_file_title(a), base::get_file_title(b)) < 0;
-    });
-
-    for (auto& file : files) {
-      std::string ext = base::string_to_lower(base::get_file_extension(file));
-      if (ext == "ttf" || ext == "ttc" || ext == "otf" || ext == "dfont") {
-        m_listBox.addChild(new FontItem(file));
-        empty = false;
-      }
-    }
-  }
-
-  if (empty)
-    m_listBox.addChild(new ListItem(Strings::font_popup_empty_fonts()));
-
-  for (auto* child : m_listBox.children()) {
-    if (auto* childItem = dynamic_cast<FontItem*>(child)) {
-      if (childItem->fontInfo().title() == childItem->text()) {
-        m_listBox.selectChild(childItem);
-        break;
-      }
-    }
-  }
+  m_listFontsTask.run([this](base::task_token& token) { listSystemFonts(token); });
 }
 
 FontPopup::~FontPopup()
 {
   m_timer.stop();
+  m_listFontsTask.cancel();
+  m_listFontsTask.wait();
 }
 
 void FontPopup::setSearchText(const std::string& searchText)
@@ -428,7 +432,8 @@ void FontPopup::onThumbnailGenerated()
 void FontPopup::onTickRelayout()
 {
   m_popup->view()->updateView();
-  m_timer.stop();
+  if (!m_listFontsTask.running())
+    m_timer.stop();
 }
 
 bool FontPopup::onProcessMessage(ui::Message* msg)
@@ -449,4 +454,105 @@ bool FontPopup::onProcessMessage(ui::Message* msg)
   return ui::PopupWindow::onProcessMessage(msg);
 }
 
+void FontPopup::listSystemFonts(base::task_token& token)
+{
+  Fonts* fonts = Fonts::instance();
+  bool empty = true;
+
+  // Get system fonts from laf-text module
+  const text::FontMgrRef fontMgr = fonts->fontMgr();
+  const int n = fontMgr->countFamilies();
+  if (n > 0) {
+    for (int i = 0; i < n; ++i) {
+      std::string name = fontMgr->familyName(i);
+      text::FontStyleSetRef set = fontMgr->familyStyleSet(i);
+      if (set && set->count() > 0) {
+        // Match the typeface with the default FontStyle (Normal
+        // weight, Upright slant, etc.)
+        auto typeface = set->matchStyle(text::FontStyle());
+        if (typeface) {
+          ui::execute_from_ui_thread([=, &token] {
+            if (token.canceled())
+              return;
+
+            auto* item = new FontItem(name, typeface->fontStyle(), set);
+            item->ThumbnailGenerated.connect([this] { onThumbnailGenerated(); });
+
+            int j = m_listBox.getChildIndex(m_systemFontsSeparator) + 1;
+            for (; j < m_listBox.getItemsCount(); ++j) {
+              if (name < m_listBox.at(j)->text())
+                break;
+            }
+            m_listBox.insertChild(j, item);
+            layout();
+          });
+          empty = false;
+        }
+      }
+
+      if (token.canceled())
+        goto done;
+    }
+  }
+  // Get fonts listing .ttf files TODO we should be able to remove
+  // this code in the future (probably after DirectWrite API is always
+  // available).
+  else {
+    base::paths fontDirs;
+    get_font_dirs(fontDirs);
+
+    // Create a list of fullpaths to every font found in all font
+    // directories (fontDirs)
+    base::paths files;
+    for (const auto& fontDir : fontDirs) {
+      for (const auto& file : base::list_files(fontDir, base::ItemType::Files)) {
+        files.push_back(base::join_path(fontDir, file));
+        if (token.canceled())
+          goto done;
+      }
+    }
+
+    // Sort all files by "file title"
+    std::sort(files.begin(), files.end(), [](const std::string& a, const std::string& b) {
+      return base::utf8_icmp(base::get_file_title(a), base::get_file_title(b)) < 0;
+    });
+
+    for (auto& file : files) {
+      std::string ext = base::string_to_lower(base::get_file_extension(file));
+      if (ext == "ttf" || ext == "ttc" || ext == "otf" || ext == "dfont") {
+        ui::execute_from_ui_thread([this, file, &token] {
+          if (token.canceled())
+            return;
+
+          m_listBox.addChild(new FontItem(file));
+        });
+        empty = false;
+      }
+    }
+  }
+
+done:;
+  if (token.canceled())
+    return;
+
+  if (empty) {
+    ui::execute_from_ui_thread([this, &token] {
+      if (token.canceled())
+        return;
+
+      m_listBox.addChild(new ListItem(Strings::font_popup_empty_fonts()));
+      layout();
+    });
+  }
+
+  ui::execute_from_ui_thread([this, &token] {
+    if (token.canceled())
+      return;
+
+    // Stop the view relayout
+    onTickRelayout();
+    m_timer.stop();
+  });
+}
+
 } // namespace app
diff --git a/src/app/ui/font_popup.h b/src/app/ui/font_popup.h
index 3abc96a63..1e6fd2a28 100644
--- a/src/app/ui/font_popup.h
+++ b/src/app/ui/font_popup.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2021-2024  Igara Studio S.A.
+// Copyright (C) 2021-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -9,6 +9,7 @@
 #define APP_UI_FONT_POPUP_H_INCLUDED
 #pragma once
 
+#include "app/task.h"
 #include "ui/listbox.h"
 #include "ui/popup_window.h"
 #include "ui/timer.h"
@@ -57,10 +58,14 @@ protected:
   bool onProcessMessage(ui::Message* msg) override;
 
 private:
+  void listSystemFonts(base::task_token& token);
+
   gen::FontPopup* m_popup;
+  Widget* m_systemFontsSeparator;
   FontListBox m_listBox;
   ui::Timer m_timer;
   ui::Widget* m_pinnedSeparator = nullptr;
+  app::Task m_listFontsTask;
 };
 
 } // namespace app
diff --git a/src/app/ui/icon_button.cpp b/src/app/ui/icon_button.cpp
index 19e601621..85bb61291 100644
--- a/src/app/ui/icon_button.cpp
+++ b/src/app/ui/icon_button.cpp
@@ -28,12 +28,18 @@ IconButton::IconButton(const SkinPartPtr& part) : Button(""), m_part(part)
   initTheme();
 }
 
+void IconButton::setIcon(const skin::SkinPartPtr& part)
+{
+  m_part = part;
+  invalidate();
+}
+
 void IconButton::onInitTheme(InitThemeEvent& ev)
 {
-  Button::onInitTheme(ev);
-
   auto theme = SkinTheme::get(this);
   setBgColor(theme->colors.menuitemNormalFace());
+
+  Button::onInitTheme(ev);
 }
 
 void IconButton::onSizeHint(SizeHintEvent& ev)
@@ -44,7 +50,7 @@ void IconButton::onSizeHint(SizeHintEvent& ev)
 
 void IconButton::onPaint(PaintEvent& ev)
 {
-  auto theme = SkinTheme::get(this);
+  const auto* theme = SkinTheme::get(this);
   Graphics* g = ev.graphics();
   gfx::Color fg, bg;
 
@@ -61,9 +67,11 @@ void IconButton::onPaint(PaintEvent& ev)
     bg = bgColor();
   }
 
-  g->fillRect(bg, g->getClipBounds());
+  if (!isTransparent()) {
+    g->fillRect(bg, g->getClipBounds());
+  }
 
-  gfx::Rect bounds = clientBounds();
+  const gfx::Rect bounds = clientBounds();
   os::Surface* icon = m_part->bitmap(0);
   g->drawColoredRgbaSurface(icon,
                             fg,
diff --git a/src/app/ui/icon_button.h b/src/app/ui/icon_button.h
index 4a492b616..cfd2d58cb 100644
--- a/src/app/ui/icon_button.h
+++ b/src/app/ui/icon_button.h
@@ -15,7 +15,8 @@ namespace app {
 
 class IconButton : public ui::Button {
 public:
-  IconButton(const skin::SkinPartPtr& part);
+  explicit IconButton(const skin::SkinPartPtr& part);
+  void setIcon(const skin::SkinPartPtr& part);
 
 protected:
   void onInitTheme(ui::InitThemeEvent& ev) override;
diff --git a/src/app/ui/key.h b/src/app/ui/key.h
index d23507441..765c1ce10 100644
--- a/src/app/ui/key.h
+++ b/src/app/ui/key.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -13,7 +13,7 @@
 #include "app/ui/key_context.h"
 #include "base/convert_to.h"
 #include "base/vector2d.h"
-#include "ui/accelerator.h"
+#include "ui/shortcut.h"
 
 #include <memory>
 #include <utility>
@@ -106,7 +106,7 @@ inline KeyAction operator&(KeyAction a, KeyAction b)
 class Key;
 using KeyPtr = std::shared_ptr<Key>;
 using Keys = std::vector<KeyPtr>;
-using KeySourceAccelList = std::vector<std::pair<KeySource, ui::Accelerator>>;
+using KeySourceShortcutList = std::vector<std::pair<KeySource, ui::Shortcut>>;
 using DragVector = base::Vector2d<double>;
 
 class Key {
@@ -119,29 +119,26 @@ public:
   static KeyPtr MakeDragAction(WheelAction dragAction);
 
   KeyType type() const { return m_type; }
-  const ui::Accelerators& accels() const;
-  const KeySourceAccelList addsKeys() const { return m_adds; }
-  const KeySourceAccelList delsKeys() const { return m_dels; }
+  const ui::Shortcuts& shortcuts() const;
+  const KeySourceShortcutList& addsKeys() const { return m_adds; }
+  const KeySourceShortcutList& delsKeys() const { return m_dels; }
 
-  void add(const ui::Accelerator& accel, const KeySource source, KeyboardShortcuts& globalKeys);
-  const ui::Accelerator* isPressed(const ui::Message* msg,
-                                   const KeyboardShortcuts& globalKeys,
-                                   const KeyContext keyContext) const;
-  const ui::Accelerator* isPressed(const ui::Message* msg,
-                                   const KeyboardShortcuts& globalKeys) const;
+  void add(const ui::Shortcut& shortcut, KeySource source, KeyboardShortcuts& globalKeys);
+  const ui::Shortcut* isPressed(const ui::Message* msg, KeyContext keyContext) const;
+  const ui::Shortcut* isPressed(const ui::Message* msg) const;
   bool isPressed() const;
   bool isLooselyPressed() const;
   bool isCommandListed() const;
 
-  bool hasAccel(const ui::Accelerator& accel) const;
-  bool hasUserDefinedAccels() const;
+  bool hasShortcut(const ui::Shortcut& shortcut) const;
+  bool hasUserDefinedShortcuts() const;
 
   // The KeySource indicates from where the key was disabled
   // (e.g. if it was removed from an extension-defined file, or from
   // user-defined).
-  void disableAccel(const ui::Accelerator& accel, const KeySource source);
+  void disableShortcut(const ui::Shortcut& shortcut, KeySource source);
 
-  // Resets user accelerators to the original & extension-defined ones.
+  // Resets user shortcuts to the original & extension-defined ones.
   void reset();
 
   void copyOriginalToUser();
@@ -164,11 +161,11 @@ public:
 
 private:
   KeyType m_type;
-  KeySourceAccelList m_adds;
-  KeySourceAccelList m_dels;
-  // Final list of accelerators after processing the
+  KeySourceShortcutList m_adds;
+  KeySourceShortcutList m_dels;
+  // Final list of shortcuts after processing the
   // addition/deletion of extension-defined & user-defined keys.
-  mutable std::unique_ptr<ui::Accelerators> m_accels;
+  mutable std::unique_ptr<ui::Shortcuts> m_shortcuts;
   KeyContext m_keycontext;
 
   // for KeyType::Command
diff --git a/src/app/ui/keyboard_shortcuts.cpp b/src/app/ui/keyboard_shortcuts.cpp
index d4e1910e9..fe1e40002 100644
--- a/src/app/ui/keyboard_shortcuts.cpp
+++ b/src/app/ui/keyboard_shortcuts.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -28,8 +28,8 @@
 #include "app/xml_document.h"
 #include "app/xml_exception.h"
 #include "fmt/format.h"
-#include "ui/accelerator.h"
 #include "ui/message.h"
+#include "ui/shortcut.h"
 
 #include "tinyxml2.h"
 
@@ -244,13 +244,13 @@ std::string get_user_friendly_string_for_wheelaction(app::WheelAction wheelActio
     return std::string();
 }
 
-void erase_accel(app::KeySourceAccelList& kvs,
-                 const app::KeySource source,
-                 const ui::Accelerator& accel)
+void erase_shortcut(app::KeySourceShortcutList& kvs,
+                    const app::KeySource source,
+                    const ui::Shortcut& shortcut)
 {
   for (auto it = kvs.begin(); it != kvs.end();) {
     auto& kv = *it;
-    if (kv.first == source && kv.second == accel) {
+    if (kv.first == source && kv.second == shortcut) {
       it = kvs.erase(it);
     }
     else
@@ -258,7 +258,7 @@ void erase_accel(app::KeySourceAccelList& kvs,
   }
 }
 
-void erase_accels(app::KeySourceAccelList& kvs, const app::KeySource source)
+void erase_shortcuts(app::KeySourceShortcutList& kvs, const app::KeySource source)
 {
   for (auto it = kvs.begin(); it != kvs.end();) {
     auto& kv = *it;
@@ -436,104 +436,100 @@ KeyPtr Key::MakeDragAction(WheelAction dragAction)
   return k;
 }
 
-const ui::Accelerators& Key::accels() const
+const ui::Shortcuts& Key::shortcuts() const
 {
-  if (!m_accels) {
-    m_accels = std::make_unique<ui::Accelerators>();
+  if (!m_shortcuts) {
+    m_shortcuts = std::make_unique<ui::Shortcuts>();
 
     // Add default keys
     for (const auto& kv : m_adds) {
       if (kv.first == KeySource::Original)
-        m_accels->add(kv.second);
+        m_shortcuts->add(kv.second);
     }
 
     // Delete/add extension-defined keys
     for (const auto& kv : m_dels) {
       if (kv.first == KeySource::ExtensionDefined)
-        m_accels->remove(kv.second);
+        m_shortcuts->remove(kv.second);
       else {
         ASSERT(kv.first != KeySource::Original);
       }
     }
     for (const auto& kv : m_adds) {
       if (kv.first == KeySource::ExtensionDefined)
-        m_accels->add(kv.second);
+        m_shortcuts->add(kv.second);
     }
 
     // Delete/add user-defined keys
     for (const auto& kv : m_dels) {
       if (kv.first == KeySource::UserDefined)
-        m_accels->remove(kv.second);
+        m_shortcuts->remove(kv.second);
     }
     for (const auto& kv : m_adds) {
       if (kv.first == KeySource::UserDefined)
-        m_accels->add(kv.second);
+        m_shortcuts->add(kv.second);
     }
   }
-  return *m_accels;
+  return *m_shortcuts;
 }
 
-void Key::add(const ui::Accelerator& accel, const KeySource source, KeyboardShortcuts& globalKeys)
+void Key::add(const ui::Shortcut& shortcut, const KeySource source, KeyboardShortcuts& globalKeys)
 {
-  m_adds.emplace_back(source, accel);
-  m_accels.reset();
+  m_adds.emplace_back(source, shortcut);
+  m_shortcuts.reset();
 
-  // Remove the accelerator from other commands
+  // Remove the shortcut from other commands
   if (source == KeySource::ExtensionDefined || source == KeySource::UserDefined) {
-    erase_accel(m_dels, source, accel);
+    erase_shortcut(m_dels, source, shortcut);
 
-    globalKeys.disableAccel(accel, source, m_keycontext, this);
+    globalKeys.disableShortcut(shortcut, source, m_keycontext, this);
   }
 }
 
-const ui::Accelerator* Key::isPressed(const Message* msg,
-                                      const KeyboardShortcuts& globalKeys,
-                                      const KeyContext keyContext) const
+const ui::Shortcut* Key::isPressed(const Message* msg, const KeyContext keyContext) const
 {
-  if (auto keyMsg = dynamic_cast<const KeyMessage*>(msg)) {
-    for (const Accelerator& accel : accels()) {
-      if (accel.isPressed(keyMsg->modifiers(), keyMsg->scancode(), keyMsg->unicodeChar()) &&
+  if (const auto* keyMsg = dynamic_cast<const KeyMessage*>(msg)) {
+    for (const Shortcut& shortcut : shortcuts()) {
+      if (shortcut.isPressed(keyMsg->modifiers(), keyMsg->scancode(), keyMsg->unicodeChar()) &&
           (m_keycontext == KeyContext::Any || m_keycontext == keyContext)) {
-        return &accel;
+        return &shortcut;
       }
     }
   }
-  else if (auto mouseMsg = dynamic_cast<const MouseMessage*>(msg)) {
-    for (const Accelerator& accel : accels()) {
-      if ((accel.modifiers() == mouseMsg->modifiers()) &&
+  else if (const auto* mouseMsg = dynamic_cast<const MouseMessage*>(msg)) {
+    for (const Shortcut& shortcut : shortcuts()) {
+      if ((shortcut.modifiers() == mouseMsg->modifiers()) &&
           (m_keycontext == KeyContext::Any ||
            // TODO we could have multiple mouse wheel key-context,
            // like "sprite editor" context, or "timeline" context,
            // etc.
            m_keycontext == KeyContext::MouseWheel)) {
-        return &accel;
+        return &shortcut;
       }
     }
   }
   return nullptr;
 }
 
-const ui::Accelerator* Key::isPressed(const Message* msg, const KeyboardShortcuts& globalKeys) const
+const ui::Shortcut* Key::isPressed(const Message* msg) const
 {
-  return isPressed(msg, globalKeys, globalKeys.getCurrentKeyContext());
+  return isPressed(msg, KeyboardShortcuts::getCurrentKeyContext());
 }
 
 bool Key::isPressed() const
 {
-  for (const Accelerator& accel : this->accels()) {
-    if (accel.isPressed())
-      return true;
-  }
-  return false;
+  const auto& ss = this->shortcuts();
+  return std::any_of(ss.begin(), ss.end(), [](const Shortcut& shortcut) {
+    return shortcut.isPressed();
+  });
 }
 
 bool Key::isLooselyPressed() const
 {
-  for (const Accelerator& accel : this->accels()) {
-    if (accel.isLooselyPressed())
-      return true;
-  }
-  return false;
+  const auto& ss = this->shortcuts();
+  return std::any_of(ss.begin(), ss.end(), [](const Shortcut& shortcut) {
+    return shortcut.isLooselyPressed();
+  });
 }
 
 bool Key::isCommandListed() const
@@ -541,51 +537,49 @@ bool Key::isCommandListed() const
   return type() == KeyType::Command && command()->isListed(params());
 }
 
-bool Key::hasAccel(const ui::Accelerator& accel) const
+bool Key::hasShortcut(const ui::Shortcut& shortcut) const
 {
-  return accels().has(accel);
+  return shortcuts().has(shortcut);
 }
 
-bool Key::hasUserDefinedAccels() const
+bool Key::hasUserDefinedShortcuts() const
 {
-  for (const auto& kv : m_adds) {
-    if (kv.first == KeySource::UserDefined)
-      return true;
-  }
-  return false;
+  return std::any_of(m_adds.begin(), m_adds.end(), [](const auto& kv) {
+    return (kv.first == KeySource::UserDefined);
+  });
 }
 
-void Key::disableAccel(const ui::Accelerator& accel, const KeySource source)
+void Key::disableShortcut(const ui::Shortcut& shortcut, const KeySource source)
 {
   // It doesn't make sense that the default keyboard shortcuts file
-  // (gui.xml) removes some accelerator.
+  // (gui.xml) removes some shortcut.
   ASSERT(source != KeySource::Original);
 
-  erase_accel(m_adds, source, accel);
-  erase_accel(m_dels, source, accel);
+  erase_shortcut(m_adds, source, shortcut);
+  erase_shortcut(m_dels, source, shortcut);
 
-  m_dels.emplace_back(source, accel);
-  m_accels.reset();
+  m_dels.emplace_back(source, shortcut);
+  m_shortcuts.reset();
 }
 
 void Key::reset()
 {
-  erase_accels(m_adds, KeySource::UserDefined);
-  erase_accels(m_dels, KeySource::UserDefined);
-  m_accels.reset();
+  erase_shortcuts(m_adds, KeySource::UserDefined);
+  erase_shortcuts(m_dels, KeySource::UserDefined);
+  m_shortcuts.reset();
 }
 
 void Key::copyOriginalToUser()
 {
   // Erase all user-defined keys
-  erase_accels(m_adds, KeySource::UserDefined);
-  erase_accels(m_dels, KeySource::UserDefined);
+  erase_shortcuts(m_adds, KeySource::UserDefined);
+  erase_shortcuts(m_dels, KeySource::UserDefined);
 
   // Then copy all original & extension-defined keys as user-defined
   auto copy = m_adds;
   for (const auto& kv : copy)
     m_adds.emplace_back(KeySource::UserDefined, kv.second);
-  m_accels.reset();
+  m_shortcuts.reset();
 }
 
 std::string Key::triggerString() const
@@ -693,21 +687,21 @@ void KeyboardShortcuts::importFile(XMLElement* rootElement, KeySource source)
         // add the keyboard shortcut to the command
         KeyPtr key = this->command(command_name, params, keycontext);
         if (key && command_key) {
-          Accelerator accel(command_key);
+          Shortcut shortcut(command_key);
 
           if (!removed) {
-            key->add(accel, source, *this);
+            key->add(shortcut, source, *this);
 
             // Add the shortcut to the menuitems with this command
             // (this is only visual, the
             // "CustomizedGuiManager::onProcessMessage" is the only
             // one that process keyboard shortcuts)
-            if (key->accels().size() == 1) {
+            if (key->shortcuts().size() == 1) {
               AppMenus::instance()->applyShortcutToMenuitemsWithCommand(command, params, key);
             }
           }
           else
-            key->disableAccel(accel, source);
+            key->disableShortcut(shortcut, source);
         }
       }
     }
@@ -729,12 +723,12 @@ void KeyboardShortcuts::importFile(XMLElement* rootElement, KeySource source)
         KeyPtr key = this->tool(tool);
         if (key && tool_key) {
           LOG(VERBOSE, "KEYS: Shortcut for tool %s: %s\n", tool_id, tool_key);
-          Accelerator accel(tool_key);
+          Shortcut shortcut(tool_key);
 
           if (!removed)
-            key->add(accel, source, *this);
+            key->add(shortcut, source, *this);
           else
-            key->disableAccel(accel, source);
+            key->disableShortcut(shortcut, source);
         }
       }
     }
@@ -755,12 +749,12 @@ void KeyboardShortcuts::importFile(XMLElement* rootElement, KeySource source)
         KeyPtr key = this->quicktool(tool);
         if (key && tool_key) {
           LOG(VERBOSE, "KEYS: Shortcut for quicktool %s: %s\n", tool_id, tool_key);
-          Accelerator accel(tool_key);
+          Shortcut shortcut(tool_key);
 
           if (!removed)
-            key->add(accel, source, *this);
+            key->add(shortcut, source, *this);
           else
-            key->disableAccel(accel, source);
+            key->disableShortcut(shortcut, source);
         }
       }
     }
@@ -791,12 +785,12 @@ void KeyboardShortcuts::importFile(XMLElement* rootElement, KeySource source)
               action_id,
               (keycontextstr ? keycontextstr : "Any"),
               action_key);
-          Accelerator accel(action_key);
+          Shortcut shortcut(action_key);
 
           if (!removed)
-            key->add(accel, source, *this);
+            key->add(shortcut, source, *this);
           else
-            key->disableAccel(accel, source);
+            key->disableShortcut(shortcut, source);
         }
       }
     }
@@ -817,12 +811,12 @@ void KeyboardShortcuts::importFile(XMLElement* rootElement, KeySource source)
         KeyPtr key = this->wheelAction(action);
         if (key && action_key) {
           LOG(VERBOSE, "KEYS: Shortcut for wheel action %s: %s\n", action_id, action_key);
-          Accelerator accel(action_key);
+          Shortcut shortcut(action_key);
 
           if (!removed)
-            key->add(accel, source, *this);
+            key->add(shortcut, source, *this);
           else
-            key->disableAccel(accel, source);
+            key->disableShortcut(shortcut, source);
         }
       }
     }
@@ -854,12 +848,12 @@ void KeyboardShortcuts::importFile(XMLElement* rootElement, KeySource source)
           }
 
           LOG(VERBOSE, "KEYS: Shortcut for drag action %s: %s\n", action_id, action_key);
-          Accelerator accel(action_key);
+          Shortcut shortcut(action_key);
 
           if (!removed)
-            key->add(accel, source, *this);
+            key->add(shortcut, source, *this);
           else
-            key->disableAccel(accel, source);
+            key->disableShortcut(shortcut, source);
         }
       }
     }
@@ -904,24 +898,25 @@ void KeyboardShortcuts::exportFile(const std::string& filename)
 void KeyboardShortcuts::exportKeys(XMLElement* parent, KeyType type)
 {
   for (KeyPtr& key : m_keys) {
-    // Save only user defined accelerators.
+    // Save only user defined shortcuts.
     if (key->type() != type)
       continue;
 
     for (const auto& kv : key->delsKeys())
       if (kv.first == KeySource::UserDefined)
-        exportAccel(parent, key.get(), kv.second, true);
+        exportShortcut(parent, key.get(), kv.second, true);
 
     for (const auto& kv : key->addsKeys())
       if (kv.first == KeySource::UserDefined)
-        exportAccel(parent, key.get(), kv.second, false);
+        exportShortcut(parent, key.get(), kv.second, false);
   }
 }
 
-void KeyboardShortcuts::exportAccel(XMLElement* parent,
-                                    const Key* key,
-                                    const ui::Accelerator& accel,
-                                    bool removed)
+// static
+void KeyboardShortcuts::exportShortcut(XMLElement* parent,
+                                       const Key* key,
+                                       const ui::Shortcut& shortcut,
+                                       bool removed)
 {
   XMLElement* elem = parent->InsertNewChildElement("key");
 
@@ -964,7 +959,7 @@ void KeyboardShortcuts::exportAccel(XMLElement* parent,
       break;
   }
 
-  elem->SetAttribute("shortcut", accel.toString().c_str());
+  elem->SetAttribute("shortcut", shortcut.toString().c_str());
 
   if (removed)
     elem->SetAttribute("removed", "true");
@@ -1062,27 +1057,28 @@ KeyPtr KeyboardShortcuts::dragAction(const WheelAction dragAction) const
   return key;
 }
 
-void KeyboardShortcuts::disableAccel(const ui::Accelerator& accel,
-                                     const KeySource source,
-                                     const KeyContext keyContext,
-                                     const Key* newKey)
+void KeyboardShortcuts::disableShortcut(const ui::Shortcut& shortcut,
+                                        const KeySource source,
+                                        const KeyContext keyContext,
+                                        const Key* newKey)
 {
   for (KeyPtr& key : m_keys) {
-    if (key.get() != newKey && key->keycontext() == keyContext && key->hasAccel(accel) &&
+    if (key.get() != newKey && key->keycontext() == keyContext && key->hasShortcut(shortcut) &&
         // Tools can contain the same keyboard shortcut
         (key->type() != KeyType::Tool || newKey == nullptr || newKey->type() != KeyType::Tool) &&
         // DragActions can share the same keyboard shortcut (e.g. to
         // change different values using different DragVectors)
         (key->type() != KeyType::DragAction || newKey == nullptr ||
          newKey->type() != KeyType::DragAction)) {
-      key->disableAccel(accel, source);
+      key->disableShortcut(shortcut, source);
     }
   }
 }
 
-KeyContext KeyboardShortcuts::getCurrentKeyContext() const
+// static
+KeyContext KeyboardShortcuts::getCurrentKeyContext()
 {
-  auto ctx = UIContext::instance();
+  auto* ctx = UIContext::instance();
   Doc* doc = ctx->activeDocument();
   if (doc && doc->isMaskVisible() &&
       // The active key context will be the selectedTool() (in the
@@ -1116,7 +1112,7 @@ bool KeyboardShortcuts::getCommandFromKeyMessage(const Message* msg,
   int n = (contexts[0] != contexts[1] ? 2 : 1);
   for (int i = 0; i < n; ++i) {
     for (KeyPtr& key : m_keys) {
-      if (key->type() == KeyType::Command && key->isPressed(msg, *this, contexts[i])) {
+      if (key->type() == KeyType::Command && key->isPressed(msg, contexts[i])) {
         if (command)
           *command = key->command();
         if (params)
@@ -1168,12 +1164,12 @@ WheelAction KeyboardShortcuts::getWheelActionFromMouseMessage(const KeyContext c
                                                               const ui::Message* msg)
 {
   WheelAction wheelAction = WheelAction::None;
-  const ui::Accelerator* bestAccel = nullptr;
+  const ui::Shortcut* bestShortcut = nullptr;
   for (const KeyPtr& key : m_keys) {
     if (key->type() == KeyType::WheelAction && key->keycontext() == context) {
-      const ui::Accelerator* accel = key->isPressed(msg, *this);
-      if ((accel) && (!bestAccel || bestAccel->modifiers() < accel->modifiers())) {
-        bestAccel = accel;
+      const ui::Shortcut* shortcut = key->isPressed(msg);
+      if ((shortcut) && (!bestShortcut || bestShortcut->modifiers() < shortcut->modifiers())) {
+        bestShortcut = shortcut;
         wheelAction = key->wheelAction();
       }
     }
@@ -1181,15 +1177,14 @@ WheelAction KeyboardShortcuts::getWheelActionFromMouseMessage(const KeyContext c
   return wheelAction;
 }
 
-Keys KeyboardShortcuts::getDragActionsFromKeyMessage(const KeyContext context,
-                                                     const ui::Message* msg)
+Keys KeyboardShortcuts::getDragActionsFromKeyMessage(const ui::Message* msg)
 {
   KeyPtr bestKey = nullptr;
   Keys keys;
   for (const KeyPtr& key : m_keys) {
     if (key->type() == KeyType::DragAction) {
-      const ui::Accelerator* accel = key->isPressed(msg, *this);
-      if (accel) {
+      const ui::Shortcut* shortcut = key->isPressed(msg);
+      if (shortcut) {
         keys.push_back(key);
       }
     }
@@ -1199,11 +1194,9 @@ Keys KeyboardShortcuts::getDragActionsFromKeyMessage(const KeyContext context,
 
 bool KeyboardShortcuts::hasMouseWheelCustomization() const
 {
-  for (const KeyPtr& key : m_keys) {
-    if (key->type() == KeyType::WheelAction && key->hasUserDefinedAccels())
-      return true;
-  }
-  return false;
+  return std::any_of(m_keys.begin(), m_keys.end(), [](const KeyPtr& key) {
+    return (key->type() == KeyType::WheelAction && key->hasUserDefinedShortcuts());
+  });
 }
 
 void KeyboardShortcuts::clearMouseWheelKeys()
@@ -1245,38 +1238,38 @@ void KeyboardShortcuts::setDefaultMouseWheelKeys(const bool zoomWithWheel)
 
   KeyPtr key;
   key = std::make_shared<Key>(WheelAction::Zoom);
-  key->add(Accelerator(zoomWithWheel ? kKeyNoneModifier : kKeyCtrlModifier, kKeyNil, 0),
+  key->add(Shortcut(zoomWithWheel ? kKeyNoneModifier : kKeyCtrlModifier, kKeyNil, 0),
            KeySource::Original,
            *this);
   m_keys.push_back(key);
 
   if (!zoomWithWheel) {
     key = std::make_shared<Key>(WheelAction::VScroll);
-    key->add(Accelerator(kKeyNoneModifier, kKeyNil, 0), KeySource::Original, *this);
+    key->add(Shortcut(kKeyNoneModifier, kKeyNil, 0), KeySource::Original, *this);
     m_keys.push_back(key);
   }
 
   key = std::make_shared<Key>(WheelAction::HScroll);
-  key->add(Accelerator(kKeyShiftModifier, kKeyNil, 0), KeySource::Original, *this);
+  key->add(Shortcut(kKeyShiftModifier, kKeyNil, 0), KeySource::Original, *this);
   m_keys.push_back(key);
 
   key = std::make_shared<Key>(WheelAction::FgColor);
-  key->add(Accelerator(kKeyAltModifier, kKeyNil, 0), KeySource::Original, *this);
+  key->add(Shortcut(kKeyAltModifier, kKeyNil, 0), KeySource::Original, *this);
   m_keys.push_back(key);
 
   key = std::make_shared<Key>(WheelAction::BgColor);
-  key->add(Accelerator((KeyModifiers)(kKeyAltModifier | kKeyShiftModifier), kKeyNil, 0),
+  key->add(Shortcut((KeyModifiers)(kKeyAltModifier | kKeyShiftModifier), kKeyNil, 0),
            KeySource::Original,
            *this);
   m_keys.push_back(key);
 
   if (zoomWithWheel) {
     key = std::make_shared<Key>(WheelAction::BrushSize);
-    key->add(Accelerator(kKeyCtrlModifier, kKeyNil, 0), KeySource::Original, *this);
+    key->add(Shortcut(kKeyCtrlModifier, kKeyNil, 0), KeySource::Original, *this);
     m_keys.push_back(key);
 
     key = std::make_shared<Key>(WheelAction::Frame);
-    key->add(Accelerator((KeyModifiers)(kKeyCtrlModifier | kKeyShiftModifier), kKeyNil, 0),
+    key->add(Shortcut((KeyModifiers)(kKeyCtrlModifier | kKeyShiftModifier), kKeyNil, 0),
              KeySource::Original,
              *this);
     m_keys.push_back(key);
@@ -1321,9 +1314,9 @@ std::string key_tooltip(const char* str, const app::Key* key)
   std::string res;
   if (str)
     res += str;
-  if (key && !key->accels().empty()) {
+  if (key && !key->shortcuts().empty()) {
     res += " (";
-    res += key->accels().front().toString();
+    res += key->shortcuts().front().toString();
     res += ")";
   }
   return res;
diff --git a/src/app/ui/keyboard_shortcuts.h b/src/app/ui/keyboard_shortcuts.h
index e7982512b..098ae435d 100644
--- a/src/app/ui/keyboard_shortcuts.h
+++ b/src/app/ui/keyboard_shortcuts.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -50,20 +50,20 @@ public:
   KeyPtr tool(tools::Tool* tool) const;
   KeyPtr quicktool(tools::Tool* tool) const;
   KeyPtr action(const KeyAction action, const KeyContext keyContext = KeyContext::Any) const;
-  KeyPtr wheelAction(const WheelAction action) const;
-  KeyPtr dragAction(const WheelAction action) const;
+  KeyPtr wheelAction(WheelAction action) const;
+  KeyPtr dragAction(WheelAction action) const;
 
-  void disableAccel(const ui::Accelerator& accel,
-                    const KeySource source,
-                    const KeyContext keyContext,
-                    const Key* newKey);
+  void disableShortcut(const ui::Shortcut& shortcut,
+                       KeySource source,
+                       KeyContext keyContext,
+                       const Key* newKey);
 
-  KeyContext getCurrentKeyContext() const;
+  static KeyContext getCurrentKeyContext();
   bool getCommandFromKeyMessage(const ui::Message* msg, Command** command, Params* params);
   tools::Tool* getCurrentQuicktool(tools::Tool* currentTool);
   KeyAction getCurrentActionModifiers(KeyContext context);
-  WheelAction getWheelActionFromMouseMessage(const KeyContext context, const ui::Message* msg);
-  Keys getDragActionsFromKeyMessage(const KeyContext context, const ui::Message* msg);
+  WheelAction getWheelActionFromMouseMessage(KeyContext context, const ui::Message* msg);
+  Keys getDragActionsFromKeyMessage(const ui::Message* msg);
   bool hasMouseWheelCustomization() const;
   void clearMouseWheelKeys();
   void addMissingMouseWheelKeys();
@@ -77,10 +77,10 @@ public:
 
 private:
   void exportKeys(tinyxml2::XMLElement* parent, KeyType type);
-  void exportAccel(tinyxml2::XMLElement* parent,
-                   const Key* key,
-                   const ui::Accelerator& accel,
-                   bool removed);
+  static void exportShortcut(tinyxml2::XMLElement* parent,
+                             const Key* key,
+                             const ui::Shortcut& shortcut,
+                             bool removed);
 
   mutable Keys m_keys;
 };
diff --git a/src/app/ui/layout.cpp b/src/app/ui/layout.cpp
new file mode 100644
index 000000000..88e799abb
--- /dev/null
+++ b/src/app/ui/layout.cpp
@@ -0,0 +1,222 @@
+// Aseprite
+// Copyright (C) 2022-2024  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/ui/layout.h"
+
+#include "app/app.h"
+#include "app/ui/color_bar.h"
+#include "app/ui/context_bar.h"
+#include "app/ui/dock.h"
+#include "app/ui/main_window.h"
+#include "app/ui/status_bar.h"
+#include "app/ui/timeline/timeline.h"
+#include "app/ui/toolbar.h"
+#include "app/ui/workspace.h"
+#include "app/xml_document.h"
+#include "app/xml_exception.h"
+#include "base/convert_to.h"
+#include "ui/widget.h"
+
+#include <cstring>
+#include <sstream>
+
+namespace app {
+
+using namespace tinyxml2;
+
+static void save_dock_layout(XMLElement* elem, const Dock* dock)
+{
+  for (const auto* child : dock->children()) {
+    const int side = dock->whichSideChildIsDocked(child);
+    const gfx::Size size = dock->getUserDefinedSizeAtSide(side);
+
+    std::string sideStr;
+    switch (side) {
+      case ui::LEFT:   sideStr = "left"; break;
+      case ui::RIGHT:  sideStr = "right"; break;
+      case ui::TOP:    sideStr = "top"; break;
+      case ui::BOTTOM: sideStr = "bottom"; break;
+      case ui::CENTER:
+      default:
+        // Empty side attribute
+        break;
+    }
+
+    XMLElement* childElem = elem->InsertNewChildElement("");
+
+    if (const auto* subdock = dynamic_cast<const Dock*>(child)) {
+      childElem->SetValue("dock");
+      if (!sideStr.empty())
+        childElem->SetAttribute("side", sideStr.c_str());
+
+      save_dock_layout(childElem, subdock);
+    }
+    else {
+      // Set the widget ID as the element name, e.g. <timeline />,
+      // <colorbar />, etc.
+      childElem->SetValue(child->id().c_str());
+      if (!sideStr.empty())
+        childElem->SetAttribute("side", sideStr.c_str());
+      if (size.w)
+        childElem->SetAttribute("width", size.w);
+      if (size.h)
+        childElem->SetAttribute("height", size.h);
+    }
+  }
+}
+
+static void load_dock_layout(const XMLElement* elem, Dock* dock)
+{
+  const char* elemNameStr = elem->Value();
+  if (!elemNameStr) {
+    ASSERT(false); // Impossible?
+    return;
+  }
+  const std::string elemName = elemNameStr;
+
+  MainWindow* win = App::instance()->mainWindow();
+  ASSERT(win);
+
+  ui::Widget* widget = nullptr;
+  Dock* subdock = nullptr;
+
+  int side = ui::CENTER;
+  if (const auto* sideStr = elem->Attribute("side")) {
+    if (std::strcmp(sideStr, "left") == 0)
+      side = ui::LEFT;
+    if (std::strcmp(sideStr, "right") == 0)
+      side = ui::RIGHT;
+    if (std::strcmp(sideStr, "top") == 0)
+      side = ui::TOP;
+    if (std::strcmp(sideStr, "bottom") == 0)
+      side = ui::BOTTOM;
+  }
+
+  const char* widthStr = elem->Attribute("width");
+  const char* heightStr = elem->Attribute("height");
+  gfx::Size size;
+  if (widthStr)
+    size.w = base::convert_to<int>(std::string(widthStr));
+  if (heightStr)
+    size.h = base::convert_to<int>(std::string(heightStr));
+
+  if (elemName == "colorbar") {
+    widget = win->colorBar();
+  }
+  else if (elemName == "contextbar") {
+    widget = win->getContextBar();
+  }
+  else if (elemName == "timeline") {
+    widget = win->getTimeline();
+  }
+  else if (elemName == "toolbar") {
+    widget = win->toolBar();
+  }
+  else if (elemName == "workspace") {
+    widget = win->getWorkspace();
+  }
+  else if (elemName == "statusbar") {
+    widget = win->statusBar();
+  }
+  else if (elemName == "dock") {
+    subdock = dock->subdock(side);
+  }
+
+  if (subdock) {
+    const auto* childElem = elem->FirstChildElement();
+    while (childElem) {
+      load_dock_layout(childElem, subdock);
+      childElem = childElem->NextSiblingElement();
+    }
+  }
+  else {
+    dock->dock(side, widget, size);
+  }
+}
+
+// static
+LayoutPtr Layout::MakeFromXmlElement(const XMLElement* layoutElem)
+{
+  const char* name = layoutElem->Attribute("name");
+  const char* id = layoutElem->Attribute("id");
+
+  if (id == nullptr || name == nullptr) {
+    LOG(WARNING, "Invalid XML layout provided\n");
+    return nullptr;
+  }
+
+  auto layout = std::make_shared<Layout>();
+  layout->m_id = id;
+  layout->m_name = name;
+  layout->m_elem = layoutElem->DeepClone(&layout->m_dummyDoc)->ToElement();
+
+  ASSERT(!layout->m_name.empty() && !layout->m_id.empty());
+
+  if (layout->m_elem->ChildElementCount() == 0) // TODO: More error checking here.
+    return nullptr;
+
+  if (layout->m_name.empty() || layout->m_id.empty())
+    return nullptr;
+
+  return layout;
+}
+
+// static
+LayoutPtr Layout::MakeFromDock(const std::string& id, const std::string& name, const Dock* dock)
+{
+  auto layout = std::make_shared<Layout>();
+  layout->m_id = id;
+  layout->m_name = name;
+
+  layout->m_elem = layout->m_dummyDoc.NewElement("layout");
+  layout->m_elem->SetAttribute("id", id.c_str());
+  layout->m_elem->SetAttribute("name", name.c_str());
+  save_dock_layout(layout->m_elem, dock);
+
+  return layout;
+}
+
+bool Layout::matchId(const std::string_view id) const
+{
+  if (m_id == id)
+    return true;
+
+  if ((m_id.empty() && id == kDefault) || (m_id == kDefault && id.empty()))
+    return true;
+
+  return false;
+}
+
+bool Layout::loadLayout(Dock* dock) const
+{
+  if (!m_elem)
+    return false;
+
+  XMLElement* elem = m_elem->FirstChildElement();
+  while (elem) {
+    load_dock_layout(elem, dock);
+    elem = elem->NextSiblingElement();
+  }
+
+  return true;
+}
+
+bool Layout::isValidName(const std::string_view name)
+{
+  if (name.empty())
+    return false;
+  if (name[0] == '_')
+    return false;
+  if (name.length() > 128)
+    return false;
+  return true;
+}
+
+} // namespace app
diff --git a/src/app/ui/layout.h b/src/app/ui/layout.h
new file mode 100644
index 000000000..e4042ef6b
--- /dev/null
+++ b/src/app/ui/layout.h
@@ -0,0 +1,54 @@
+// Aseprite
+// Copyright (C) 2022-2024  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_LAYOUT_H_INCLUDED
+#define APP_UI_LAYOUT_H_INCLUDED
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "tinyxml2.h"
+
+namespace app {
+class Dock;
+
+class Layout;
+using LayoutPtr = std::shared_ptr<Layout>;
+
+class Layout final {
+public:
+  static constexpr const char* kDefault = "_default_";
+  static constexpr const char* kMirroredDefault = "_mirrored_default_";
+
+  static constexpr const char* kDefaultOriginal = "_default_original_";
+  static constexpr const char* kMirroredDefaultOriginal = "_mirrored_default_original_";
+
+  static LayoutPtr MakeFromXmlElement(const tinyxml2::XMLElement* layoutElem);
+  static LayoutPtr MakeFromDock(const std::string& id, const std::string& name, const Dock* dock);
+
+  const std::string& id() const { return m_id; }
+  const std::string& name() const { return m_name; }
+  const tinyxml2::XMLElement* xmlElement() const { return m_elem; }
+
+  bool matchId(std::string_view id) const;
+  bool loadLayout(Dock* dock) const;
+
+  bool isDefault() const { return m_id == kDefault || m_id == kMirroredDefault; }
+
+  // Validates that the given name is short and doesn't begin with a "_" (reserved for _defaults)
+  static bool isValidName(std::string_view name);
+
+private:
+  std::string m_id;
+  std::string m_name;
+  tinyxml2::XMLDocument m_dummyDoc;
+  tinyxml2::XMLElement* m_elem = nullptr;
+};
+
+} // namespace app
+
+#endif
diff --git a/src/app/ui/layout_selector.cpp b/src/app/ui/layout_selector.cpp
new file mode 100644
index 000000000..51e92a558
--- /dev/null
+++ b/src/app/ui/layout_selector.cpp
@@ -0,0 +1,570 @@
+// Aseprite
+// Copyright (C) 2021-2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/ui/layout_selector.h"
+
+#include "app/app.h"
+#include "app/i18n/strings.h"
+#include "app/match_words.h"
+#include "app/pref/preferences.h"
+#include "app/ui/main_window.h"
+#include "app/ui/separator_in_view.h"
+#include "app/ui/skin/skin_theme.h"
+#include "fmt/printf.h"
+#include "ui/alert.h"
+#include "ui/app_state.h"
+#include "ui/entry.h"
+#include "ui/label.h"
+#include "ui/listitem.h"
+#include "ui/tooltips.h"
+#include "ui/window.h"
+
+#include "new_layout.xml.h"
+
+#define ANI_TICKS 2
+
+namespace app {
+
+using namespace app::skin;
+using namespace ui;
+
+namespace {
+
+// TODO this combobox is similar to FileSelector::CustomFileNameEntry
+//      and GotoFrameCommand::TagsEntry
+class LayoutsEntry final : public ComboBox {
+public:
+  explicit LayoutsEntry(Layouts& layouts) : m_layouts(layouts)
+  {
+    setEditable(true);
+    getEntryWidget()->Change.connect(&LayoutsEntry::onEntryChange, this);
+    fill(true);
+  }
+
+private:
+  void fill(bool all)
+  {
+    deleteAllItems();
+
+    const MatchWords match(getEntryWidget()->text());
+
+    bool matchAny = false;
+    for (const auto& layout : m_layouts) {
+      if (layout->isDefault())
+        continue; // Ignore custom defaults.
+
+      if (match(layout->name())) {
+        matchAny = true;
+        break;
+      }
+    }
+    for (const auto& layout : m_layouts) {
+      if (layout->isDefault())
+        continue;
+
+      if (all || !matchAny || match(layout->name()))
+        addItem(layout->name());
+    }
+  }
+
+  void onEntryChange() override
+  {
+    closeListBox();
+    fill(false);
+    if (getItemCount() > 0 && !empty())
+      openListBox();
+  }
+
+  Layouts& m_layouts;
+};
+
+}; // namespace
+
+class LayoutSelector::LayoutItem final : public ListItem {
+public:
+  enum LayoutOption : uint8_t {
+    DEFAULT,
+    MIRRORED_DEFAULT,
+    USER_DEFINED,
+    NEW_LAYOUT,
+  };
+
+  LayoutItem(LayoutSelector* selector,
+             const LayoutOption option,
+             const std::string& text,
+             const std::string& layoutId = "")
+    : ListItem(text)
+    , m_option(option)
+    , m_selector(selector)
+    , m_layoutId(layoutId)
+  {
+    m_hbox.setTransparent(true);
+    addChild(&m_hbox);
+
+    auto* filler = new BoxFiller();
+    filler->setTransparent(true);
+    m_hbox.addChild(filler);
+
+    if (option == USER_DEFINED ||
+        ((option == DEFAULT || option == MIRRORED_DEFAULT) && !layoutId.empty())) {
+      addActionButton();
+    }
+  }
+
+  // Separated from the constructor so we can add it on the fly when modifying Default/Mirrored
+  void addActionButton(const std::string& newLayoutId = "")
+  {
+    if (!newLayoutId.empty())
+      m_layoutId = newLayoutId;
+
+    ASSERT(!m_layoutId.empty());
+
+    // TODO: Custom icons for each one would be nice here.
+    m_actionButton = new IconButton(SkinTheme::instance()->parts.iconClose());
+    const int th = m_actionButton->textHeight();
+    m_actionButton->setSizeHint(gfx::Size(th, th));
+    m_actionButton->setTransparent(true);
+    m_actionButton->InitTheme.connect(
+      [this] { m_actionButton->setBgColor(gfx::rgba(0, 0, 0, 0)); });
+
+    if (m_option == USER_DEFINED) {
+      m_actionConn = m_actionButton->Click.connect([this] {
+        MainWindow* win = App::instance()->mainWindow();
+        win->layoutSelector()->closeComboBox();
+
+        const auto alert = Alert::create(Strings::new_layout_deleting_layout());
+        alert->addLabel(Strings::new_layout_deleting_layout_confirmation(text()), LEFT);
+        alert->addButton(Strings::general_ok());
+        alert->addButton(Strings::general_cancel());
+        if (alert->show() == 1) {
+          if (m_layoutId == m_selector->activeLayoutId()) {
+            m_selector->setActiveLayoutId(Layout::kDefault);
+            App::instance()->mainWindow()->setDefaultLayout();
+          }
+
+          m_selector->removeLayout(m_layoutId);
+        }
+      });
+    }
+    else {
+      m_actionConn = m_actionButton->Click.connect([this] {
+        MainWindow* win = App::instance()->mainWindow();
+        win->layoutSelector()->closeComboBox();
+
+        const auto alert = Alert::create(Strings::new_layout_restoring_layout());
+        alert->addLabel(
+          Strings::new_layout_restoring_layout_confirmation(text().substr(0, text().size() - 1)),
+          LEFT);
+        alert->addButton(Strings::general_ok());
+        alert->addButton(Strings::general_cancel());
+
+        if (alert->show() == 1) {
+          if (m_layoutId == Layout::kDefault) {
+            App::instance()->mainWindow()->setDefaultLayout();
+          }
+          else {
+            App::instance()->mainWindow()->setMirroredDefaultLayout();
+          }
+
+          m_selector->setActiveLayoutId(m_layoutId);
+          m_selector->removeLayout(m_layoutId);
+        }
+      });
+    }
+
+    m_hbox.addChild(m_actionButton);
+  }
+
+  std::string_view getLayoutId() const { return m_layoutId; }
+
+  void selectImmediately() const
+  {
+    MainWindow* win = App::instance()->mainWindow();
+
+    switch (m_option) {
+      case DEFAULT: {
+        if (const auto& defaultLayout = win->layoutSelector()->m_layouts.getById(
+              Layout::kDefault)) {
+          win->loadUserLayout(defaultLayout.get());
+        }
+        else {
+          win->setDefaultLayout();
+        }
+
+        m_selector->setActiveLayoutId(Layout::kDefault);
+        break;
+      }
+
+      case MIRRORED_DEFAULT: {
+        if (const auto& mirroredLayout = win->layoutSelector()->m_layouts.getById(
+              Layout::kMirroredDefault)) {
+          win->loadUserLayout(mirroredLayout.get());
+        }
+        else {
+          win->setMirroredDefaultLayout();
+        }
+
+        m_selector->setActiveLayoutId(Layout::kMirroredDefault);
+        break;
+      }
+
+      case USER_DEFINED: {
+        const auto selectedLayout = m_selector->m_layouts.getById(m_layoutId);
+        ASSERT(!m_layoutId.empty());
+        ASSERT(selectedLayout);
+        m_selector->setActiveLayoutId(m_layoutId);
+        win->loadUserLayout(selectedLayout.get());
+        break;
+      }
+    }
+  }
+
+  void selectAfterClose() const
+  {
+    if (m_option != NEW_LAYOUT)
+      return;
+
+    //
+    // Adding a NEW_LAYOUT
+    //
+    MainWindow* win = App::instance()->mainWindow();
+    gen::NewLayout window;
+
+    window.name()->Change.connect([&] {
+      bool valid = Layout::isValidName(window.name()->text()) &&
+                   m_selector->m_layouts.getById(window.name()->text()) == nullptr;
+      window.ok()->setEnabled(valid);
+    });
+
+    window.openWindowInForeground();
+
+    if (window.closer() == window.ok()) {
+      const auto layout =
+        Layout::MakeFromDock(window.name()->text(), window.name()->text(), win->customizableDock());
+
+      m_selector->addLayout(layout);
+      m_selector->m_layouts.saveUserLayouts();
+      m_selector->setActiveLayoutId(layout->id());
+      win->loadUserLayout(layout.get());
+    }
+    else {
+      // Ensure we go back to having the layout we were at selected.
+      m_selector->populateComboBox();
+    }
+  }
+
+private:
+  LayoutOption m_option;
+  LayoutSelector* m_selector = nullptr;
+  std::string m_layoutId;
+  HBox m_hbox;
+  IconButton* m_actionButton = nullptr;
+  obs::scoped_connection m_actionConn;
+};
+
+void LayoutSelector::LayoutComboBox::onChange()
+{
+  ComboBox::onChange();
+
+  if (m_lockChange)
+    return;
+
+  if (auto* item = dynamic_cast<LayoutItem*>(getSelectedItem())) {
+    item->selectImmediately();
+    m_selected = item;
+  }
+}
+
+void LayoutSelector::LayoutComboBox::onCloseListBox()
+{
+  ComboBox::onCloseListBox();
+
+  if (m_lockChange)
+    return;
+
+  if (m_selected) {
+    m_selected->selectAfterClose();
+    m_selected = nullptr;
+  }
+}
+
+LayoutSelector::LayoutSelector(TooltipManager* tooltipManager, Widget* notifications)
+  : m_button(SkinTheme::instance()->parts.iconLayout())
+  , m_notifications(notifications)
+{
+  setActiveLayoutId(Preferences::instance().general.workspaceLayout());
+
+  m_button.Click.connect([this]() { switchSelector(); });
+
+  m_comboBox.setVisible(false);
+
+  m_top.setExpansive(true);
+  addChild(&m_top);
+  addChild(&m_center);
+  addChild(&m_bottom);
+  m_center.addChild(&m_comboBox);
+  m_center.addChild(&m_button);
+  m_center.addChild(m_notifications);
+
+  setupTooltips(tooltipManager);
+  initTheme();
+}
+
+LayoutSelector::~LayoutSelector()
+{
+  m_center.removeChild(m_notifications);
+
+  Preferences::instance().general.workspaceLayout(m_activeLayoutId);
+
+  if (!is_app_state_closing())
+    stopAnimation();
+}
+
+LayoutPtr LayoutSelector::activeLayout() const
+{
+  return m_layouts.getById(m_activeLayoutId);
+}
+
+void LayoutSelector::addLayout(const LayoutPtr& layout)
+{
+  m_layouts.addLayout(layout);
+
+  populateComboBox();
+}
+
+void LayoutSelector::removeLayout(const LayoutPtr& layout)
+{
+  m_layouts.removeLayout(layout);
+  m_layouts.saveUserLayouts();
+
+  populateComboBox();
+}
+
+void LayoutSelector::removeLayout(const std::string& layoutId)
+{
+  auto layout = m_layouts.getById(layoutId);
+  ASSERT(layout);
+  removeLayout(layout);
+}
+
+void LayoutSelector::updateActiveLayout(const LayoutPtr& newLayout)
+{
+  bool added = m_layouts.addLayout(newLayout);
+  setActiveLayoutId(newLayout->id());
+  m_layouts.saveUserLayouts();
+
+  if (added && newLayout->isDefault()) {
+    // Mark it with an asterisk if we're editing a default layout.
+    populateComboBox();
+  }
+}
+
+void LayoutSelector::onInitTheme(ui::InitThemeEvent& ev)
+{
+  VBox::onInitTheme(ev);
+
+  auto* theme = SkinTheme::get(this);
+  setBgColor(theme->colors.windowFace());
+
+  noBorderNoChildSpacing();
+  m_top.noBorderNoChildSpacing();
+  m_center.noBorderNoChildSpacing();
+  m_bottom.noBorderNoChildSpacing();
+  m_comboBox.noBorderNoChildSpacing();
+  m_button.noBorderNoChildSpacing();
+
+  m_bottom.setStyle(theme->styles.tabBottom());
+  m_bottom.setMinSize(gfx::Size(0, theme->dimensions.tabsBottomHeight()));
+}
+
+void LayoutSelector::onAnimationFrame()
+{
+  switch (animation()) {
+    case ANI_NONE:       break;
+    case ANI_EXPANDING:
+    case ANI_COLLAPSING: {
+      const double t = animationTime();
+      m_comboBox.setSizeHint(gfx::Size(int(inbetween(m_startSize.w, m_endSize.w, t)),
+                                       int(inbetween(m_startSize.h, m_endSize.h, t))));
+      break;
+    }
+  }
+
+  if (auto* win = window())
+    win->layout();
+}
+
+void LayoutSelector::onAnimationStop(int animation)
+{
+  switch (animation) {
+    case ANI_EXPANDING:
+      m_comboBox.setSizeHint(m_endSize);
+      if (m_switchComboBoxAfterAni) {
+        m_switchComboBoxAfterAni = false;
+        m_comboBox.openListBox();
+      }
+      break;
+    case ANI_COLLAPSING:
+      m_comboBox.setVisible(false);
+      m_comboBox.setSizeHint(m_endSize);
+      if (m_switchComboBoxAfterAni) {
+        m_switchComboBoxAfterAni = false;
+        m_comboBox.closeListBox();
+      }
+      break;
+  }
+
+  if (auto* win = window())
+    win->layout();
+}
+
+void LayoutSelector::switchSelector()
+{
+  bool expand;
+  if (!m_comboBox.isVisible()) {
+    expand = true;
+
+    // Create the combobox for first time
+    if (m_comboBox.getItemCount() == 0) {
+      populateComboBox();
+    }
+
+    m_comboBox.setVisible(true);
+    m_comboBox.resetSizeHint();
+    m_startSize = gfx::Size(0, 0);
+    m_endSize = m_comboBox.sizeHint();
+  }
+  else {
+    expand = false;
+    m_startSize = m_comboBox.bounds().size();
+    m_endSize = gfx::Size(0, 0);
+  }
+
+  if (auto* item = getItemByLayoutId(m_activeLayoutId))
+    m_comboBox.setSelectedItem(item);
+
+  m_comboBox.setSizeHint(m_startSize);
+  startAnimation((expand ? ANI_EXPANDING : ANI_COLLAPSING), ANI_TICKS);
+
+  MainWindow* win = App::instance()->mainWindow();
+  win->setCustomizeDock(expand);
+}
+
+void LayoutSelector::switchSelectorFromCommand()
+{
+  m_switchComboBoxAfterAni = true;
+  switchSelector();
+}
+
+bool LayoutSelector::isSelectorVisible() const
+{
+  return (m_comboBox.isVisible());
+}
+
+void LayoutSelector::closeComboBox()
+{
+  m_comboBox.closeListBox();
+}
+
+void LayoutSelector::setupTooltips(TooltipManager* tooltipManager)
+{
+  tooltipManager->addTooltipFor(&m_button, Strings::main_window_layout(), TOP);
+}
+
+void LayoutSelector::setActiveLayoutId(const std::string& layoutId)
+{
+  if (layoutId.empty()) {
+    m_activeLayoutId = Layout::kDefault;
+    return;
+  }
+
+  if (layoutId == m_activeLayoutId)
+    return;
+
+  m_activeLayoutId = layoutId;
+
+  for (auto* item : m_comboBox.items()) {
+    if (auto* layoutItem = dynamic_cast<LayoutItem*>(item)) {
+      if (layoutItem->getLayoutId() == layoutId) {
+        m_comboBox.setSelectedItem(item);
+        break;
+      }
+    }
+  }
+}
+
+void LayoutSelector::populateComboBox()
+{
+  // Disable combobox onChange() event processing when we are
+  // re-creating the combobox items. This avoids calling
+  // LayoutSelector::LayoutItem::selectImmediately() which could
+  // delete docks that generate this same event, e.g. resizing a dock
+  // can generate a UserResizedDock which might call this
+  // populateComboBox() function.
+  m_comboBox.setLockChange(true);
+
+  // Defer deletion of current items because we can be inside one of
+  // these item callbacks.
+  auto itemsCopy = m_comboBox.items();
+  for (auto* item : itemsCopy) {
+    m_comboBox.removeItem(item);
+    item->deferDelete();
+  }
+
+  m_comboBox.addItem(new SeparatorInView(Strings::main_window_layout(), HORIZONTAL));
+  m_comboBox.addItem(
+    new LayoutItem(this, LayoutItem::DEFAULT, Strings::main_window_default_layout()));
+  m_comboBox.addItem(new LayoutItem(this,
+                                    LayoutItem::MIRRORED_DEFAULT,
+                                    Strings::main_window_mirrored_default_layout()));
+  m_comboBox.addItem(new SeparatorInView(Strings::main_window_user_layouts(), HORIZONTAL));
+  for (const auto& layout : m_layouts) {
+    LayoutItem* item;
+    if (layout->isDefault()) {
+      item = dynamic_cast<LayoutItem*>(
+        m_comboBox.getItem(layout->id() == Layout::kDefault ? 1 : 2));
+      // Indicate we've modified this with an asterisk.
+      item->setText(item->text() + "*");
+      item->addActionButton(layout->id());
+    }
+    else {
+      item = new LayoutItem(this, LayoutItem::USER_DEFINED, layout->name(), layout->id());
+      m_comboBox.addItem(item);
+    }
+
+    if (layout->id() == m_activeLayoutId)
+      m_comboBox.setSelectedItem(item);
+  }
+  m_comboBox.addItem(
+    new LayoutItem(this, LayoutItem::NEW_LAYOUT, Strings::main_window_new_layout(), ""));
+
+  if (m_activeLayoutId == Layout::kDefault)
+    m_comboBox.setSelectedItemIndex(1);
+  if (m_activeLayoutId == Layout::kMirroredDefault)
+    m_comboBox.setSelectedItemIndex(2);
+
+  m_comboBox.getEntryWidget()->deselectText();
+
+  m_comboBox.setLockChange(false);
+}
+
+LayoutSelector::LayoutItem* LayoutSelector::getItemByLayoutId(const std::string& id)
+{
+  for (auto* child : m_comboBox) {
+    if (auto* item = dynamic_cast<LayoutItem*>(child)) {
+      if (item->getLayoutId() == id)
+        return item;
+    }
+  }
+
+  return nullptr;
+}
+
+} // namespace app
diff --git a/src/app/ui/layout_selector.h b/src/app/ui/layout_selector.h
new file mode 100644
index 000000000..35c3e01c6
--- /dev/null
+++ b/src/app/ui/layout_selector.h
@@ -0,0 +1,94 @@
+// Aseprite
+// Copyright (C) 2021-2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_LAYOUT_SELECTOR_H_INCLUDED
+#define APP_UI_LAYOUT_SELECTOR_H_INCLUDED
+#pragma once
+
+#include "app/ui/dockable.h"
+#include "app/ui/icon_button.h"
+#include "app/ui/layout.h"
+#include "app/ui/layouts.h"
+#include "ui/animated_widget.h"
+#include "ui/box.h"
+#include "ui/combobox.h"
+
+#include <memory>
+#include <vector>
+
+namespace ui {
+class TooltipManager;
+}
+
+namespace app {
+
+class LayoutSelector : public ui::VBox,
+                       public ui::AnimatedWidget,
+                       public Dockable {
+  enum Ani : int {
+    ANI_NONE,
+    ANI_EXPANDING,
+    ANI_COLLAPSING,
+  };
+
+  class LayoutItem;
+
+  class LayoutComboBox : public ui::ComboBox {
+  public:
+    void setLockChange(bool state) { m_lockChange = state; }
+
+  private:
+    void onChange() override;
+    void onCloseListBox() override;
+    LayoutItem* m_selected = nullptr;
+    bool m_lockChange = false;
+  };
+
+public:
+  LayoutSelector(ui::TooltipManager* tooltipManager, ui::Widget* notifications);
+  ~LayoutSelector();
+
+  LayoutPtr activeLayout() const;
+  const std::string& activeLayoutId() const { return m_activeLayoutId; }
+
+  void addLayout(const LayoutPtr& layout);
+  void removeLayout(const LayoutPtr& layout);
+  void removeLayout(const std::string& layoutId);
+  void updateActiveLayout(const LayoutPtr& layout);
+  void switchSelector();
+  void switchSelectorFromCommand();
+  bool isSelectorVisible() const;
+  void closeComboBox();
+
+  // Dockable impl
+  int dockableAt() const override { return ui::TOP | ui::BOTTOM; }
+
+protected:
+  void onInitTheme(ui::InitThemeEvent& ev) override;
+
+private:
+  void setupTooltips(ui::TooltipManager* tooltipManager);
+  void setActiveLayoutId(const std::string& layoutId);
+
+  void populateComboBox();
+  LayoutItem* getItemByLayoutId(const std::string& id);
+  void onAnimationFrame() override;
+  void onAnimationStop(int animation) override;
+
+  std::string m_activeLayoutId;
+  ui::HBox m_top, m_center, m_bottom;
+  LayoutComboBox m_comboBox;
+  IconButton m_button;
+  Widget* m_notifications = nullptr;
+  gfx::Size m_startSize;
+  gfx::Size m_endSize;
+  Layouts m_layouts;
+  bool m_switchComboBoxAfterAni = false;
+};
+
+} // namespace app
+
+#endif
diff --git a/src/app/ui/layouts.cpp b/src/app/ui/layouts.cpp
new file mode 100644
index 000000000..b9d30a593
--- /dev/null
+++ b/src/app/ui/layouts.cpp
@@ -0,0 +1,146 @@
+// Aseprite
+// Copyright (c) 2022-2024  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/ui/layouts.h"
+
+#include "app/resource_finder.h"
+#include "app/xml_document.h"
+#include "app/xml_exception.h"
+#include "base/fs.h"
+
+#include <algorithm>
+#include <fstream>
+
+namespace app {
+
+using namespace tinyxml2;
+
+Layouts::Layouts()
+{
+  try {
+    std::string fn = m_userLayoutsFilename = UserLayoutsFilename();
+    if (base::is_file(fn))
+      load(fn);
+  }
+  catch (const std::exception& ex) {
+    LOG(ERROR, "LAY: Error loading user layouts: %s\n", ex.what());
+  }
+}
+
+Layouts::~Layouts()
+{
+  try {
+    saveUserLayouts();
+  }
+  catch (const std::exception& ex) {
+    LOG(ERROR, "LAY: Error saving user layouts on exit: %s\n", ex.what());
+  }
+}
+
+LayoutPtr Layouts::getById(const std::string& id) const
+{
+  auto it = std::find_if(m_layouts.begin(), m_layouts.end(), [&id](const LayoutPtr& l) {
+    return l->matchId(id);
+  });
+  return (it != m_layouts.end() ? *it : nullptr);
+}
+
+bool Layouts::addLayout(const LayoutPtr& layout)
+{
+  ASSERT(layout);
+
+  const auto it = std::find_if(m_layouts.begin(), m_layouts.end(), [layout](const LayoutPtr& l) {
+    return l->matchId(layout->id());
+  });
+
+  if (it != m_layouts.end()) {
+    *it = layout; // Replace existent layout
+    return false;
+  }
+
+  m_layouts.push_back(layout);
+  return true;
+}
+
+void Layouts::removeLayout(const LayoutPtr& layout)
+{
+  if (m_layouts.size() <= 1) {
+    m_layouts.clear();
+    return;
+  }
+
+  ASSERT(layout);
+
+  const auto it = std::find_if(m_layouts.begin(), m_layouts.end(), [layout](const LayoutPtr& l) {
+    return l->matchId(layout->id());
+  });
+
+  m_layouts.erase(it);
+}
+
+void Layouts::saveUserLayouts()
+{
+  if (m_userLayoutsFilename.empty())
+    return;
+
+  save(m_userLayoutsFilename);
+
+  // TODO: We probably have too much I/O here, but it's the easiest way to keep the XML and
+  // internal representations synced up.
+  reload();
+}
+
+void Layouts::reload()
+{
+  if (m_userLayoutsFilename.empty())
+    return;
+
+  m_layouts.clear();
+  load(m_userLayoutsFilename);
+}
+
+void Layouts::load(const std::string& fn)
+{
+  const XMLDocumentRef doc = app::open_xml(fn);
+  XMLHandle handle(doc.get());
+  XMLElement* layoutElem =
+    handle.FirstChildElement("layouts").FirstChildElement("layout").ToElement();
+
+  while (layoutElem) {
+    if (auto layout = Layout::MakeFromXmlElement(layoutElem)) {
+      m_layouts.push_back(layout);
+    }
+    layoutElem = layoutElem->NextSiblingElement();
+  }
+}
+
+void Layouts::save(const std::string& fn) const
+{
+  auto doc = std::make_unique<XMLDocument>();
+  XMLElement* layoutsElem = doc->NewElement("layouts");
+
+  for (const auto& layout : m_layouts) {
+    layoutsElem->InsertEndChild(layout->xmlElement()->DeepClone(doc.get()));
+  }
+
+  doc->InsertEndChild(doc->NewDeclaration(R"(xml version="1.0" encoding="utf-8")"));
+  doc->InsertEndChild(layoutsElem);
+  save_xml(doc.get(), fn);
+}
+
+// static
+std::string Layouts::UserLayoutsFilename()
+{
+  ResourceFinder rf;
+  rf.includeUserDir("user.aseprite-layouts");
+  return rf.getFirstOrCreateDefault();
+}
+
+} // namespace app
diff --git a/src/app/ui/layouts.h b/src/app/ui/layouts.h
new file mode 100644
index 000000000..fe65d444d
--- /dev/null
+++ b/src/app/ui/layouts.h
@@ -0,0 +1,52 @@
+// Aseprite
+// Copyright (c) 2022-2024  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_LAYOUTS_H_INCLUDED
+#define APP_UI_LAYOUTS_H_INCLUDED
+#pragma once
+
+#include "app/ui/layout.h"
+
+#include <string>
+#include <vector>
+
+namespace app {
+
+class Layouts {
+public:
+  Layouts();
+  ~Layouts();
+
+  size_t size() const { return m_layouts.size(); }
+
+  LayoutPtr getById(const std::string& id) const;
+
+  // Returns true if the layout is added, or false if it was
+  // replaced.
+  bool addLayout(const LayoutPtr& layout);
+  void removeLayout(const LayoutPtr& layout);
+
+  void saveUserLayouts();
+  void reload();
+
+  // To iterate layouts
+  using List = std::vector<LayoutPtr>;
+  using iterator = List::iterator;
+  iterator begin() { return m_layouts.begin(); }
+  iterator end() { return m_layouts.end(); }
+
+private:
+  void load(const std::string& fn);
+  void save(const std::string& fn) const;
+  static std::string UserLayoutsFilename();
+
+  List m_layouts;
+  std::string m_userLayoutsFilename;
+};
+
+} // namespace app
+
+#endif
diff --git a/src/app/ui/main_menu_bar.cpp b/src/app/ui/main_menu_bar.cpp
index 800e08802..cb4858552 100644
--- a/src/app/ui/main_menu_bar.cpp
+++ b/src/app/ui/main_menu_bar.cpp
@@ -14,6 +14,8 @@
 #include "app/app.h"
 #include "app/app_menus.h"
 #include "app/extensions.h"
+#include "ui/manager.h"
+#include "ui/message.h"
 
 namespace app {
 
@@ -26,13 +28,26 @@ MainMenuBar::MainMenuBar()
 
   // Reload the main menu if there are changes in keyboard shortcuts
   // or scripts when extensions are installed/uninstalled or
-  // enabled/disabled.
-  m_extKeys = extensions.KeysChange.connect([this] { reload(); });
-  m_extScripts = extensions.ScriptsChange.connect([this] { reload(); });
+  // enabled/disabled, enqueued to avoid multiple reloads.
+  m_extKeys = extensions.KeysChange.connect([&] { queueReload(); });
+  m_extScripts = extensions.ScriptsChange.connect([&] { queueReload(); });
+}
+
+void MainMenuBar::queueReload()
+{
+  if (m_queuedReload)
+    return;
+
+  m_queuedReload = true;
+
+  auto* msg = new CallbackMessage([this] { reload(); });
+  msg->setRecipient(this);
+  Manager::getDefault()->enqueueMessage(msg);
 }
 
 void MainMenuBar::reload()
 {
+  m_queuedReload = false;
   setMenu(nullptr);
 
   // Reload all menus.
diff --git a/src/app/ui/main_menu_bar.h b/src/app/ui/main_menu_bar.h
index bfc704bec..bcb223489 100644
--- a/src/app/ui/main_menu_bar.h
+++ b/src/app/ui/main_menu_bar.h
@@ -9,20 +9,27 @@
 #define APP_UI_MAIN_MENU_BAR_H_INCLUDED
 #pragma once
 
+#include "app/ui/dockable.h"
 #include "obs/connection.h"
 #include "ui/menu.h"
 
 namespace app {
 
-class MainMenuBar : public ui::MenuBar {
+class MainMenuBar : public ui::MenuBar,
+                    public Dockable {
 public:
   MainMenuBar();
 
+  void queueReload();
   void reload();
 
+  // Dockable impl
+  int dockableAt() const override { return ui::TOP | ui::BOTTOM; }
+
 private:
   obs::scoped_connection m_extKeys;
   obs::scoped_connection m_extScripts;
+  bool m_queuedReload = false;
 };
 
 } // namespace app
diff --git a/src/app/ui/main_window.cpp b/src/app/ui/main_window.cpp
index 87c81c8d5..250dcee14 100644
--- a/src/app/ui/main_window.cpp
+++ b/src/app/ui/main_window.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -24,9 +24,11 @@
 #include "app/ui/color_bar.h"
 #include "app/ui/context_bar.h"
 #include "app/ui/doc_view.h"
+#include "app/ui/dock.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/editor/editor_view.h"
 #include "app/ui/home_view.h"
+#include "app/ui/layout_selector.h"
 #include "app/ui/main_menu_bar.h"
 #include "app/ui/notifications.h"
 #include "app/ui/preview_editor.h"
@@ -42,6 +44,7 @@
 #include "os/event.h"
 #include "os/event_queue.h"
 #include "os/system.h"
+#include "ui/app_state.h"
 #include "ui/drag_event.h"
 #include "ui/message.h"
 #include "ui/splitter.h"
@@ -57,6 +60,10 @@ namespace app {
 
 using namespace ui;
 
+static constexpr const char* kLegacyLayoutMainWindowSection = "layout:main_window";
+static constexpr const char* kLegacyLayoutTimelineSplitter = "timeline_splitter";
+static constexpr const char* kLegacyLayoutColorBarSplitter = "color_bar_splitter";
+
 class ScreenScalePanic : public INotificationDelegate {
 public:
   std::string notificationText() override { return "Reset Scale!"; }
@@ -83,7 +90,11 @@ public:
 };
 
 MainWindow::MainWindow()
-  : m_mode(NormalMode)
+  : ui::Window(ui::Window::DesktopWindow)
+  , m_tooltipManager(new TooltipManager)
+  , m_dock(new Dock)
+  , m_customizableDock(new Dock)
+  , m_mode(NormalMode)
   , m_homeView(nullptr)
   , m_scalePanic(nullptr)
   , m_browserView(nullptr)
@@ -105,8 +116,9 @@ MainWindow::MainWindow()
 // Refer to https://github.com/aseprite/aseprite/issues/3914
 void MainWindow::initialize()
 {
-  m_tooltipManager = new TooltipManager();
-  m_menuBar = new MainMenuBar();
+  m_menuBar = std::make_unique<MainMenuBar>();
+  m_notifications = std::make_unique<Notifications>();
+  m_layoutSelector = std::make_unique<LayoutSelector>(m_tooltipManager, m_notifications.get());
 
   // Register commands to load menus+shortcuts for these commands
   Editor::registerCommands();
@@ -117,20 +129,19 @@ void MainWindow::initialize()
   // Setup the main menubar
   m_menuBar->setMenu(AppMenus::instance()->getRootMenu());
 
-  m_notifications = new Notifications();
-  m_statusBar = new StatusBar(m_tooltipManager);
-  m_toolBar = new ToolBar();
-  m_tabsBar = new WorkspaceTabs(this);
-  m_workspace = new Workspace();
-  m_previewEditor = new PreviewEditorWindow();
-  m_colorBar = new ColorBar(colorBarPlaceholder()->align(), m_tooltipManager);
-  m_contextBar = new ContextBar(m_tooltipManager, m_colorBar);
+  m_statusBar = std::make_unique<StatusBar>(m_tooltipManager);
+  m_toolBar = std::make_unique<ToolBar>();
+  m_tabsBar = std::make_unique<WorkspaceTabs>(this);
+  m_workspace = std::make_unique<Workspace>();
+  m_previewEditor = std::make_unique<PreviewEditorWindow>();
+  m_colorBar = std::make_unique<ColorBar>(m_tooltipManager);
+  m_contextBar = std::make_unique<ContextBar>(m_tooltipManager, m_colorBar.get());
 
   // The timeline (AniControls) tooltips will use the keyboard
   // shortcuts loaded above.
-  m_timeline = new Timeline(m_tooltipManager);
+  m_timeline = std::make_unique<Timeline>(m_tooltipManager);
 
-  m_workspace->setTabsBar(m_tabsBar);
+  m_workspace->setTabsBar(m_tabsBar.get());
   m_workspace->BeforeViewChanged.connect(&MainWindow::onBeforeViewChange, this);
   m_workspace->ActiveViewChanged.connect(&MainWindow::onActiveViewChange, this);
 
@@ -146,21 +157,31 @@ void MainWindow::initialize()
   m_workspace->setExpansive(true);
   m_notifications->setVisible(false);
 
+  // IDs to create UI layouts from a Dock (see app::Layout
+  // constructor).
+  m_colorBar->setId("colorbar");
+  m_contextBar->setId("contextbar");
+  m_statusBar->setId("statusbar");
+  m_timeline->setId("timeline");
+  m_toolBar->setId("toolbar");
+  m_workspace->setId("workspace");
+
   // Add the widgets in the boxes
   addChild(m_tooltipManager);
-  menuBarPlaceholder()->addChild(m_menuBar);
-  menuBarPlaceholder()->addChild(m_notifications);
-  contextBarPlaceholder()->addChild(m_contextBar);
-  colorBarPlaceholder()->addChild(m_colorBar);
-  toolBarPlaceholder()->addChild(m_toolBar);
-  statusBarPlaceholder()->addChild(m_statusBar);
-  tabsPlaceholder()->addChild(m_tabsBar);
-  workspacePlaceholder()->addChild(m_workspace);
-  timelinePlaceholder()->addChild(m_timeline);
+  addChild(m_dock);
 
-  // Default splitter positions
-  colorBarSplitter()->setPosition(m_colorBar->sizeHint().w);
-  timelineSplitter()->setPosition(75);
+  m_customizableDockPlaceholder = std::make_unique<Widget>();
+  m_customizableDockPlaceholder->addChild(m_customizableDock);
+
+  m_dock->top()->dock(ui::RIGHT, m_layoutSelector.get());
+  m_dock->top()->center()->dock(ui::BOTTOM, m_tabsBar.get());
+  m_dock->top()->center()->dock(ui::CENTER, m_menuBar.get());
+
+  m_dock->dock(ui::CENTER, m_customizableDockPlaceholder.get());
+
+  // After the user resizes the dock we save the updated layout
+  m_saveDockLayoutConn = m_customizableDock->UserResizedDock.connect(&MainWindow::saveActiveLayout,
+                                                                     this);
 
   // Reconfigure workspace when the timeline position is changed.
   auto& pref = Preferences::instance();
@@ -172,49 +193,60 @@ void MainWindow::initialize()
 
   AppMenus::instance()->rebuildRecentList();
 
-  // When the language is change, we reload the menu bar strings and
+  // When the language is changed, we reload the menu bar strings and
   // relayout the whole main window.
   Strings::instance()->LanguageChange.connect([this] { onLanguageChange(); });
+
+  initTheme();
 }
 
 MainWindow::~MainWindow()
 {
-  delete m_scalePanic;
+  m_timelineResizeConn.disconnect();
+  m_colorBarResizeConn.disconnect();
+  m_saveDockLayoutConn.disconnect();
+
+  m_dock->resetDocks();
+  m_customizableDock->resetDocks();
+
+  // Leaving them in can cause crashes when cleaning up.
+  m_dock = nullptr;
+  m_customizableDock = nullptr;
+
+  m_layoutSelector.reset();
+  m_scalePanic.reset();
 
 #ifdef ENABLE_SCRIPTING
   if (m_devConsoleView) {
     if (m_devConsoleView->parent() && m_workspace)
-      m_workspace->removeView(m_devConsoleView);
-    delete m_devConsoleView;
+      m_workspace->removeView(m_devConsoleView.get());
+    m_devConsoleView.reset();
   }
 #endif
 
   if (m_browserView) {
     if (m_browserView->parent() && m_workspace)
-      m_workspace->removeView(m_browserView);
-    delete m_browserView;
+      m_workspace->removeView(m_browserView.get());
+    m_browserView.reset();
   }
 
   if (m_homeView) {
     if (m_homeView->parent() && m_workspace)
-      m_workspace->removeView(m_homeView);
-    delete m_homeView;
+      m_workspace->removeView(m_homeView.get());
+    m_homeView.reset();
   }
-  if (m_contextBar)
-    delete m_contextBar;
-  if (m_previewEditor)
-    delete m_previewEditor;
+  m_contextBar.reset();
+  m_previewEditor.reset();
 
   // Destroy the workspace first so ~Editor can dettach slots from
   // ColorBar. TODO this is a terrible hack for slot/signal stuff,
   // connections should be handle in a better/safer way.
-  if (m_workspace)
-    delete m_workspace;
+  m_workspace.reset();
 
   // Remove the root-menu from the menu-bar (because the rootmenu
   // module should destroy it).
   if (m_menuBar)
-    m_menuBar->setMenu(NULL);
+    m_menuBar->setMenu(nullptr);
 }
 
 void MainWindow::onLanguageChange()
@@ -232,8 +264,8 @@ DocView* MainWindow::getDocView()
 HomeView* MainWindow::getHomeView()
 {
   if (!m_homeView)
-    m_homeView = new HomeView;
-  return m_homeView;
+    m_homeView = std::make_unique<HomeView>();
+  return m_homeView.get();
 }
 
 #ifdef ENABLE_UPDATER
@@ -254,7 +286,7 @@ void MainWindow::showNotification(INotificationDelegate* del)
 {
   m_notifications->addLink(del);
   m_notifications->setVisible(true);
-  m_notifications->parent()->layout();
+  layout();
 }
 
 void MainWindow::showHomeOnOpen()
@@ -270,20 +302,20 @@ void MainWindow::showHomeOnOpen()
 
     // Show "Home" tab in the first position, and select it only if
     // there is no other view selected.
-    m_workspace->addView(m_homeView, 0);
+    m_workspace->addView(m_homeView.get(), 0);
     if (selectedTab)
       m_tabsBar->selectTab(selectedTab);
     else
-      m_tabsBar->selectTab(m_homeView);
+      m_tabsBar->selectTab(m_homeView.get());
   }
 }
 
 void MainWindow::showHome()
 {
   if (!getHomeView()->parent()) {
-    m_workspace->addView(m_homeView, 0);
+    m_workspace->addView(m_homeView.get(), 0);
   }
-  m_tabsBar->selectTab(m_homeView);
+  m_tabsBar->selectTab(m_homeView.get());
 }
 
 void MainWindow::showDefaultStatusBar()
@@ -298,19 +330,19 @@ void MainWindow::showDefaultStatusBar()
 
 bool MainWindow::isHomeSelected() const
 {
-  return (m_homeView && m_workspace->activeView() == m_homeView);
+  return (m_homeView && m_workspace->activeView() == m_homeView.get());
 }
 
 void MainWindow::showBrowser(const std::string& filename, const std::string& section)
 {
   if (!m_browserView)
-    m_browserView = new BrowserView;
+    m_browserView = std::make_unique<BrowserView>();
 
   m_browserView->loadFile(filename, section);
 
   if (!m_browserView->parent()) {
-    m_workspace->addView(m_browserView);
-    m_tabsBar->selectTab(m_browserView);
+    m_workspace->addView(m_browserView.get());
+    m_tabsBar->selectTab(m_browserView.get());
   }
 }
 
@@ -318,11 +350,11 @@ void MainWindow::showDevConsole()
 {
 #ifdef ENABLE_SCRIPTING
   if (!m_devConsoleView)
-    m_devConsoleView = new DevConsoleView;
+    m_devConsoleView = std::make_unique<DevConsoleView>();
 
   if (!m_devConsoleView->parent()) {
-    m_workspace->addView(m_devConsoleView);
-    m_tabsBar->selectTab(m_devConsoleView);
+    m_workspace->addView(m_devConsoleView.get());
+    m_tabsBar->selectTab(m_devConsoleView.get());
   }
 #endif
 }
@@ -351,15 +383,109 @@ void MainWindow::setTimelineVisibility(bool visible)
 
 void MainWindow::popTimeline()
 {
-  Preferences& preferences = Preferences::instance();
-
-  if (!preferences.general.autoshowTimeline())
+  if (!Preferences::instance().general.autoshowTimeline())
     return;
 
   if (!getTimelineVisibility())
     setTimelineVisibility(true);
 }
 
+void MainWindow::setDefaultLayout()
+{
+  m_timelineResizeConn.disconnect();
+  m_colorBarResizeConn.disconnect();
+
+  const auto colorBarWidth = get_config_double(kLegacyLayoutMainWindowSection,
+                                               kLegacyLayoutColorBarSplitter,
+                                               m_colorBar->sizeHint().w);
+
+  m_customizableDock->resetDocks();
+  m_customizableDock->dock(ui::LEFT, m_colorBar.get(), gfx::Size(colorBarWidth, 0));
+  m_customizableDock->dock(ui::BOTTOM, m_statusBar.get());
+  m_customizableDock->center()->dock(ui::TOP, m_contextBar.get());
+  m_customizableDock->center()->dock(ui::RIGHT, m_toolBar.get());
+
+  const auto timelineSplitterPos =
+    get_config_double(kLegacyLayoutMainWindowSection, kLegacyLayoutTimelineSplitter, 75.0) / 100.0;
+  const auto timelinePos = Preferences::instance().general.timelinePosition();
+
+  // We calculate a estimate of the workspace bounds (as we don't yet
+  // know its size, because we're just constructing the dock where the
+  // workspace will be inside).
+  const int kLegacySplitterSeparation = 3 * ui::guiscale();
+  auto workspaceBounds = bounds();
+  workspaceBounds.w -= colorBarWidth + m_toolBar->sizeHint().w + 2 * kLegacySplitterSeparation;
+  workspaceBounds.h -= m_menuBar->sizeHint().h + m_tabsBar->sizeHint().h +
+                       m_contextBar->sizeHint().h + m_statusBar->sizeHint().h;
+
+  int timelineSide;
+  gfx::Size timelineSize(75, 75);
+  switch (timelinePos) {
+    case gen::TimelinePosition::LEFT:
+      timelineSide = ui::LEFT;
+      timelineSize.w = (workspaceBounds.w * (1.0 - timelineSplitterPos));
+      break;
+    case gen::TimelinePosition::RIGHT:
+      timelineSide = ui::RIGHT;
+      timelineSize.w = (workspaceBounds.w * (1.0 - timelineSplitterPos));
+      break;
+    default:
+    case gen::TimelinePosition::BOTTOM:
+      timelineSide = ui::BOTTOM;
+      timelineSize.h = (workspaceBounds.h * (1.0 - timelineSplitterPos));
+      break;
+  }
+
+  // Timeline config
+  m_customizableDock->center()->center()->dock(timelineSide,
+                                               m_timeline.get(),
+                                               timelineSize.createUnion(gfx::Size(64, 64)));
+
+  m_customizableDock->center()->center()->dock(ui::CENTER, m_workspace.get());
+  configureWorkspaceLayout();
+}
+
+void MainWindow::setMirroredDefaultLayout()
+{
+  m_timelineResizeConn.disconnect();
+  m_colorBarResizeConn.disconnect();
+
+  auto colorBarWidth = get_config_double(kLegacyLayoutMainWindowSection,
+                                         kLegacyLayoutColorBarSplitter,
+                                         m_colorBar->sizeHint().w);
+
+  m_customizableDock->resetDocks();
+  m_customizableDock->dock(ui::RIGHT, m_colorBar.get(), gfx::Size(colorBarWidth, 0));
+  m_customizableDock->dock(ui::BOTTOM, m_statusBar.get());
+  m_customizableDock->center()->dock(ui::TOP, m_contextBar.get());
+  m_customizableDock->center()->dock(ui::LEFT, m_toolBar.get());
+  m_customizableDock->center()->center()->dock(ui::BOTTOM,
+                                               m_timeline.get(),
+                                               gfx::Size(64 * guiscale(), 64 * guiscale()));
+  m_customizableDock->center()->center()->dock(ui::CENTER, m_workspace.get());
+  configureWorkspaceLayout();
+}
+
+void MainWindow::loadUserLayout(const Layout* layout)
+{
+  m_timelineResizeConn.disconnect();
+  m_colorBarResizeConn.disconnect();
+
+  m_customizableDock->resetDocks();
+
+  if (!layout->loadLayout(m_customizableDock)) {
+    LOG(WARNING, "Layout %s failed to load, resetting to default.\n", layout->id().c_str());
+    setDefaultLayout();
+  }
+
+  this->layout();
+}
+
+void MainWindow::setCustomizeDock(bool enable)
+{
+  m_customizableDock->setCustomizing(enable);
+}
+
 void MainWindow::dataRecoverySessionsAreReady()
 {
   getHomeView()->dataRecoverySessionsAreReady();
@@ -375,24 +501,37 @@ bool MainWindow::onProcessMessage(ui::Message* msg)
 
 void MainWindow::onInitTheme(ui::InitThemeEvent& ev)
 {
-  app::gen::MainWindow::onInitTheme(ev);
+  ui::Window::onInitTheme(ev);
+  noBorderNoChildSpacing();
   if (m_previewEditor)
     m_previewEditor->initTheme();
-}
 
-void MainWindow::onSaveLayout(SaveLayoutEvent& ev)
-{
-  // Invert the timeline splitter position before we save the setting.
-  if (Preferences::instance().general.timelinePosition() == gen::TimelinePosition::LEFT) {
-    timelineSplitter()->setPosition(100 - timelineSplitter()->getPosition());
-  }
-
-  Window::onSaveLayout(ev);
+  auto* theme = static_cast<skin::SkinTheme*>(this->theme());
+  m_dock->setBgColor(theme->colors.windowFace());
+  m_customizableDock->setBgColor(theme->colors.workspace());
 }
 
 void MainWindow::onResize(ui::ResizeEvent& ev)
 {
-  app::gen::MainWindow::onResize(ev);
+  ui::Window::onResize(ev);
+
+  // Load default or user-selected layout after the first resize event
+  // is received.
+  if (m_firstResize) {
+    m_firstResize = false;
+
+    // If the layout is defined in the user layouts file, we loaded it
+    // (it can be a modified default/mirrored layout).
+    if (LayoutPtr layout = m_layoutSelector->activeLayout()) {
+      loadUserLayout(layout.get());
+    }
+    else if (m_layoutSelector->activeLayoutId() == Layout::kMirroredDefault) {
+      setMirroredDefaultLayout();
+    }
+    else {
+      setDefaultLayout();
+    }
+  }
 
   os::Window* nativeWindow = (display() ? display()->nativeWindow() : nullptr);
   if (nativeWindow && nativeWindow->screen()) {
@@ -405,7 +544,8 @@ void MainWindow::onResize(ui::ResizeEvent& ev)
     if ((scale > 2) && (!m_scalePanic)) {
       const gfx::Size wa = nativeWindow->screen()->workarea().size();
       if ((wa.w / scale < 256 || wa.h / scale < 256)) {
-        showNotification(m_scalePanic = new ScreenScalePanic);
+        m_scalePanic = std::make_unique<ScreenScalePanic>();
+        showNotification(m_scalePanic.get());
       }
     }
   }
@@ -421,6 +561,11 @@ void MainWindow::onBeforeViewChange()
 // inform to the UIContext that the current view has changed.
 void MainWindow::onActiveViewChange()
 {
+  // If we are closing the app, we just ignore all view changes (as
+  // docs will be destroyed and views closed).
+  if (get_app_state() != AppState::kNormal || !m_dock)
+    return;
+
   // First we have to configure the MainWindow layout (e.g. show
   // Timeline if needed) as UIContext::setActiveView() will configure
   // several widgets (calling updateUsingEditor() functions) using the
@@ -508,7 +653,7 @@ void MainWindow::onContextMenuTab(Tabs* tabs, TabView* tabView)
   WorkspaceView* view = dynamic_cast<WorkspaceView*>(tabView);
   ASSERT(view);
   if (view)
-    view->onTabPopup(m_workspace);
+    view->onTabPopup(m_workspace.get());
 }
 
 void MainWindow::onTabsContainerDoubleClicked(Tabs* tabs)
@@ -588,71 +733,80 @@ DropTabResult MainWindow::onDropTab(Tabs* tabs,
 
 void MainWindow::configureWorkspaceLayout()
 {
+  // First layout to get the bounds of some widgets
+  layout();
+
   const auto& pref = Preferences::instance();
   bool normal = (m_mode == NormalMode);
+  bool showMenu = normal;
   bool isDoc = (getDocView() != nullptr);
 
-  if (os::System::instance()->menus() == nullptr || pref.general.showMenuBar()) {
-    m_menuBar->resetMaxSize();
-  }
-  else {
-    m_menuBar->setMaxSize(gfx::Size(0, 0));
-  }
+  if (os::System::instance()->menus() && !pref.general.showMenuBar())
+    showMenu = false;
 
-  m_menuBar->setVisible(normal);
+  m_menuBar->setVisible(showMenu);
   m_notifications->setVisible(normal && m_notifications->hasNotifications());
   m_tabsBar->setVisible(normal);
-  colorBarPlaceholder()->setVisible(normal && isDoc);
+  m_colorBar->setVisible(normal && isDoc);
+  m_colorBarResizeConn = m_customizableDock->Resize.connect(&MainWindow::saveColorBarConfiguration,
+                                                            this);
   m_toolBar->setVisible(normal && isDoc);
   m_statusBar->setVisible(normal);
   m_contextBar->setVisible(isDoc && (m_mode == NormalMode || m_mode == ContextBarAndTimelineMode));
 
   // Configure timeline
-  {
-    auto timelinePosition = pref.general.timelinePosition();
-    bool invertWidgets = false;
-    int align = VERTICAL;
-    switch (timelinePosition) {
-      case gen::TimelinePosition::LEFT:
-        align = HORIZONTAL;
-        invertWidgets = true;
-        break;
-      case gen::TimelinePosition::RIGHT:  align = HORIZONTAL; break;
-      case gen::TimelinePosition::BOTTOM: break;
-    }
-
-    timelineSplitter()->setAlign(align);
-    timelinePlaceholder()->setVisible(
-      isDoc && (m_mode == NormalMode || m_mode == ContextBarAndTimelineMode) &&
-      pref.general.visibleTimeline());
-
-    bool invertSplitterPos = false;
-    if (invertWidgets) {
-      if (timelineSplitter()->firstChild() == workspacePlaceholder() &&
-          timelineSplitter()->lastChild() == timelinePlaceholder()) {
-        timelineSplitter()->removeChild(workspacePlaceholder());
-        timelineSplitter()->addChild(workspacePlaceholder());
-        invertSplitterPos = true;
-      }
-    }
-    else {
-      if (timelineSplitter()->firstChild() == timelinePlaceholder() &&
-          timelineSplitter()->lastChild() == workspacePlaceholder()) {
-        timelineSplitter()->removeChild(timelinePlaceholder());
-        timelineSplitter()->addChild(timelinePlaceholder());
-        invertSplitterPos = true;
-      }
-    }
-    if (invertSplitterPos)
-      timelineSplitter()->setPosition(100 - timelineSplitter()->getPosition());
+  if (m_timeline && m_timeline->parent()) {
+    m_timelineResizeConn = dynamic_cast<Dock*>(m_timeline->parent())
+                             ->Resize.connect(&MainWindow::saveTimelineConfiguration, this);
   }
 
+  m_timeline->setVisible(isDoc && (m_mode == NormalMode || m_mode == ContextBarAndTimelineMode) &&
+                         pref.general.visibleTimeline());
+
   if (m_contextBar->isVisible()) {
     m_contextBar->updateForActiveTool();
   }
 
   layout();
-  invalidate();
+}
+
+void MainWindow::saveTimelineConfiguration()
+{
+  const auto& pref = Preferences::instance();
+  const gfx::Rect timelineBounds = m_timeline->bounds();
+  const gfx::Rect workspaceBounds = m_customizableDock->center()->center()->bounds();
+  auto timelinePosition = pref.general.timelinePosition();
+  double timelineSplitterPos = 0.75;
+
+  switch (timelinePosition) {
+    case gen::TimelinePosition::LEFT:
+    case gen::TimelinePosition::RIGHT:
+      timelineSplitterPos = 1.0 - double(timelineBounds.w) / workspaceBounds.w;
+      break;
+    case gen::TimelinePosition::BOTTOM:
+      timelineSplitterPos = 1.0 - double(timelineBounds.h) / workspaceBounds.h;
+      break;
+  }
+
+  set_config_double(kLegacyLayoutMainWindowSection,
+                    kLegacyLayoutTimelineSplitter,
+                    std::clamp(timelineSplitterPos * 100.0, 1.0, 99.0));
+}
+
+void MainWindow::saveColorBarConfiguration()
+{
+  set_config_double(kLegacyLayoutMainWindowSection,
+                    kLegacyLayoutColorBarSplitter,
+                    m_colorBar->bounds().w);
+}
+
+void MainWindow::saveActiveLayout()
+{
+  ASSERT(m_layoutSelector);
+
+  auto id = m_layoutSelector->activeLayoutId();
+  auto layout = Layout::MakeFromDock(id, id, m_customizableDock);
+  m_layoutSelector->updateActiveLayout(layout);
 }
 
 } // namespace app
diff --git a/src/app/ui/main_window.h b/src/app/ui/main_window.h
index 118c52db4..b109e3ebb 100644
--- a/src/app/ui/main_window.h
+++ b/src/app/ui/main_window.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -10,9 +10,10 @@
 #pragma once
 
 #include "app/ui/tabs.h"
+#include "obs/connection.h"
 #include "ui/window.h"
 
-#include "main_window.xml.h"
+#include <memory>
 
 namespace ui {
 class Splitter;
@@ -30,13 +31,17 @@ class ColorBar;
 class ContextBar;
 class DevConsoleView;
 class DocView;
+class Dock;
 class HomeView;
 class INotificationDelegate;
+class Layout;
+class LayoutSelector;
 class MainMenuBar;
 class Notifications;
 class PreviewEditorWindow;
 class StatusBar;
 class Timeline;
+class ToolBar;
 class Workspace;
 class WorkspaceTabs;
 
@@ -44,7 +49,7 @@ namespace crash {
 class DataRecovery;
 }
 
-class MainWindow : public app::gen::MainWindow,
+class MainWindow : public ui::Window,
                    public TabsDelegate {
 public:
   enum Mode { NormalMode, ContextBarAndTimelineMode, EditorOnlyMode };
@@ -52,13 +57,17 @@ public:
   MainWindow();
   ~MainWindow();
 
-  MainMenuBar* getMenuBar() { return m_menuBar; }
-  ContextBar* getContextBar() { return m_contextBar; }
-  StatusBar* statusBar() { return m_statusBar; }
-  WorkspaceTabs* getTabsBar() { return m_tabsBar; }
-  Timeline* getTimeline() { return m_timeline; }
-  Workspace* getWorkspace() { return m_workspace; }
-  PreviewEditorWindow* getPreviewEditor() { return m_previewEditor; }
+  // TODO refactor: remove the get prefix from these functions
+  MainMenuBar* getMenuBar() { return m_menuBar.get(); }
+  LayoutSelector* layoutSelector() { return m_layoutSelector.get(); }
+  ContextBar* getContextBar() { return m_contextBar.get(); }
+  StatusBar* statusBar() { return m_statusBar.get(); }
+  WorkspaceTabs* getTabsBar() { return m_tabsBar.get(); }
+  Timeline* getTimeline() { return m_timeline.get(); }
+  Workspace* getWorkspace() { return m_workspace.get(); }
+  ColorBar* colorBar() { return m_colorBar.get(); }
+  ToolBar* toolBar() { return m_toolBar.get(); }
+  PreviewEditorWindow* getPreviewEditor() { return m_previewEditor.get(); }
 #ifdef ENABLE_UPDATER
   CheckUpdateDelegate* getCheckUpdateDelegate();
 #endif
@@ -83,6 +92,12 @@ public:
   void setTimelineVisibility(bool visible);
   void popTimeline();
 
+  void setDefaultLayout();
+  void setMirroredDefaultLayout();
+  void loadUserLayout(const Layout* layout);
+  Dock* customizableDock() { return m_customizableDock; }
+  void setCustomizeDock(bool enable);
+
   // When crash::DataRecovery finish to search for sessions, this
   // function is called.
   void dataRecoverySessionsAreReady();
@@ -109,7 +124,6 @@ public:
 protected:
   bool onProcessMessage(ui::Message* msg) override;
   void onInitTheme(ui::InitThemeEvent& ev) override;
-  void onSaveLayout(ui::SaveLayoutEvent& ev) override;
   void onResize(ui::ResizeEvent& ev) override;
   void onBeforeViewChange();
   void onActiveViewChange();
@@ -121,25 +135,36 @@ private:
   DocView* getDocView();
   HomeView* getHomeView();
   void configureWorkspaceLayout();
+  void saveTimelineConfiguration();
+  void saveColorBarConfiguration();
+  void saveActiveLayout();
 
   ui::TooltipManager* m_tooltipManager;
-  MainMenuBar* m_menuBar;
-  StatusBar* m_statusBar;
-  ColorBar* m_colorBar;
-  ContextBar* m_contextBar;
-  ui::Widget* m_toolBar;
-  WorkspaceTabs* m_tabsBar;
+  Dock* m_dock;
+  Dock* m_customizableDock;
+  std::unique_ptr<Widget> m_customizableDockPlaceholder;
+  std::unique_ptr<MainMenuBar> m_menuBar;
+  std::unique_ptr<Notifications> m_notifications;
+  std::unique_ptr<LayoutSelector> m_layoutSelector;
+  std::unique_ptr<StatusBar> m_statusBar;
+  std::unique_ptr<ColorBar> m_colorBar;
+  std::unique_ptr<ContextBar> m_contextBar;
+  std::unique_ptr<ToolBar> m_toolBar;
+  std::unique_ptr<WorkspaceTabs> m_tabsBar;
   Mode m_mode;
-  Timeline* m_timeline;
-  Workspace* m_workspace;
-  PreviewEditorWindow* m_previewEditor;
-  HomeView* m_homeView;
-  Notifications* m_notifications;
-  INotificationDelegate* m_scalePanic;
-  BrowserView* m_browserView;
+  std::unique_ptr<Timeline> m_timeline;
+  std::unique_ptr<Workspace> m_workspace;
+  std::unique_ptr<PreviewEditorWindow> m_previewEditor;
+  std::unique_ptr<HomeView> m_homeView;
+  std::unique_ptr<INotificationDelegate> m_scalePanic;
+  std::unique_ptr<BrowserView> m_browserView;
 #ifdef ENABLE_SCRIPTING
-  DevConsoleView* m_devConsoleView;
+  std::unique_ptr<DevConsoleView> m_devConsoleView;
 #endif
+  obs::scoped_connection m_timelineResizeConn;
+  obs::scoped_connection m_colorBarResizeConn;
+  obs::scoped_connection m_saveDockLayoutConn;
+  bool m_firstResize = true;
 };
 
 } // namespace app
diff --git a/src/app/ui/mini_help_button.cpp b/src/app/ui/mini_help_button.cpp
index 1c1e8e29e..000d536ef 100644
--- a/src/app/ui/mini_help_button.cpp
+++ b/src/app/ui/mini_help_button.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2024  Igara Studio S.A.
+// Copyright (C) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -59,13 +59,13 @@ void MiniHelpButton::onSetDecorativeWidgetBounds()
   gfx::Rect rect(0, 0, 0, 0);
   const gfx::Size thisSize = this->sizeHint();
   const gfx::Size closeSize = theme->calcSizeHint(this, theme->styles.windowCloseButton());
-  const gfx::Border margin(0, 0, 0, 0);
+  const gfx::Border margin = style()->margin();
 
   rect.w = thisSize.w;
   rect.h = thisSize.h;
   rect.offset(window->bounds().x2() - theme->styles.windowCloseButton()->margin().width() -
-                closeSize.w - style()->margin().right() - thisSize.w,
-              window->bounds().y + style()->margin().top());
+                closeSize.w - margin.right() - thisSize.w,
+              window->bounds().y + margin.top());
 
   setBounds(rect);
 }
diff --git a/src/app/ui/news_listbox.cpp b/src/app/ui/news_listbox.cpp
index 3a9c104cb..24f1fac68 100644
--- a/src/app/ui/news_listbox.cpp
+++ b/src/app/ui/news_listbox.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -20,6 +20,7 @@
 #include "base/fs.h"
 #include "base/string.h"
 #include "base/time.h"
+#include "text/font_metrics.h"
 #include "ui/link_label.h"
 #include "ui/message.h"
 #include "ui/paint_event.h"
@@ -158,7 +159,6 @@ protected:
     auto theme = SkinTheme::get(this);
     ui::Style* style = theme->styles.newsItem();
 
-    setTextQuiet(m_title);
     gfx::Size sz = theme->calcSizeHint(this, style);
 
     if (!m_desc.empty()) {
@@ -177,20 +177,35 @@ protected:
     ui::Style* style = theme->styles.newsItem();
     ui::Style* styleDetail = theme->styles.newsItemDetail();
 
-    setTextQuiet(m_title);
     gfx::Size textSize = theme->calcSizeHint(this, style);
     gfx::Rect textBounds(bounds.x, bounds.y, bounds.w, textSize.h);
     gfx::Rect detailsBounds(bounds.x, bounds.y + textSize.h, bounds.w, bounds.h - textSize.h);
 
-    theme->paintWidget(g, this, style, textBounds);
+    gfx::Border border = theme->calcBorder(this, style);
+    gfx::Border borderDetail = theme->calcBorder(this, styleDetail);
 
-    setTextQuiet(m_desc);
-    theme->paintWidget(g, this, styleDetail, detailsBounds);
+    if (!m_titleBlob)
+      m_titleBlob = text::TextBlob::MakeWithShaper(theme->fontMgr(), font(), m_title);
+
+    PaintWidgetPartInfo info(this);
+    info.baseline = border.top();
+    if (m_titleBlob) {
+      info.textBlob = m_titleBlob;
+      info.baseline += m_titleBlob->baseline();
+      theme->paintWidgetPart(g, style, bounds, info);
+      info.baseline += border.bottom();
+
+      info.text = &m_desc;
+      info.textBlob = nullptr;
+      info.baseline += borderDetail.top() + m_titleBlob->baseline();
+      theme->paintWidgetPart(g, styleDetail, detailsBounds, info);
+    }
   }
 
 private:
   std::string m_title;
   std::string m_desc;
+  text::TextBlobRef m_titleBlob;
 };
 
 class ProblemsItem : public NewsItem {
diff --git a/src/app/ui/notifications.cpp b/src/app/ui/notifications.cpp
index ad997af6a..0ace8b7de 100644
--- a/src/app/ui/notifications.cpp
+++ b/src/app/ui/notifications.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2023  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -20,6 +20,7 @@
 
 namespace app {
 
+using namespace app::skin;
 using namespace ui;
 
 class NotificationItem : public MenuItem {
@@ -39,10 +40,7 @@ private:
   INotificationDelegate* m_delegate;
 };
 
-Notifications::Notifications()
-  : Button("")
-  , m_flagStyle(skin::SkinTheme::get(this)->styles.flag())
-  , m_red(false)
+Notifications::Notifications() : Button(""), m_red(false)
 {
 }
 
@@ -52,13 +50,22 @@ void Notifications::addLink(INotificationDelegate* del)
   m_red = true;
 }
 
+void Notifications::onInitTheme(InitThemeEvent& ev)
+{
+  Button::onInitTheme(ev);
+  m_popup.initTheme();
+}
+
 void Notifications::onSizeHint(SizeHintEvent& ev)
 {
-  ev.setSizeHint(gfx::Size(16, 10) * guiscale()); // TODO hard-coded flag size
+  auto* theme = SkinTheme::get(this);
+  auto hint = theme->calcSizeHint(this, theme->styles.flag());
+  ev.setSizeHint(hint);
 }
 
 void Notifications::onPaint(PaintEvent& ev)
 {
+  auto* theme = SkinTheme::get(this);
   Graphics* g = ev.graphics();
 
   PaintWidgetPartInfo info;
@@ -69,7 +76,7 @@ void Notifications::onPaint(PaintEvent& ev)
   if (isSelected())
     info.styleFlags |= ui::Style::Layer::kSelected;
 
-  theme()->paintWidgetPart(g, m_flagStyle, clientBounds(), info);
+  theme->paintWidgetPart(g, theme->styles.flag(), clientBounds(), info);
 }
 
 void Notifications::onClick()
diff --git a/src/app/ui/notifications.h b/src/app/ui/notifications.h
index ecd79890e..c56517808 100644
--- a/src/app/ui/notifications.h
+++ b/src/app/ui/notifications.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2023  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -9,6 +9,7 @@
 #define APP_UI_NOTIFICATIONS_H_INCLUDED
 #pragma once
 
+#include "app/ui/dockable.h"
 #include "ui/button.h"
 #include "ui/menu.h"
 
@@ -19,20 +20,24 @@ class Style;
 namespace app {
 class INotificationDelegate;
 
-class Notifications : public ui::Button {
+class Notifications : public ui::Button,
+                      public Dockable {
 public:
   Notifications();
 
   void addLink(INotificationDelegate* del);
   bool hasNotifications() const { return m_popup.hasChildren(); }
 
+  // Dockable impl
+  int dockableAt() const override { return ui::TOP | ui::BOTTOM | ui::LEFT | ui::RIGHT; }
+
 protected:
+  void onInitTheme(ui::InitThemeEvent& ev) override;
   void onSizeHint(ui::SizeHintEvent& ev) override;
   void onPaint(ui::PaintEvent& ev) override;
   void onClick() override;
 
 private:
-  ui::Style* m_flagStyle;
   bool m_red;
   ui::Menu m_popup;
 };
diff --git a/src/app/ui/palette_view.cpp b/src/app/ui/palette_view.cpp
index c2f8a46fd..ee4013670 100644
--- a/src/app/ui/palette_view.cpp
+++ b/src/app/ui/palette_view.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -923,8 +923,8 @@ void PaletteView::onPaint(ui::PaintEvent& ev)
         g->drawText(text,
                     negColor,
                     gfx::ColorNone,
-                    gfx::Point(box2.x + box2.w / 2 - minifont->textLength(text) / 2,
-                               box2.y + box2.h / 2 - minifont->height() / 2));
+                    gfx::Point(guiscaled_center(box2.x, box2.w, minifont->textLength(text)),
+                               guiscaled_center(box2.y, box2.h, minifont->lineHeight())));
       }
 
       // Draw the selection
diff --git a/src/app/ui/palettes_listbox.cpp b/src/app/ui/palettes_listbox.cpp
index b80f7e2ec..e40f9fbed 100644
--- a/src/app/ui/palettes_listbox.cpp
+++ b/src/app/ui/palettes_listbox.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -14,33 +14,33 @@
 #include "app/app.h"
 #include "app/doc.h"
 #include "app/extensions.h"
+#include "app/i18n/strings.h"
+#include "app/ini_file.h"
 #include "app/modules/palettes.h"
 #include "app/res/palette_resource.h"
 #include "app/res/palettes_loader_delegate.h"
 #include "app/ui/doc_view.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/icon_button.h"
+#include "app/ui/separator_in_view.h"
 #include "app/ui/skin/skin_theme.h"
 #include "app/ui_context.h"
+#include "base/fs.h"
 #include "base/launcher.h"
 #include "doc/palette.h"
 #include "doc/sprite.h"
 #include "os/surface.h"
 #include "ui/graphics.h"
-#include "ui/listitem.h"
 #include "ui/message.h"
-#include "ui/paint_event.h"
-#include "ui/resize_event.h"
 #include "ui/size_hint_event.h"
 #include "ui/tooltips.h"
-#include "ui/view.h"
 
 namespace app {
 
 using namespace ui;
 using namespace app::skin;
 
-static bool is_url_char(int chr)
+static constexpr bool is_url_char(const int chr)
 {
   return ((chr >= 'a' && chr <= 'z') || (chr >= 'A' && chr <= 'Z') || (chr >= '0' && chr <= '9') ||
           (chr == ':' || chr == '/' || chr == '@' || chr == '?' || chr == '!' || chr == '#' ||
@@ -49,26 +49,21 @@ static bool is_url_char(int chr)
            chr == ')' || chr == '$' || chr == '\''));
 }
 
+constexpr const char* kSectionName = "PinnedPalettes";
+constexpr const size_t kPinnedLimit = 9999;
+
 class PalettesListItem : public ResourceListItem {
   class CommentButton : public IconButton {
   public:
-    CommentButton(const std::string& comment)
+    explicit CommentButton(const std::string& comment)
       : IconButton(SkinTheme::instance()->parts.iconUserData())
       , m_comment(comment)
     {
       setFocusStop(false);
-      initTheme();
+      setTransparent(true);
     }
 
   private:
-    void onInitTheme(InitThemeEvent& ev) override
-    {
-      IconButton::onInitTheme(ev);
-
-      auto theme = SkinTheme::get(this);
-      setBgColor(theme->colors.listitemNormalFace());
-    }
-
     void onClick() override
     {
       IconButton::onClick();
@@ -85,46 +80,201 @@ class PalettesListItem : public ResourceListItem {
   };
 
 public:
-  PalettesListItem(Resource* resource, TooltipManager* tooltips)
+  PalettesListItem(Resource* resource, TooltipManager* tooltips, bool isPinned)
     : ResourceListItem(resource)
-    , m_comment(nullptr)
+    , m_resource(resource)
+    , m_tooltips(tooltips)
   {
-    std::string comment = static_cast<PaletteResource*>(resource)->palette()->comment();
+    auto* filler = new BoxFiller;
+    m_hbox.setFocusStop(false);
+    m_hbox.setTransparent(true);
+    filler->setTransparent(true);
+    filler->setFocusStop(false);
+    m_hbox.addChild(filler);
+
+    const std::string& comment = static_cast<PaletteResource*>(resource)->palette()->comment();
     if (!comment.empty()) {
-      addChild(m_comment = new CommentButton(comment));
-
-      tooltips->addTooltipFor(m_comment, comment, LEFT);
+      auto* commentButton = new CommentButton(comment);
+      tooltips->addTooltipFor(commentButton, comment, LEFT);
+      m_hbox.addChild(commentButton);
     }
+
+    setPinned(isPinned);
+
+    addChild(&m_hbox);
+    m_hbox.setVisible(false);
+    m_initialized = true;
   }
 
-private:
-  void onResize(ResizeEvent& ev) override
+  void setPinned(bool isPinned)
   {
-    ResourceListItem::onResize(ev);
+    const auto& part = isPinned ? SkinTheme::instance()->parts.pinned() :
+                                  SkinTheme::instance()->parts.unpinned();
+    IconButton* pinnedButton;
 
-    if (m_comment) {
-      auto reqSz = m_comment->sizeHint();
-      m_comment->setBounds(gfx::Rect(ev.bounds().x + ev.bounds().w - reqSz.w,
-                                     ev.bounds().y + ev.bounds().h / 2 - reqSz.h / 2,
-                                     reqSz.w,
-                                     reqSz.h));
+    if (m_initialized) {
+      pinnedButton = static_cast<IconButton*>(m_hbox.lastChild());
+      pinnedButton->setIcon(part);
+      m_tooltips->removeTooltipFor(pinnedButton);
     }
+    else {
+      pinnedButton = new IconButton(part);
+      pinnedButton->setTransparent(true);
+      pinnedButton->setFocusStop(false);
+
+      const std::string resourceId = m_resource->id();
+      pinnedButton->Click.connect([&, resourceId] {
+        if (auto* p = dynamic_cast<PalettesListBox*>(parent()))
+          p->togglePinned(resourceId);
+      });
+
+      m_hbox.addChild(pinnedButton);
+    }
+
+    m_tooltips->addTooltipFor(
+      pinnedButton,
+      isPinned ? Strings::resource_listbox_unpin() : Strings::resource_listbox_pin(),
+      LEFT);
   }
 
-  CommentButton* m_comment;
+  bool onProcessMessage(Message* msg) override
+  {
+    switch (msg->type()) {
+      case kMouseLeaveMessage: {
+        m_hbox.setVisible(false);
+        invalidate();
+        break;
+      }
+      case kMouseEnterMessage: {
+        m_hbox.setVisible(true);
+        invalidate();
+        break;
+      }
+    }
+
+    return ResourceListItem::onProcessMessage(msg);
+  }
+
+  bool m_initialized = false;
+  Resource* m_resource;
+  TooltipManager* m_tooltips;
+  HBox m_hbox;
 };
 
 PalettesListBox::PalettesListBox()
   : ResourcesListBox(new ResourcesLoader(std::make_unique<PalettesLoaderDelegate>()))
+  , m_pinnedSeparator("", HORIZONTAL)
 {
+  m_pinnedSeparator.setFocusStop(false);
+  m_pinnedSeparator.InitTheme.connect(
+    [&] { m_pinnedSeparator.setBorder(m_pinnedSeparator.border() * guiscale() * 2); });
+
   addChild(&m_tooltips);
 
+  loadPinnedQuiet();
+  FinishLoading.connect(&PalettesListBox::loadPinned, this);
+
   m_extPaletteChanges = App::instance()->extensions().PalettesChange.connect(
     [this] { markToReload(); });
   m_extPresetsChanges = App::instance()->PalettePresetsChange.connect([this] { markToReload(); });
 }
 
-const doc::Palette* PalettesListBox::selectedPalette()
+void PalettesListBox::togglePinned(const std::string& paletteId)
+{
+  ASSERT(!paletteId.empty());
+
+  bool isPinning = false;
+  auto it = std::find(m_pinned.begin(), m_pinned.end(), paletteId);
+  if (it != m_pinned.end()) {
+    m_pinned.erase(it);
+  }
+  else {
+    isPinning = true;
+
+    if (m_pinned.size() >= kPinnedLimit)
+      m_pinned.erase(m_pinned.begin()); // Pop the oldest one when going over.
+
+    m_pinned.push_back(paletteId);
+  }
+
+  for (Widget* child : children()) {
+    if (auto* item = dynamic_cast<PalettesListItem*>(child);
+        item && item->m_resource->id() == paletteId) {
+      item->setPinned(isPinning);
+
+      if (isPinning) {
+        item->setSelected(true);
+      }
+
+      // Hack to avoid the buttons lingering when re-sorting
+      item->sendMessage(new Message(kMouseLeaveMessage));
+
+      // We could break here, but that wouldn't let us deselect every child so our
+      // new pinned can be selected and then we can center on it.
+    }
+    else if (child != nullptr && isPinning) {
+      child->setSelected(false);
+    }
+  }
+
+  toggleSeparator();
+  savePinned();
+  sortItems();
+  layout();
+
+  if (isPinning)
+    centerScroll();
+}
+
+void PalettesListBox::loadPinned()
+{
+  const bool wasEmpty = m_pinned.empty();
+  loadPinnedQuiet();
+
+  if (wasEmpty && m_pinned.empty())
+    return; // Avoid a relayout with no changes and no pinned palettes.
+
+  toggleSeparator();
+  sortItems();
+  layout();
+}
+
+void PalettesListBox::toggleSeparator()
+{
+  // For some reason, just toggling visibility does not work properly, so we have to reparent.
+  if (!m_pinned.empty() && m_pinnedSeparator.parent() == nullptr)
+    addChild(&m_pinnedSeparator);
+  else if (m_pinned.empty() && m_pinnedSeparator.parent() == this)
+    removeChild(&m_pinnedSeparator);
+}
+
+void PalettesListBox::savePinned()
+{
+  for (const auto& key : enum_config_keys(kSectionName)) {
+    del_config_value(kSectionName, key.c_str());
+  }
+
+  // Crudely compare the outgoing pins to the current list so that we can remove any that don't
+  // exist anymore, faster than checking the filesystem for the palette file or doing the check when
+  // we load.
+  const auto& c = children();
+  std::vector<std::string_view> ids;
+  ids.resize(c.size());
+  for (size_t i = 0; i < c.size(); ++i) {
+    ids[i] = c[i]->text();
+  }
+
+  for (size_t i = 0; i < m_pinned.size(); ++i) {
+    const auto& pinned = m_pinned[i];
+    auto it = std::find(ids.begin(), ids.end(), pinned);
+    if (it == ids.end())
+      continue;
+
+    set_config_string(kSectionName, fmt::format("{:04d}", i).c_str(), pinned.c_str());
+  }
+}
+
+const Palette* PalettesListBox::selectedPalette()
 {
   Resource* resource = selectedResource();
   if (!resource)
@@ -135,7 +285,10 @@ const doc::Palette* PalettesListBox::selectedPalette()
 
 ResourceListItem* PalettesListBox::onCreateResourceItem(Resource* resource)
 {
-  return new PalettesListItem(resource, &m_tooltips);
+  return new PalettesListItem(
+    resource,
+    &m_tooltips,
+    std::find(m_pinned.begin(), m_pinned.end(), resource->id()) != m_pinned.end());
 }
 
 void PalettesListBox::onResourceChange(Resource* resource)
@@ -178,4 +331,27 @@ void PalettesListBox::onResourceSizeHint(Resource* resource, gfx::Size& size)
   size = gfx::Size(0, (2 + 16 + 2) * guiscale());
 }
 
+void PalettesListBox::loadPinnedQuiet()
+{
+  m_pinned.clear();
+  for (const auto& key : enum_config_keys(kSectionName)) {
+    m_pinned.push_back(get_config_string(kSectionName, key.c_str(), nullptr));
+  }
+  if (m_pinned.size() >= kPinnedLimit)
+    m_pinned.resize(kPinnedLimit);
+}
+
+void PalettesListBox::sortItems()
+{
+  ListBox::sortItems([&](const Widget* a, const Widget* b) {
+    const bool aPinned = std::find(m_pinned.begin(), m_pinned.end(), a->text()) != m_pinned.end();
+    const bool bPinned = std::find(m_pinned.begin(), m_pinned.end(), b->text()) != m_pinned.end();
+
+    if (aPinned == bPinned)
+      return base::compare_filenames(a->text(), b->text()) < 0;
+
+    return (aPinned && !bPinned);
+  });
+}
+
 } // namespace app
diff --git a/src/app/ui/palettes_listbox.h b/src/app/ui/palettes_listbox.h
index 1a4aa6893..d58af2444 100644
--- a/src/app/ui/palettes_listbox.h
+++ b/src/app/ui/palettes_listbox.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "app/ui/resources_listbox.h"
+#include "app/ui/separator_in_view.h"
 #include "obs/connection.h"
 #include "ui/tooltips.h"
 
@@ -24,6 +25,10 @@ public:
 
   const doc::Palette* selectedPalette();
 
+  void sortItems() override;
+  void togglePinned(const std::string& paletteId);
+  void loadPinned();
+
   obs::signal<void(const doc::Palette*)> PalChange;
 
 protected:
@@ -31,8 +36,14 @@ protected:
   virtual void onResourceChange(Resource* resource) override;
   virtual void onPaintResource(ui::Graphics* g, gfx::Rect& bounds, Resource* resource) override;
   virtual void onResourceSizeHint(Resource* resource, gfx::Size& size) override;
+  void loadPinnedQuiet();
+  void savePinned();
+  void toggleSeparator();
 
+private:
+  std::vector<std::string> m_pinned;
   ui::TooltipManager m_tooltips;
+  app::SeparatorInView m_pinnedSeparator;
   obs::scoped_connection m_extPaletteChanges;
   obs::scoped_connection m_extPresetsChanges;
 };
diff --git a/src/app/ui/preview_editor.cpp b/src/app/ui/preview_editor.cpp
index 28ff41ef0..54892d2cc 100644
--- a/src/app/ui/preview_editor.cpp
+++ b/src/app/ui/preview_editor.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -65,17 +65,16 @@ protected:
   {
     auto theme = SkinTheme::get(this);
     Widget* window = parent();
-    gfx::Rect rect(0, 0, 0, 0);
-    gfx::Size centerSize = this->sizeHint();
-    gfx::Size playSize = theme->calcSizeHint(this, theme->styles.windowPlayButton());
-    gfx::Size closeSize = theme->calcSizeHint(this, theme->styles.windowCloseButton());
+    const gfx::Size centerSize = this->sizeHint();
+    const gfx::Size playSize = theme->calcSizeHint(this, theme->styles.windowPlayButton());
+    const gfx::Size closeSize = theme->calcSizeHint(this, theme->styles.windowCloseButton());
+    const gfx::Border margin = style()->margin();
 
-    rect.w = centerSize.w;
-    rect.h = centerSize.h;
+    gfx::Rect rect(centerSize);
     rect.offset(window->bounds().x2() - theme->styles.windowCloseButton()->margin().width() -
                   closeSize.w - theme->styles.windowPlayButton()->margin().width() - playSize.w -
-                  style()->margin().right() - centerSize.w,
-                window->bounds().y + style()->margin().top());
+                  margin.right() - centerSize.w,
+                window->bounds().y + margin.top());
 
     setBounds(rect);
   }
@@ -129,16 +128,14 @@ private:
   {
     auto theme = SkinTheme::get(this);
     Widget* window = parent();
-    gfx::Rect rect(0, 0, 0, 0);
-    gfx::Size playSize = this->sizeHint();
-    gfx::Size closeSize = theme->calcSizeHint(this, theme->styles.windowCloseButton());
-    gfx::Border margin(0, 0, 0, 0);
+    const gfx::Size playSize = this->sizeHint();
+    const gfx::Size closeSize = theme->calcSizeHint(this, theme->styles.windowCloseButton());
+    const gfx::Border margin = style()->margin();
 
-    rect.w = playSize.w;
-    rect.h = playSize.h;
+    gfx::Rect rect(playSize);
     rect.offset(window->bounds().x2() - theme->styles.windowCloseButton()->margin().width() -
-                  closeSize.w - style()->margin().right() - playSize.w,
-                window->bounds().y + style()->margin().top());
+                  closeSize.w - margin.right() - playSize.w,
+                window->bounds().y + margin.top());
 
     setBounds(rect);
   }
diff --git a/src/app/ui/resources_listbox.cpp b/src/app/ui/resources_listbox.cpp
index db8333c86..318d8ceac 100644
--- a/src/app/ui/resources_listbox.cpp
+++ b/src/app/ui/resources_listbox.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -11,6 +11,7 @@
 
 #include "app/ui/resources_listbox.h"
 
+#include "app/i18n/strings.h"
 #include "app/res/resource.h"
 #include "app/res/resources_loader.h"
 #include "app/ui/skin/skin_theme.h"
@@ -63,11 +64,11 @@ void ResourceListItem::onPaint(PaintEvent& ev)
 
   static_cast<ResourcesListBox*>(parent())->paintResource(g, bounds, m_resource.get());
 
-  g->drawText(
-    text(),
-    fgcolor,
-    gfx::ColorNone,
-    gfx::Point(bounds.x + 2 * guiscale(), bounds.y + bounds.h / 2 - g->font()->height() / 2));
+  g->drawText(text(),
+              fgcolor,
+              gfx::ColorNone,
+              gfx::Point(bounds.x + 2 * guiscale(),
+                         guiscaled_center(bounds.y, bounds.h, g->font()->lineHeight())));
 }
 
 void ResourceListItem::onSizeHint(SizeHintEvent& ev)
@@ -80,20 +81,12 @@ void ResourceListItem::onSizeHint(SizeHintEvent& ev)
 
 class ResourcesListBox::LoadingItem : public ListItem {
 public:
-  LoadingItem() : ListItem("Loading"), m_state(0) {}
+  LoadingItem() : ListItem(Strings::resource_listbox_loading()), m_state(0) {}
 
   void makeProgress()
   {
-    std::string text = "Loading ";
-
-    switch ((++m_state) % 4) {
-      case 0: text += "/"; break;
-      case 1: text += "-"; break;
-      case 2: text += "\\"; break;
-      case 3: text += "|"; break;
-    }
-
-    setText(text);
+    constexpr char progress[] = { '/', '-', '\\', '|' };
+    setText(fmt::format("{} {}", Strings::resource_listbox_loading(), progress[((++m_state) % 4)]));
   }
 
 private:
@@ -201,26 +194,26 @@ void ResourcesListBox::onTick()
   if (!m_loadingItem) {
     m_loadingItem = new LoadingItem;
     addChild(m_loadingItem);
+    layout();
   }
   m_loadingItem->makeProgress();
 
   std::unique_ptr<Resource> resource;
-  std::string name;
 
   while (m_resourcesLoader->next(resource)) {
     std::unique_ptr<ResourceListItem> listItem(onCreateResourceItem(resource.get()));
     insertChild(getItemsCount() - 1, listItem.get());
-    sortItems();
-    layout();
-
-    if (View* view = View::getView(this))
-      view->updateView();
-
     resource.release();
     listItem.release();
   }
 
   if (m_resourcesLoader->isDone()) {
+    // Delay sorting and layout until we're fully loaded, for perfomance with big lists.
+    if (View* view = View::getView(this))
+      view->updateView();
+    sortItems();
+    layout();
+
     FinishLoading();
     stop();
   }
diff --git a/src/app/ui/search_entry.cpp b/src/app/ui/search_entry.cpp
index 56dd9b89f..f9319e254 100644
--- a/src/app/ui/search_entry.cpp
+++ b/src/app/ui/search_entry.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2020-2022  Igara Studio S.A.
+// Copyright (c) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2015  David Capello
 //
 // This program is distributed under the terms of
@@ -52,10 +52,12 @@ void SearchEntry::onPaint(ui::PaintEvent& ev)
   auto theme = SkinTheme::get(this);
   theme->paintEntry(ev);
 
+  const auto color = (isEnabled() ? theme->colors.text() : theme->colors.disabled());
+
   os::Surface* icon = theme->parts.iconSearch()->bitmap(0);
   Rect bounds = clientBounds();
   ev.graphics()->drawColoredRgbaSurface(icon,
-                                        theme->colors.text(),
+                                        color,
                                         bounds.x + border().left(),
                                         bounds.y + bounds.h / 2 - icon->height() / 2);
 
@@ -63,7 +65,7 @@ void SearchEntry::onPaint(ui::PaintEvent& ev)
     icon = onGetCloseIcon();
     ev.graphics()->drawColoredRgbaSurface(
       icon,
-      theme->colors.text(),
+      color,
       bounds.x + bounds.w - border().right() - childSpacing() - icon->width(),
       bounds.y + bounds.h / 2 - icon->height() / 2);
   }
diff --git a/src/app/ui/select_accelerator.cpp b/src/app/ui/select_shortcut.cpp
similarity index 56%
rename from src/app/ui/select_accelerator.cpp
rename to src/app/ui/select_shortcut.cpp
index ee7a9bb17..a1f5e85bc 100644
--- a/src/app/ui/select_accelerator.cpp
+++ b/src/app/ui/select_shortcut.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -9,7 +9,7 @@
   #include "config.h"
 #endif
 
-#include "app/ui/select_accelerator.h"
+#include "app/ui/select_shortcut.h"
 
 #include "app/ui/key.h"
 #include "app/ui/keyboard_shortcuts.h"
@@ -23,23 +23,23 @@ namespace app {
 
 using namespace ui;
 
-class SelectAccelerator::KeyField : public ui::Entry {
+class SelectShortcut::KeyField : public ui::Entry {
 public:
-  KeyField(const Accelerator& accel) : ui::Entry(256, "")
+  KeyField(const Shortcut& shortcut) : ui::Entry(256, "")
   {
     setTranslateDeadKeys(false);
     setExpansive(true);
     setFocusMagnet(true);
-    setAccel(accel);
+    setShortcut(shortcut);
   }
 
-  void setAccel(const Accelerator& accel)
+  void setShortcut(const Shortcut& shortcut)
   {
-    m_accel = accel;
+    m_shortcut = shortcut;
     updateText();
   }
 
-  obs::signal<void(const ui::Accelerator*)> AccelChange;
+  obs::signal<void(const ui::Shortcut*)> ShortcutChange;
 
 protected:
   bool onProcessMessage(Message* msg) override
@@ -56,19 +56,19 @@ protected:
           if (keymsg->scancode() == kKeySpace)
             modifiers = (KeyModifiers)(modifiers & ~kKeySpaceModifier);
 
-          m_accel = Accelerator(
+          m_shortcut = Shortcut(
             modifiers,
             keymsg->scancode(),
             keymsg->unicodeChar() > 32 ? std::tolower(keymsg->unicodeChar()) : 0);
 
-          // Convert the accelerator to a string, and parse it
-          // again. Just to obtain the exact accelerator we'll read
+          // Convert the shortcut to a string, and parse it
+          // again. Just to obtain the exact shortcut we'll read
           // when we import the gui.xml file or an .aseprite-keys file.
-          m_accel = Accelerator(m_accel.toString());
+          m_shortcut = Shortcut(m_shortcut.toString());
 
           updateText();
 
-          AccelChange(&m_accel);
+          ShortcutChange(&m_shortcut);
           return true;
         }
         break;
@@ -78,20 +78,20 @@ protected:
 
   void updateText()
   {
-    setText(
-      Accelerator(kKeyNoneModifier, m_accel.scancode(), m_accel.unicodeChar()).toString().c_str());
+    setText(Shortcut(kKeyNoneModifier, m_shortcut.scancode(), m_shortcut.unicodeChar()).toString());
   }
 
-  Accelerator m_accel;
+private:
+  Shortcut m_shortcut;
 };
 
-SelectAccelerator::SelectAccelerator(const ui::Accelerator& accel,
-                                     const KeyContext keyContext,
-                                     const KeyboardShortcuts& currentKeys)
-  : m_keyField(new KeyField(accel))
+SelectShortcut::SelectShortcut(const ui::Shortcut& shortcut,
+                               const KeyContext keyContext,
+                               const KeyboardShortcuts& currentKeys)
+  : m_keyField(new KeyField(shortcut))
   , m_keyContext(keyContext)
   , m_currentKeys(currentKeys)
-  , m_accel(accel)
+  , m_shortcut(shortcut)
   , m_ok(false)
   , m_modified(false)
 {
@@ -107,7 +107,7 @@ SelectAccelerator::SelectAccelerator(const ui::Accelerator& accel,
   space()->Click.connect([this] { onModifierChange(kKeySpaceModifier, space()); });
   win()->Click.connect([this] { onModifierChange(kKeyWinModifier, win()); });
 
-  m_keyField->AccelChange.connect(&SelectAccelerator::onAccelChange, this);
+  m_keyField->ShortcutChange.connect(&SelectShortcut::onShortcutChange, this);
   clearButton()->Click.connect([this] { onClear(); });
   okButton()->Click.connect([this] { onOK(); });
   cancelButton()->Click.connect([this] { onCancel(); });
@@ -115,63 +115,63 @@ SelectAccelerator::SelectAccelerator(const ui::Accelerator& accel,
   addChild(&m_tooltipManager);
 }
 
-void SelectAccelerator::onModifierChange(KeyModifiers modifier, CheckBox* checkbox)
+void SelectShortcut::onModifierChange(KeyModifiers modifier, CheckBox* checkbox)
 {
   bool state = (checkbox->isSelected());
-  KeyModifiers modifiers = m_accel.modifiers();
-  KeyScancode scancode = m_accel.scancode();
-  int unicodeChar = m_accel.unicodeChar();
+  KeyModifiers modifiers = m_shortcut.modifiers();
+  KeyScancode scancode = m_shortcut.scancode();
+  int unicodeChar = m_shortcut.unicodeChar();
 
   modifiers = (KeyModifiers)((modifiers & ~modifier) | (state ? modifier : 0));
   if (modifiers == kKeySpaceModifier && scancode == kKeySpace)
     modifiers = kKeyNoneModifier;
 
-  m_accel = Accelerator(modifiers, scancode, unicodeChar);
+  m_shortcut = Shortcut(modifiers, scancode, unicodeChar);
 
-  m_keyField->setAccel(m_accel);
+  m_keyField->setShortcut(m_shortcut);
   m_keyField->requestFocus();
   updateAssignedTo();
 }
 
-void SelectAccelerator::onAccelChange(const ui::Accelerator* accel)
+void SelectShortcut::onShortcutChange(const ui::Shortcut* shortcut)
 {
-  m_accel = *accel;
+  m_shortcut = *shortcut;
   updateModifiers();
   updateAssignedTo();
 }
 
-void SelectAccelerator::onClear()
+void SelectShortcut::onClear()
 {
-  m_accel = Accelerator(kKeyNoneModifier, kKeyNil, 0);
+  m_shortcut = Shortcut(kKeyNoneModifier, kKeyNil, 0);
 
-  m_keyField->setAccel(m_accel);
+  m_keyField->setShortcut(m_shortcut);
   updateModifiers();
   updateAssignedTo();
 
   m_keyField->requestFocus();
 }
 
-void SelectAccelerator::onOK()
+void SelectShortcut::onOK()
 {
   m_ok = true;
-  m_modified = (m_origAccel != m_accel);
+  m_modified = (m_origShortcut != m_shortcut);
   closeWindow(NULL);
 }
 
-void SelectAccelerator::onCancel()
+void SelectShortcut::onCancel()
 {
   closeWindow(NULL);
 }
 
-void SelectAccelerator::updateModifiers()
+void SelectShortcut::updateModifiers()
 {
-  alt()->setSelected(m_accel.modifiers() & kKeyAltModifier ? true : false);
-  ctrl()->setSelected(m_accel.modifiers() & kKeyCtrlModifier ? true : false);
-  shift()->setSelected(m_accel.modifiers() & kKeyShiftModifier ? true : false);
-  space()->setSelected(m_accel.modifiers() & kKeySpaceModifier ? true : false);
+  alt()->setSelected((m_shortcut.modifiers() & kKeyAltModifier) == kKeyAltModifier);
+  ctrl()->setSelected((m_shortcut.modifiers() & kKeyCtrlModifier) == kKeyCtrlModifier);
+  shift()->setSelected((m_shortcut.modifiers() & kKeyShiftModifier) == kKeyShiftModifier);
+  space()->setSelected((m_shortcut.modifiers() & kKeySpaceModifier) == kKeySpaceModifier);
 #if __APPLE__
   win()->setVisible(false);
-  cmd()->setSelected(m_accel.modifiers() & kKeyCmdModifier ? true : false);
+  cmd()->setSelected((m_shortcut.modifiers() & kKeyCmdModifier) == kKeyCmdModifier);
 #else
   #if __linux__
   win()->setText(kWinKeyName);
@@ -180,17 +180,17 @@ void SelectAccelerator::updateModifiers()
     "Also known as Windows key, logo key,\ncommand key, or system key.",
     TOP);
   #endif
-  win()->setSelected(m_accel.modifiers() & kKeyWinModifier ? true : false);
+  win()->setSelected((m_shortcut.modifiers() & kKeyWinModifier) == kKeyWinModifier);
   cmd()->setVisible(false);
 #endif
 }
 
-void SelectAccelerator::updateAssignedTo()
+void SelectShortcut::updateAssignedTo()
 {
   std::string res = "None";
 
   for (const KeyPtr& key : m_currentKeys) {
-    if (key->keycontext() == m_keyContext && key->hasAccel(m_accel)) {
+    if (key->keycontext() == m_keyContext && key->hasShortcut(m_shortcut)) {
       res = key->triggerString();
       break;
     }
diff --git a/src/app/ui/select_accelerator.h b/src/app/ui/select_shortcut.h
similarity index 58%
rename from src/app/ui/select_accelerator.h
rename to src/app/ui/select_shortcut.h
index 3fb53c493..deda425cb 100644
--- a/src/app/ui/select_accelerator.h
+++ b/src/app/ui/select_shortcut.h
@@ -1,35 +1,36 @@
 // Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2001-2016  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
 
-#ifndef APP_UI_SELECT_ACCELERATOR_H_INCLUDED
-#define APP_UI_SELECT_ACCELERATOR_H_INCLUDED
+#ifndef APP_UI_SELECT_SHORTCUT_H_INCLUDED
+#define APP_UI_SELECT_SHORTCUT_H_INCLUDED
 #pragma once
 
 #include "app/ui/key_context.h"
-#include "ui/accelerator.h"
+#include "ui/shortcut.h"
 #include "ui/tooltips.h"
 
-#include "select_accelerator.xml.h"
+#include "select_shortcut.xml.h"
 
 namespace app {
 class KeyboardShortcuts;
 
-class SelectAccelerator : public app::gen::SelectAccelerator {
+class SelectShortcut : public app::gen::SelectShortcut {
 public:
-  SelectAccelerator(const ui::Accelerator& accelerator,
-                    const KeyContext keyContext,
-                    const KeyboardShortcuts& currentKeys);
+  SelectShortcut(const ui::Shortcut& shortcut,
+                 KeyContext keyContext,
+                 const KeyboardShortcuts& currentKeys);
 
   bool isOK() const { return m_ok; }
   bool isModified() const { return m_modified; }
-  const ui::Accelerator& accel() const { return m_accel; }
+  const ui::Shortcut& shortcut() const { return m_shortcut; }
 
 private:
   void onModifierChange(ui::KeyModifiers modifier, ui::CheckBox* checkbox);
-  void onAccelChange(const ui::Accelerator* accel);
+  void onShortcutChange(const ui::Shortcut* shortcut);
   void onClear();
   void onOK();
   void onCancel();
@@ -42,8 +43,8 @@ private:
   KeyField* m_keyField;
   KeyContext m_keyContext;
   const KeyboardShortcuts& m_currentKeys;
-  ui::Accelerator m_origAccel;
-  ui::Accelerator m_accel;
+  ui::Shortcut m_origShortcut;
+  ui::Shortcut m_shortcut;
   bool m_ok;
   bool m_modified;
 };
diff --git a/src/app/ui/skin/font_data.cpp b/src/app/ui/skin/font_data.cpp
deleted file mode 100644
index d23a4972e..000000000
--- a/src/app/ui/skin/font_data.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
-// Copyright (C) 2001-2017  David Capello
-//
-// This program is distributed under the terms of
-// the End-User License Agreement for Aseprite.
-
-#ifdef HAVE_CONFIG_H
-  #include "config.h"
-#endif
-
-#include "app/ui/skin/font_data.h"
-
-#include "text/font.h"
-#include "text/font_mgr.h"
-#include "ui/manager.h"
-#include "ui/scale.h"
-
-#include <set>
-
-namespace app { namespace skin {
-
-FontData::FontData(text::FontType type)
-  : m_type(type)
-  , m_antialias(false)
-  , m_fallback(nullptr)
-  , m_fallbackSize(0)
-{
-}
-
-text::FontRef FontData::getFont(text::FontMgrRef& fontMgr, int size, int uiscale)
-{
-  ASSERT(fontMgr);
-
-  if (m_type == text::FontType::SpriteSheet)
-    size = 1; // Same size always
-
-  // Use cache
-  size *= uiscale;
-  auto it = m_fonts.find(size);
-  if (it != m_fonts.end())
-    return it->second;
-
-  text::FontRef font = nullptr;
-
-  switch (m_type) {
-    case text::FontType::SpriteSheet:
-      font = fontMgr->loadSpriteSheetFont(m_filename.c_str(), size);
-      break;
-    case text::FontType::FreeType: {
-      font = fontMgr->loadTrueTypeFont(m_filename.c_str(), size);
-      if (font)
-        font->setAntialias(m_antialias);
-      break;
-    }
-  }
-
-  if (m_fallback) {
-    text::FontRef fallback = m_fallback->getFont(fontMgr, m_fallbackSize);
-    if (font)
-      font->setFallback(fallback.get());
-    else
-      return fallback; // Don't double-cache the fallback font
-  }
-
-  // Cache this font
-  m_fonts[size] = font;
-  return font;
-}
-
-text::FontRef FontData::getFont(text::FontMgrRef& fontMgr, int size)
-{
-  return getFont(fontMgr, size, ui::guiscale());
-}
-
-}} // namespace app::skin
diff --git a/src/app/ui/skin/font_data.h b/src/app/ui/skin/font_data.h
deleted file mode 100644
index 3f25d8fa6..000000000
--- a/src/app/ui/skin/font_data.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
-// Copyright (C) 2017  David Capello
-//
-// This program is distributed under the terms of
-// the End-User License Agreement for Aseprite.
-
-#ifndef APP_UI_SKIN_FONT_DATA_H_INCLUDED
-#define APP_UI_SKIN_FONT_DATA_H_INCLUDED
-#pragma once
-
-#include "base/disable_copying.h"
-#include "text/font.h"
-#include "text/fwd.h"
-
-#include <map>
-
-namespace app { namespace skin {
-
-// TODO should we merge this with FontInfo?
-class FontData {
-public:
-  FontData(text::FontType type);
-
-  void setFilename(const std::string& filename) { m_filename = filename; }
-  void setAntialias(bool antialias) { m_antialias = antialias; }
-  void setFallback(FontData* fallback, int fallbackSize)
-  {
-    m_fallback = fallback;
-    m_fallbackSize = fallbackSize;
-  }
-
-  text::FontRef getFont(text::FontMgrRef& fontMgr, int size, int uiscale);
-  text::FontRef getFont(text::FontMgrRef& fontMgr, int size);
-
-  const std::string& filename() const { return m_filename; }
-
-private:
-  text::FontType m_type;
-  std::string m_filename;
-  bool m_antialias;
-  std::map<int, text::FontRef> m_fonts; // key=font size, value=real font
-  FontData* m_fallback;
-  int m_fallbackSize;
-
-  DISABLE_COPYING(FontData);
-};
-
-}} // namespace app::skin
-
-#endif
diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 558f86aec..160d568fa 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -14,21 +14,24 @@
 #include "app/app.h"
 #include "app/console.h"
 #include "app/extensions.h"
-#include "app/font_path.h"
+#include "app/fonts/font_data.h"
+#include "app/fonts/font_info.h"
+#include "app/fonts/font_path.h"
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
 #include "app/resource_finder.h"
 #include "app/ui/app_menuitem.h"
 #include "app/ui/keyboard_shortcuts.h"
-#include "app/ui/skin/font_data.h"
 #include "app/ui/skin/skin_property.h"
 #include "app/ui/skin/skin_slider_property.h"
+#include "app/util/render_text.h"
 #include "app/xml_document.h"
 #include "app/xml_exception.h"
 #include "base/fs.h"
 #include "base/log.h"
 #include "base/string.h"
 #include "base/utf8_decode.h"
+#include "fmt/format.h"
 #include "gfx/border.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
@@ -37,12 +40,16 @@
 #include "os/system.h"
 #include "text/draw_text.h"
 #include "text/font.h"
+#include "text/font_metrics.h"
+#include "text/font_style_set.h"
+#include "text/text_blob.h"
 #include "ui/intern.h"
 #include "ui/ui.h"
 
 #include "tinyxml2.h"
 
 #include <algorithm>
+#include <cstdlib>
 #include <cstring>
 #include <memory>
 
@@ -153,51 +160,92 @@ static const char* g_cursor_names[kCursorTypes] = {
   "size_nw",    // kSizeNWCursor
 };
 
-static FontData* load_font(std::map<std::string, FontData*>& fonts,
-                           const XMLElement* xmlFont,
-                           const std::string& xmlFilename)
+static std::unique_ptr<FontData> try_to_load_system_font(const XMLElement* xmlFont)
 {
-  const char* fontRef = xmlFont->Attribute("font");
-  if (fontRef) {
-    auto it = fonts.find(fontRef);
-    if (it == fonts.end())
-      throw base::Exception("Font named '%s' not found\n", fontRef);
-    return it->second;
+  const char* systemStr = xmlFont->Attribute("system");
+  if (!systemStr)
+    return nullptr;
+
+  Fonts* fonts = Fonts::instance();
+  text::FontMgrRef fontMgr = fonts->fontMgr();
+  const text::FontStyleSetRef set = fontMgr->matchFamily(systemStr);
+  if (!set)
+    return nullptr;
+
+  text::FontStyle style;
+  text::TypefaceRef typeface = set->matchStyle(style);
+  if (!typeface)
+    return nullptr;
+
+  float size = 0.0f;
+  if (const char* sizeStr = xmlFont->Attribute("size"))
+    size = std::strtof(sizeStr, nullptr);
+
+  text::FontRef nativeFont;
+  if (size == 0.0f)
+    nativeFont = fontMgr->makeFont(typeface);
+  else
+    nativeFont = fontMgr->makeFont(typeface, size);
+  if (!nativeFont)
+    return nullptr;
+
+  nativeFont->setAntialias(bool_attr(xmlFont, "antialias", false));
+  nativeFont->setHinting(bool_attr(xmlFont, "hinting", true) ? text::FontHinting::Normal :
+                                                               text::FontHinting::None);
+
+  auto font = std::make_unique<FontData>(nativeFont);
+  font->setName(systemStr);
+  if (size != 0.0f)
+    font->setDefaultSize(size);
+
+  return font;
+}
+
+static FontData* load_font(const XMLElement* xmlFont, const std::string& xmlFilename)
+{
+  Fonts* fonts = Fonts::instance();
+  ASSERT(fonts);
+
+  if (const char* fontId = xmlFont->Attribute("font")) {
+    if (FontData* fontData = fonts->fontDataByName(fontId))
+      return fontData;
+    else {
+      throw base::Exception(
+        fmt::format("{}:{}: Font named '{}' not found", xmlFilename, xmlFont->GetLineNum(), fontId));
+    }
   }
 
-  const char* nameStr = xmlFont->Attribute("name");
-  if (!nameStr)
-    throw base::Exception("No \"name\" or \"font\" attributes specified on <font>");
-
-  std::string name(nameStr);
-
-  // Use cached font data
-  auto it = fonts.find(name);
-  if (it != fonts.end())
-    return it->second;
-
-  LOG(VERBOSE, "THEME: Loading font '%s'\n", name.c_str());
-
+  const char* nameStr = xmlFont->Attribute("name"); // Optional name
   const char* typeStr = xmlFont->Attribute("type");
-  if (!typeStr)
-    throw base::Exception("<font> without 'type' attribute in '%s'\n", xmlFilename.c_str());
+  const char* systemStr = xmlFont->Attribute("system");
 
-  std::string type(typeStr);
+  LOG(VERBOSE,
+      "THEME: Loading font name='%s' type='%s' system='%s'\n",
+      nameStr ? nameStr : "",
+      typeStr ? systemStr : "",
+      systemStr ? systemStr : "");
+
+  std::string type(typeStr ? typeStr : "");
   std::string xmlDir(base::get_file_path(xmlFilename));
   std::unique_ptr<FontData> font(nullptr);
 
   if (type == "spritesheet") {
     const char* fileStr = xmlFont->Attribute("file");
     if (fileStr) {
-      font.reset(new FontData(text::FontType::SpriteSheet));
+      font = std::make_unique<FontData>(text::FontType::SpriteSheet);
+      font->setName(nameStr ? nameStr : fileStr);
       font->setFilename(base::join_path(xmlDir, fileStr));
+      if (const char* descent = xmlFont->Attribute("descent"))
+        font->setDescent(std::strtof(descent, nullptr));
     }
   }
+  // Loads: <font type="truetype" file="..." />
+  // Or:    <font type="truetype" file_win="..." file_mac="..." file_linux="..." />
   else if (type == "truetype") {
     const char* platformFileAttrName =
-#ifdef _WIN32
+#if LAF_WINDOWS
       "file_win"
-#elif defined __APPLE__
+#elif LAF_MACOS
       "file_mac"
 #else
       "file_linux"
@@ -210,6 +258,9 @@ static FontData* load_font(std::map<std::string, FontData*>& fonts,
     if (xmlFont->Attribute("antialias"))
       antialias = bool_attr(xmlFont, "antialias", false);
 
+    text::FontHinting hinting = (bool_attr(xmlFont, "hinting", true) ? text::FontHinting::Normal :
+                                                                       text::FontHinting::None);
+
     std::string fontFilename;
     if (platformFileStr)
       fontFilename = app::find_font(xmlDir, platformFileStr);
@@ -219,37 +270,89 @@ static FontData* load_font(std::map<std::string, FontData*>& fonts,
     // The filename can be empty if the font was not found, anyway we
     // want to keep the font information (e.g. to use the fallback
     // information of this font).
-    font.reset(new FontData(text::FontType::FreeType));
+    font = std::make_unique<FontData>(text::FontType::FreeType);
+    font->setName(nameStr ? nameStr : (platformFileStr ? platformFileStr : fileStr));
     font->setFilename(fontFilename);
     font->setAntialias(antialias);
+    font->setHinting(hinting);
 
     if (!fontFilename.empty())
       LOG(VERBOSE, "THEME: Font file '%s' found\n", fontFilename.c_str());
   }
+  // Loads: <font system="..." />
+  // Or:    <font>
+  //          <windows system="..." />
+  //          <macos system="..." />
+  //          <linux system="..." />
+  //        </font>
+  else if (!typeStr || type == "system") {
+    // Try to get the platform-specific font first
+    const char* platformName =
+#if LAF_WINDOWS
+      "windows"
+#elif LAF_MACOS
+      "macos"
+#else
+      "linux"
+#endif
+      ;
+
+    // Load platform specific font from sub elements like
+    // <font>
+    //   <windows system="..." />
+    //   ...
+    // </font>
+    XMLElement* xmlPlatformFont = (XMLElement*)xmlFont->FirstChildElement(platformName);
+    while (xmlPlatformFont) {
+      if (auto platformFont = try_to_load_system_font(xmlPlatformFont)) {
+        font = std::move(platformFont);
+        break;
+      }
+      xmlPlatformFont = xmlPlatformFont->NextSiblingElement();
+    }
+
+    // Load the system font from
+    // <font system="..." />
+    if (!font && systemStr) {
+      font = try_to_load_system_font(xmlFont);
+    }
+
+    if (font && nameStr)
+      font->setName(nameStr);
+  }
   else {
-    throw base::Exception("Invalid type=\"%s\" in '%s' for <font name=\"%s\" ...>\n",
-                          type.c_str(),
-                          xmlFilename.c_str(),
-                          name.c_str());
+    throw base::Exception(
+      fmt::format("{}:{}: Invalid font type (\"{}\")' attribute in <font /> element",
+                  xmlFilename,
+                  xmlFont->GetLineNum(),
+                  type));
   }
 
-  FontData* result = nullptr;
-  if (font) {
-    fonts[name] = result = font.get();
-    font.release();
+  if (!font) {
+    if (!typeStr && !systemStr) {
+      throw base::Exception(
+        fmt::format("{}:{}: Missing 'font', 'type', or 'system' attributes in <font /> element",
+                    xmlFilename,
+                    xmlFont->GetLineNum()));
+    }
 
-    // Fallback font
-    const XMLElement* xmlFallback = (const XMLElement*)xmlFont->FirstChildElement("fallback");
-    if (xmlFallback) {
-      FontData* fallback = load_font(fonts, xmlFallback, xmlFilename);
-      if (fallback) {
-        int size = 10;
-        const char* sizeStr = xmlFont->Attribute("size");
-        if (sizeStr)
-          size = std::strtol(sizeStr, nullptr, 10);
+    return nullptr;
+  }
 
-        result->setFallback(fallback, size);
-      }
+  FontData* result = font.get();
+  fonts->addFontData(std::move(font)); // "font" variable is invalid from now on
+
+  // Fallback font
+  const XMLElement* xmlFallback = (const XMLElement*)xmlFont->FirstChildElement("fallback");
+  if (xmlFallback) {
+    FontData* fallback = load_font(xmlFallback, xmlFilename);
+    if (fallback) {
+      int size = 10;
+      const char* sizeStr = xmlFallback->Attribute("size");
+      if (sizeStr)
+        size = std::strtol(sizeStr, nullptr, 10);
+
+      result->setFallback(fallback, size);
     }
   }
   return result;
@@ -274,9 +377,8 @@ SkinTheme* SkinTheme::get(const ui::Widget* widget)
 }
 
 SkinTheme::SkinTheme()
-  : m_sheet(nullptr)
-  , m_defaultFont(nullptr)
-  , m_miniFont(nullptr)
+  : m_fonts(m_fontMgr)
+  , m_sheet(nullptr)
   , m_preferredScreenScaling(-1)
   , m_preferredUIScaling(-1)
 {
@@ -297,11 +399,6 @@ SkinTheme::~SkinTheme()
   for (auto style : m_styles)
     delete style.second;
   m_styles.clear();
-
-  // Destroy fonts
-  for (auto& kv : m_fonts)
-    delete kv.second; // Delete all FontDatas
-  m_fonts.clear();
 }
 
 void SkinTheme::onRegenerateTheme()
@@ -351,7 +448,7 @@ void SkinTheme::loadFontData()
 
   XMLElement* xmlFont = handle.FirstChildElement("fonts").FirstChildElement("font").ToElement();
   while (xmlFont) {
-    load_font(m_fonts, xmlFont, rf.filename());
+    load_font(xmlFont, rf.filename());
     xmlFont = xmlFont->NextSiblingElement();
   }
 }
@@ -360,7 +457,7 @@ void SkinTheme::loadAll(const std::string& themeId, BackwardCompatibility* backw
 {
   LOG("THEME: Loading theme %s\n", themeId.c_str());
 
-  if (m_fonts.empty())
+  if (Fonts::instance()->isEmpty())
     loadFontData();
 
   m_path = findThemePath(themeId);
@@ -388,18 +485,10 @@ void SkinTheme::loadSheet()
   if (!newSheet)
     throw base::Exception("Error loading %s file", sheet_filename.c_str());
 
-  // TODO Change os::Surface::applyScale() to return a new surface,
-  //      avoid loading two times the same file (even more, if there
-  //      is no scale to apply, m_unscaledSheet must reference the
-  //      same m_sheet).
-  m_unscaledSheet = system->loadRgbaSurface(sheet_filename.c_str());
-
-  // Replace the sprite sheet
-  if (m_sheet)
-    m_sheet.reset();
-  m_sheet = newSheet;
-  if (m_sheet)
-    m_sheet->applyScale(guiscale());
+  // Set the unscaled and scaled version of the sprite sheet.
+  m_unscaledSheet = newSheet;
+  m_unscaledSheet->setImmutable();
+  m_sheet = newSheet->applyScale(guiscale());
   m_sheet->setImmutable();
 
   // Reset sprite sheet and font of all layer styles (to avoid
@@ -415,6 +504,7 @@ void SkinTheme::loadSheet()
 
 void SkinTheme::loadXml(BackwardCompatibility* backward)
 {
+  Fonts* fonts = Fonts::instance();
   const int scale = guiscale();
 
   // Load the skin XML
@@ -446,30 +536,56 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
                             .ToElement();
     while (xmlFont) {
       const char* idStr = xmlFont->Attribute("id");
-      FontData* fontData = load_font(m_fonts, xmlFont, xml_filename);
+      FontData* fontData = load_font(xmlFont, xml_filename);
       if (idStr && fontData) {
         std::string id(idStr);
         LOG(VERBOSE, "THEME: Loading theme font %s\n", idStr);
 
-        int size = 10;
-        const char* sizeStr = xmlFont->Attribute("size");
-        if (sizeStr)
-          size = std::strtol(sizeStr, nullptr, 10);
+        float size = 0.0f;
+        if (const char* sizeStr = xmlFont->Attribute("size"))
+          size = std::strtof(sizeStr, nullptr);
+        if (size == 0.0f && fontData->defaultSize() != 0.0f)
+          size = fontData->defaultSize();
 
         const char* mnemonicsStr = xmlFont->Attribute("mnemonics");
         bool mnemonics = mnemonicsStr ? (std::string(mnemonicsStr) != "off") : true;
 
-        text::FontRef font = fontData->getFont(m_fontMgr, size);
+        text::FontRef font = fontData->getFont(m_fontMgr, size * ui::guiscale());
+
+        // No font?
+        if (font == nullptr) {
+          LOG(ERROR, "THEME: Error loading font for theme %s\n", idStr);
+          xmlFont = xmlFont->NextSiblingElement();
+          continue;
+        }
+
+        if (size == 0.0f) {
+          // SpriteSheetFonts have a default preferred size.
+          if (font->defaultSize() > 0.0f) {
+            size = font->defaultSize();
+          }
+          // For some user extensions, we need to specify at least a
+          // default size of 10 for TTF theme fonts.
+          else {
+            size = 10.0f;
+          }
+          font = fontData->getFont(m_fontMgr, size * ui::guiscale());
+        }
+
         m_themeFonts[idStr] = ThemeFont(font, mnemonics);
 
         // Store a unscaled version for using when ui scaling is not desired (i.e. in a Canvas
         // widget with autoScaling enabled).
-        m_unscaledFonts[font.get()] = fontData->getFont(m_fontMgr, size, 1);
+        m_unscaledFonts[font.get()] = fontData->getFont(m_fontMgr, size);
 
-        if (id == "default")
+        if (id == "default") {
           m_defaultFont = font;
-        else if (id == "mini")
+          m_defaultFontInfo = FontInfo(fontData, size);
+        }
+        else if (id == "mini") {
           m_miniFont = font;
+          m_miniFontInfo = FontInfo(fontData, size);
+        }
       }
 
       xmlFont = xmlFont->NextSiblingElement();
@@ -477,10 +593,32 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
   }
 
   // No available font to run the program
-  if (!m_defaultFont)
-    throw base::Exception("There is no default font");
-  if (!m_miniFont)
+  if (!m_defaultFont) {
+    throw base::Exception(
+      fmt::format("{}: No valid default font element found (<font id=\"default\" ... />)",
+                  xml_filename));
+  }
+  if (!m_miniFont) {
     m_miniFont = m_defaultFont;
+    m_miniFontInfo = m_defaultFontInfo;
+  }
+
+  // Overwrite theme fonts by user defined fonts.
+  Preferences& pref = Preferences::instance();
+  if (!pref.theme.font().empty()) {
+    auto fi = base::convert_to<FontInfo>(pref.theme.font());
+    if (auto f = fonts->fontFromInfo(fi)) {
+      m_defaultFont = f;
+      m_defaultFontInfo = fi;
+    }
+  }
+  if (!pref.theme.miniFont().empty()) {
+    auto fi = base::convert_to<FontInfo>(pref.theme.miniFont());
+    if (auto f = fonts->fontFromInfo(fi)) {
+      m_miniFont = f;
+      m_miniFontInfo = fi;
+    }
+  }
 
   // Load dimension
   {
@@ -680,7 +818,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         const char* t = xmlStyle->Attribute("margin-top");
         const char* r = xmlStyle->Attribute("margin-right");
         const char* b = xmlStyle->Attribute("margin-bottom");
-        gfx::Border margin = style->margin();
+        gfx::Border margin = style->rawMargin();
         if (m || l)
           margin.left(scale * std::strtol(l ? l : m, nullptr, 10));
         if (m || t)
@@ -699,7 +837,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         const char* t = xmlStyle->Attribute("border-top");
         const char* r = xmlStyle->Attribute("border-right");
         const char* b = xmlStyle->Attribute("border-bottom");
-        gfx::Border border = style->border();
+        gfx::Border border = style->rawBorder();
         if (m || l)
           border.left(scale * std::strtol(l ? l : m, nullptr, 10));
         if (m || t)
@@ -718,7 +856,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         const char* t = xmlStyle->Attribute("padding-top");
         const char* r = xmlStyle->Attribute("padding-right");
         const char* b = xmlStyle->Attribute("padding-bottom");
-        gfx::Border padding = style->padding();
+        gfx::Border padding = style->rawPadding();
         if (m || l)
           padding.left(scale * std::strtol(l ? l : m, nullptr, 10));
         if (m || t)
@@ -781,9 +919,21 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
       {
         const char* fontId = xmlStyle->Attribute("font");
         if (fontId) {
-          auto themeFont = m_themeFonts[fontId];
-          style->setFont(themeFont.font());
-          style->setMnemonics(themeFont.mnemonics());
+          // Use m_defaultFont/m_miniFont just in case the user
+          // customized these fonts.
+          if (std::strcmp(fontId, "default") == 0) {
+            style->setFont(m_defaultFont);
+            style->setMnemonics(true);
+          }
+          else if (std::strcmp(fontId, "mini") == 0) {
+            style->setFont(m_miniFont);
+            style->setMnemonics(false);
+          }
+          else {
+            auto themeFont = m_themeFonts[fontId];
+            style->setFont(themeFont.font());
+            style->setMnemonics(themeFont.mnemonics());
+          }
         }
 
         // Override mnemonics value if it is defined for this style.
@@ -1159,9 +1309,9 @@ void SkinTheme::paintEntry(PaintEvent& ev)
   gfx::Rect bounds = widget->clientBounds();
 
   // Outside borders
-  const gfx::Color bg = BGCOLOR;
-  if (!is_transparent(bg))
-    g->fillRect(bg, bounds);
+  const gfx::Color borders = BGCOLOR;
+  if (!is_transparent(borders))
+    g->fillRect(borders, bounds);
 
   bool isMiniLook = false;
   auto skinPropery = std::static_pointer_cast<SkinProperty>(
@@ -1169,12 +1319,19 @@ void SkinTheme::paintEntry(PaintEvent& ev)
   if (skinPropery)
     isMiniLook = (skinPropery->getLook() == MiniLook);
 
+  // Inside background
+  gfx::Color bg;
+  if (widget->isReadOnly())
+    bg = colors.windowFace();
+  else
+    bg = gfx::ColorNone;
+
   drawRect(g,
            bounds,
            (widget->hasFocus() ?
               (isMiniLook ? parts.sunkenMiniFocused().get() : parts.sunkenFocused().get()) :
               (isMiniLook ? parts.sunkenMiniNormal().get() : parts.sunkenNormal().get())),
-           !is_transparent(bg)); // Paint center if the BG is not transparent
+           is_transparent(bg)); // Paint center if there is no special background color
 
   drawEntryText(g, widget);
 }
@@ -1193,6 +1350,7 @@ public:
     , m_h(h)
   {
     m_widget->getEntryThemeInfo(&m_index, &m_caret, &m_state, &m_range);
+    m_suffixIndex = m_widget->text().size();
   }
 
   int index() const { return m_index; }
@@ -1212,6 +1370,11 @@ public:
     bg = ColorNone;
     fg = colors.text();
 
+    // Suffix text
+    if (m_index >= m_suffixIndex) {
+      fg = colors.entrySuffix();
+    }
+
     // Selected
     if ((m_index >= m_range.from) && (m_index < m_range.to)) {
       if (m_widget->hasFocus())
@@ -1276,6 +1439,7 @@ private:
   int m_lastX; // Last position used to fill the background
   int m_y, m_h;
   int m_charStartX;
+  int m_suffixIndex;
 };
 
 } // anonymous namespace
@@ -1288,8 +1452,10 @@ void SkinTheme::drawEntryText(ui::Graphics* g, ui::Entry* widget)
   DrawEntryTextDelegate delegate(widget, g, bounds.origin(), widget->textHeight());
   int scroll = delegate.index();
 
-  if (!widget->text().empty()) {
-    const std::string& textString = widget->text();
+  // Full text to paint: widget text + suffix
+  const std::string textString = widget->text() + widget->getSuffix();
+
+  if (!textString.empty()) {
     base::utf8_decode dec(textString);
     auto pos = dec.pos();
     for (int i = 0; i < scroll && dec.next(); ++i)
@@ -1297,38 +1463,28 @@ void SkinTheme::drawEntryText(ui::Graphics* g, ui::Entry* widget)
 
     IntersectClip clip(g, bounds);
     if (clip) {
-      // TODO use a string_view()
-      g->drawText(std::string(pos, textString.end()),
-                  colors.text(),
-                  ColorNone,
-                  bounds.origin(),
-                  &delegate);
-    }
-  }
+      int baselineAdjustment = widget->textBaseline();
+      if (auto blob = widget->textBlob()) {
+        baselineAdjustment -= blob->baseline();
+      }
+      else {
+        text::FontMetrics metrics;
+        widget->font()->metrics(&metrics);
+        baselineAdjustment += metrics.ascent;
+      }
 
-  bounds.x += delegate.textBounds().w;
-
-  // Draw suffix if there is enough space
-  if (!widget->getSuffix().empty()) {
-    Rect sufBounds(bounds.x,
-                   bounds.y,
-                   bounds.x2() - widget->childSpacing() * guiscale() - bounds.x,
-                   widget->textHeight());
-    IntersectClip clip(g, sufBounds & widget->clientChildrenBounds());
-    if (clip) {
-      drawText(g,
-               widget->getSuffix().c_str(),
-               colors.entrySuffix(),
-               ColorNone,
-               widget,
-               sufBounds,
-               widget->align(),
-               0);
+      g->drawTextWithDelegate(std::string(pos, textString.end()), // TODO use a string_view()
+                              colors.text(),
+                              ColorNone,
+                              gfx::Point(bounds.x, baselineAdjustment),
+                              &delegate);
     }
   }
 
   // Draw caret at the end of the text
   if (!delegate.caretDrawn()) {
+    bounds.x += delegate.textBounds().w;
+
     gfx::Rect charBounds(bounds.x + widget->bounds().x,
                          bounds.y + widget->bounds().y,
                          0,
@@ -1438,13 +1594,13 @@ void SkinTheme::paintMenuItem(ui::PaintEvent& ev)
     }
     // Draw the keyboard shortcut
     else if (AppMenuItem* appMenuItem = dynamic_cast<AppMenuItem*>(widget)) {
-      if (appMenuItem->key() && !appMenuItem->key()->accels().empty()) {
+      if (appMenuItem->key() && !appMenuItem->key()->shortcuts().empty()) {
         int old_align = appMenuItem->align();
 
         pos = bounds;
         pos.w -= widget->childSpacing() / 4;
 
-        std::string buf = appMenuItem->key()->accels().front().toString();
+        std::string buf = appMenuItem->key()->shortcuts().front().toString();
 
         widget->setAlign(RIGHT | MIDDLE);
         drawText(g, buf.c_str(), fg, ColorNone, widget, pos, widget->align(), 0);
@@ -1639,10 +1795,13 @@ void SkinTheme::drawText(Graphics* g,
 
     g->setFont(widget->font());
 
-    if (!t)
+    if (!t) {
       t = widget->text().c_str();
-
-    textrc.setSize(g->measureText(t));
+      textrc.setSize(widget->textSize());
+    }
+    else {
+      textrc.setSize(g->measureText(t));
+    }
 
     // Horizontally text alignment
 
@@ -1709,14 +1868,6 @@ void SkinTheme::drawEntryCaret(ui::Graphics* g, Entry* widget, int x, int y)
     g->drawVLine(color, u, y + textHeight / 2 - caretSize.h / 2, caretSize.h);
 }
 
-text::FontRef SkinTheme::getFontByName(const std::string& name, const int size)
-{
-  auto it = m_fonts.find(name);
-  if (it == m_fonts.end())
-    return nullptr;
-  return it->second->getFont(m_fontMgr, size);
-}
-
 SkinPartPtr SkinTheme::getToolPart(const char* toolId) const
 {
   return getPartById(std::string("tool_") + toolId);
diff --git a/src/app/ui/skin/skin_theme.h b/src/app/ui/skin/skin_theme.h
index 04eca33cb..8a70711ab 100644
--- a/src/app/ui/skin/skin_theme.h
+++ b/src/app/ui/skin/skin_theme.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -9,6 +9,8 @@
 #define APP_UI_SKIN_SKIN_THEME_H_INCLUDED
 #pragma once
 
+#include "app/fonts/font_info.h"
+#include "app/fonts/fonts.h"
 #include "app/ui/skin/skin_part.h"
 #include "gfx/color.h"
 #include "gfx/fwd.h"
@@ -31,9 +33,6 @@ class Graphics;
 
 namespace app { namespace skin {
 
-class FontData;
-using FontDataMap = std::map<std::string, FontData*>;
-
 class ThemeFont {
 public:
   ThemeFont() {}
@@ -63,6 +62,8 @@ public:
   int preferredScreenScaling() const { return m_preferredScreenScaling; }
   int preferredUIScaling() const { return m_preferredUIScaling; }
 
+  const FontInfo& getDefaultFontInfo() const { return m_defaultFontInfo; }
+  const FontInfo& getMiniFontInfo() const { return m_miniFontInfo; }
   text::FontRef getDefaultFont() const override { return m_defaultFont; }
   text::FontRef getWidgetFont(const ui::Widget* widget) const override;
   text::FontRef getMiniFont() const { return m_miniFont; }
@@ -173,9 +174,6 @@ public:
 
   void drawEntryCaret(ui::Graphics* g, ui::Entry* widget, int x, int y);
 
-  const FontDataMap& getWellKnownFonts() const { return m_fonts; }
-  text::FontRef getFontByName(const std::string& name, int size);
-
 protected:
   void onRegenerateTheme() override;
 
@@ -202,6 +200,7 @@ private:
 
   std::string findThemePath(const std::string& themeId) const;
 
+  Fonts m_fonts;
   std::string m_path;
   os::SurfaceRef m_sheet;
   // Contains the sheet surface as is, without any scale.
@@ -214,10 +213,11 @@ private:
   std::map<std::string, ui::Cursor*> m_cursors;
   std::array<ui::Cursor*, ui::kCursorTypes> m_standardCursors;
   std::map<std::string, ui::Style*> m_styles;
-  FontDataMap m_fonts;
   std::map<std::string, ThemeFont> m_themeFonts;
   // Stores the unscaled font version of the Font pointer used as a key.
   std::map<text::Font*, text::FontRef> m_unscaledFonts;
+  FontInfo m_defaultFontInfo;
+  FontInfo m_miniFontInfo;
   text::FontRef m_defaultFont;
   text::FontRef m_miniFont;
   int m_preferredScreenScaling;
diff --git a/src/app/ui/status_bar.cpp b/src/app/ui/status_bar.cpp
index 5c52392c9..61801dbb2 100644
--- a/src/app/ui/status_bar.cpp
+++ b/src/app/ui/status_bar.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -136,7 +136,7 @@ class StatusBar::Indicators : public HBox {
         g->drawText(text(),
                     textColor,
                     ColorNone,
-                    Point(rc.x, rc.y + rc.h / 2 - font()->height() / 2));
+                    Point(rc.x, guiscaled_center(rc.y, rc.h, textHeight())));
       }
     }
   };
@@ -180,10 +180,12 @@ class StatusBar::Indicators : public HBox {
       os::Surface* icon = m_part->bitmap(0);
 
       g->fillRect(bgColor(), rc);
+
+      const int y = guiscaled_center(rc.y, rc.h, icon->height());
       if (m_colored)
-        g->drawColoredRgbaSurface(icon, textColor, rc.x, rc.y + rc.h / 2 - icon->height() / 2);
+        g->drawColoredRgbaSurface(icon, textColor, rc.x, y);
       else
-        g->drawRgbaSurface(icon, rc.x, rc.y + rc.h / 2 - icon->height() / 2);
+        g->drawRgbaSurface(icon, rc.x, y);
     }
 
     skin::SkinPartPtr m_part;
@@ -534,9 +536,9 @@ public:
 
     // Tool shortcut
     KeyPtr key = KeyboardShortcuts::instance()->tool(tool);
-    if (key && !key->accels().empty()) {
+    if (key && !key->shortcuts().empty()) {
       add(theme->parts.iconKey(), true);
-      m_indicators->addTextIndicator(key->accels().front().toString().c_str());
+      m_indicators->addTextIndicator(key->shortcuts().front().toString().c_str());
     }
     return *this;
   }
diff --git a/src/app/ui/status_bar.h b/src/app/ui/status_bar.h
index 90075fe72..b000f0d3b 100644
--- a/src/app/ui/status_bar.h
+++ b/src/app/ui/status_bar.h
@@ -13,6 +13,7 @@
 #include "app/context_observer.h"
 #include "app/tools/active_tool_observer.h"
 #include "app/ui/doc_observer_widget.h"
+#include "app/ui/dockable.h"
 #include "base/time.h"
 #include "doc/tile.h"
 #include "ui/base.h"
@@ -44,7 +45,8 @@ class Tool;
 }
 
 class StatusBar : public DocObserverWidget<ui::HBox>,
-                  public tools::ActiveToolObserver {
+                  public tools::ActiveToolObserver,
+                  public Dockable {
   static StatusBar* m_instance;
 
 public:
@@ -72,6 +74,10 @@ public:
 
   void showBackupIcon(BackupIcon icon);
 
+  // Dockable impl
+  int dockableAt() const override { return ui::TOP | ui::BOTTOM; }
+  int dockHandleSide() const override { return ui::LEFT; }
+
 protected:
   void onInitTheme(ui::InitThemeEvent& ev) override;
   void onResize(ui::ResizeEvent& ev) override;
diff --git a/src/app/ui/tabs.cpp b/src/app/ui/tabs.cpp
index 674cc5203..5835a185c 100644
--- a/src/app/ui/tabs.cpp
+++ b/src/app/ui/tabs.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -19,6 +19,7 @@
 #include "os/surface.h"
 #include "os/system.h"
 #include "text/font.h"
+#include "text/font_metrics.h"
 #include "ui/intern.h"
 #include "ui/ui.h"
 
@@ -72,8 +73,9 @@ Tabs::~Tabs()
   m_addedTab.reset();
   m_removedTab.reset();
 
-  // Stop animation
-  stopAnimation();
+  // Stop animation, can cause issues with docks when stopping during close.
+  if (!is_app_state_closing())
+    stopAnimation();
 
   // Remove all tabs
   m_list.clear();
@@ -472,6 +474,9 @@ void Tabs::onInitTheme(ui::InitThemeEvent& ev)
     setStyle(theme->styles.mainTabs());
   }
 
+  // TODO hardcoded 1.5f scalar
+  m_tabsHeight = std::max<float>(m_tabsHeight, 1.5f * textHeight());
+
   for (TabPtr& tab : m_list) {
     tab->textBlob = nullptr;
   }
@@ -555,6 +560,15 @@ void Tabs::onSizeHint(SizeHintEvent& ev)
   ev.setSizeHint(gfx::Size(0, m_tabsHeight));
 }
 
+float Tabs::onGetTextBaseline() const
+{
+  gfx::Rect box(0, 0, 1, m_tabsHeight - m_tabsBottomHeight);
+  text::FontMetrics metrics;
+  font()->metrics(&metrics);
+  const float textHeight = metrics.descent - metrics.ascent;
+  return guiscaled_center(box.y, box.h, textHeight) - metrics.ascent;
+}
+
 void Tabs::selectTabInternal(TabPtr& tab)
 {
   if (m_selected != tab) {
@@ -588,6 +602,7 @@ void Tabs::drawTab(Graphics* g, const gfx::Rect& _box, Tab* tab, int dy, bool ho
   PaintWidgetPartInfo info;
   info.styleFlags = (selected ? ui::Style::Layer::kFocus : 0) |
                     (hover ? ui::Style::Layer::kMouse : 0);
+  info.baseline = textBaseline();
   theme->paintWidgetPart(g, theme->styles.tab(), gfx::Rect(box.x, box.y + dy, box.w, box.h), info);
 
   gfx::Color tabColor = tab->color;
diff --git a/src/app/ui/tabs.h b/src/app/ui/tabs.h
index d24887335..80a109b15 100644
--- a/src/app/ui/tabs.h
+++ b/src/app/ui/tabs.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -9,6 +9,7 @@
 #define APP_UI_TABS_H_INCLUDED
 #pragma once
 
+#include "app/ui/dockable.h"
 #include "base/ref.h"
 #include "text/fwd.h"
 #include "ui/animated_widget.h"
@@ -118,7 +119,8 @@ public:
 
 // Tabs control. Used to show opened documents.
 class Tabs : public ui::Widget,
-             public ui::AnimatedWidget {
+             public ui::AnimatedWidget,
+             public Dockable {
   struct Tab {
     TabView* view;
     std::string text;
@@ -181,12 +183,16 @@ public:
   void removeDropViewPreview();
   int getDropTabIndex() const { return m_dropNewIndex; }
 
+  // Dockable impl
+  int dockableAt() const override { return ui::TOP | ui::BOTTOM; }
+
 protected:
   bool onProcessMessage(ui::Message* msg) override;
   void onInitTheme(ui::InitThemeEvent& ev) override;
   void onPaint(ui::PaintEvent& ev) override;
   void onResize(ui::ResizeEvent& ev) override;
   void onSizeHint(ui::SizeHintEvent& ev) override;
+  float onGetTextBaseline() const override;
   void onAnimationFrame() override;
   void onAnimationStop(int animation) override;
 
diff --git a/src/app/ui/timeline/ani_controls.cpp b/src/app/ui/timeline/ani_controls.cpp
index 23e1758cd..1985fdfba 100644
--- a/src/app/ui/timeline/ani_controls.cpp
+++ b/src/app/ui/timeline/ani_controls.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -110,11 +110,11 @@ std::string AniControls::getTooltipFor(int index) const
     tooltip = cmd->friendlyName();
 
     KeyPtr key = KeyboardShortcuts::instance()->command(cmd->id().c_str());
-    if (!key || key->accels().empty())
+    if (!key || key->shortcuts().empty())
       key = KeyboardShortcuts::instance()->command(cmd->id().c_str(), Params(), KeyContext::Normal);
-    if (key && !key->accels().empty()) {
+    if (key && !key->shortcuts().empty()) {
       tooltip += "\n\n" + Strings::ani_controls_shortcut() + " ";
-      tooltip += key->accels().front().toString();
+      tooltip += key->shortcuts().front().toString();
     }
 
     if (index == ACTION_PLAY) {
diff --git a/src/app/ui/timeline/doc_providers.cpp b/src/app/ui/timeline/doc_providers.cpp
new file mode 100644
index 000000000..bb95bf4c5
--- /dev/null
+++ b/src/app/ui/timeline/doc_providers.cpp
@@ -0,0 +1,79 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/ui/timeline/doc_providers.h"
+
+#include "app/console.h"
+#include "app/util/open_file_job.h"
+#include "doc/layer.h"
+
+namespace app {
+
+std::unique_ptr<Doc> DocProviderFromPaths::nextDoc()
+{
+  if (m_paths.empty())
+    return nullptr;
+
+  std::string path = m_paths.front();
+  // Remove the path that is currently being processed
+  m_paths.erase(m_paths.begin());
+
+  Console console;
+  int flags = FILE_LOAD_DATA_FILE | FILE_LOAD_AVOID_BACKGROUND_LAYER | FILE_LOAD_CREATE_PALETTE |
+              FILE_LOAD_SEQUENCE_YES;
+
+  std::unique_ptr<FileOp> fop(FileOp::createLoadDocumentOperation(m_context, path, flags));
+
+  // Do nothing (the user cancelled or something like that)
+  if (!fop)
+    return nullptr;
+
+  if (fop->hasError()) {
+    console.printf(fop->error().c_str());
+    return nullptr;
+  }
+
+  base::paths fopFilenames;
+  fop->getFilenameList(fopFilenames);
+  // Remove paths that will be loaded by the current file operation.
+  for (const auto& filename : fopFilenames) {
+    auto it = std::find(m_paths.begin(), m_paths.end(), filename);
+    if (it != m_paths.end())
+      m_paths.erase(it);
+  }
+
+  OpenFileJob task(fop.get(), true);
+  task.showProgressWindow();
+
+  // Post-load processing, it is called from the GUI because may require user intervention.
+  fop->postLoad();
+
+  // Show any error
+  if (fop->hasError() && !fop->isStop())
+    console.printf(fop->error().c_str());
+
+  return std::unique_ptr<Doc>(fop->releaseDocument());
+}
+
+std::unique_ptr<Doc> DocProviderFromImage::nextDoc()
+{
+  if (!m_image)
+    return nullptr;
+
+  Sprite* sprite = new Sprite(m_image->spec(), 256);
+  LayerImage* layer = new LayerImage(sprite);
+  sprite->root()->addLayer(layer);
+  Cel* cel = new Cel(0, m_image);
+  layer->addCel(cel);
+  m_image = nullptr;
+  return std::make_unique<Doc>(sprite);
+}
+
+} // namespace app
diff --git a/src/app/ui/timeline/doc_providers.h b/src/app/ui/timeline/doc_providers.h
new file mode 100644
index 000000000..b18a3ab6b
--- /dev/null
+++ b/src/app/ui/timeline/doc_providers.h
@@ -0,0 +1,55 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_TIMELINE_DOC_PROVIDERS_H_INCLUDED
+#define APP_UI_TIMELINE_DOC_PROVIDERS_H_INCLUDED
+#pragma once
+
+#include "app/doc_api.h"
+#include "base/paths.h"
+
+namespace app {
+
+using namespace docapi;
+
+class Context;
+
+class DocProviderFromPaths : public DocProvider {
+public:
+  DocProviderFromPaths(Context* context, const base::paths& paths)
+    : m_context(context)
+    , m_paths(paths)
+  {
+  }
+
+  virtual ~DocProviderFromPaths() = default;
+
+  std::unique_ptr<Doc> nextDoc() override;
+
+  int pendingDocs() override { return m_paths.size(); }
+
+private:
+  Context* m_context;
+  base::paths m_paths;
+};
+
+class DocProviderFromImage : public DocProvider {
+public:
+  DocProviderFromImage(const doc::ImageRef& image) : m_image(image) {}
+
+  virtual ~DocProviderFromImage() = default;
+
+  std::unique_ptr<Doc> nextDoc() override;
+
+  int pendingDocs() override { return m_image ? 1 : 0; }
+
+private:
+  doc::ImageRef m_image = nullptr;
+};
+
+} // namespace app
+
+#endif
diff --git a/src/app/ui/timeline/timeline.cpp b/src/app/ui/timeline/timeline.cpp
index d91b668f5..a9b267f3a 100644
--- a/src/app/ui/timeline/timeline.cpp
+++ b/src/app/ui/timeline/timeline.cpp
@@ -13,7 +13,6 @@
 
 #include "app/app.h"
 #include "app/app_menus.h"
-#include "app/cmd/drop_on_timeline.h"
 #include "app/cmd/set_tag_range.h"
 #include "app/cmd_transaction.h"
 #include "app/color_utils.h"
@@ -42,6 +41,7 @@
 #include "app/ui/input_chain.h"
 #include "app/ui/skin/skin_theme.h"
 #include "app/ui/status_bar.h"
+#include "app/ui/timeline/doc_providers.h"
 #include "app/ui/workspace.h"
 #include "app/ui_context.h"
 #include "app/util/clipboard.h"
@@ -55,11 +55,10 @@
 #include "fmt/format.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
-#include "os/event.h"
-#include "os/event_queue.h"
 #include "os/surface.h"
 #include "os/system.h"
 #include "text/font.h"
+#include "text/font_metrics.h"
 #include "ui/ui.h"
 #include "view/layers.h"
 #include "view/timeline_adapter.h"
@@ -233,6 +232,7 @@ Timeline::Timeline(TooltipManager* tooltipManager)
   , m_hbar(HORIZONTAL, this)
   , m_vbar(VERTICAL, this)
   , m_zoom(1.0)
+  , m_scaleUpToFit(false)
   , m_context(UIContext::instance())
   , m_editor(NULL)
   , m_document(NULL)
@@ -307,6 +307,10 @@ void Timeline::setZoomAndUpdate(const double zoom, const bool updatePref)
 
 void Timeline::onThumbnailsPrefChange()
 {
+  if (m_scaleUpToFit != docPref().thumbnails.scaleUpToFit()) {
+    m_scaleUpToFit = docPref().thumbnails.scaleUpToFit();
+    invalidate();
+  }
   setZoomAndUpdate(docPref().thumbnails.enabled() ? docPref().thumbnails.zoom() : 1.0, false);
 }
 
@@ -356,6 +360,7 @@ void Timeline::updateUsingEditor(Editor* editor)
   m_thumbnailsPrefConn = docPref.thumbnails.AfterChange.connect(
     [this] { onThumbnailsPrefChange(); });
   setZoom(docPref.thumbnails.enabled() ? docPref.thumbnails.zoom() : 1.0);
+  m_scaleUpToFit = docPref.thumbnails.scaleUpToFit();
 
   m_state = STATE_STANDBY;
   m_hot.part = PART_NOTHING;
@@ -1063,7 +1068,8 @@ bool Timeline::onProcessMessage(Message* msg)
 
       if (hasCapture()) {
         switch (m_state) {
-          case STATE_MOVING_RANGE: {
+          case STATE_DRAGGING_EXTERNAL_RANGE:
+          case STATE_MOVING_RANGE:            {
             col_t newFrame;
             if (m_range.type() == Range::kLayers) {
               // If we are moving only layers we don't change the
@@ -2008,6 +2014,8 @@ void Timeline::onAfterLayerVisibilityChange(DocEvent& ev)
   layer_t layerIdx = getLayerIndex(ev.layer());
   if (layerIdx >= 0)
     invalidateRect(getPartBounds(Hit(PART_ROW_EYE_ICON, layerIdx)).offset(origin()));
+  if (docPref().onionskin.active())
+    m_document->notifyGeneralUpdate();
 }
 
 void Timeline::onStateChanged(Editor* editor)
@@ -2058,11 +2066,15 @@ void Timeline::setCursor(ui::Message* msg, const Hit& hit)
   }
   // Moving.
   else if (m_state == STATE_MOVING_RANGE) {
-    if (is_copy_key_pressed(msg))
+    if (msg && is_copy_key_pressed(msg))
       ui::set_mouse_cursor(kArrowPlusCursor);
     else
       ui::set_mouse_cursor(kMoveCursor);
   }
+  // Dragging elements from external source.
+  else if (m_state == STATE_DRAGGING_EXTERNAL_RANGE) {
+    ui::set_mouse_cursor(kArrowPlusCursor);
+  }
   // Normal state.
   else if (hit.part == PART_HEADER_ONIONSKIN_RANGE_LEFT ||
            m_state == STATE_MOVING_ONIONSKIN_RANGE_LEFT) {
@@ -2073,7 +2085,7 @@ void Timeline::setCursor(ui::Message* msg, const Hit& hit)
     ui::set_mouse_cursor(kSizeECursor);
   }
   else if (hit.part == PART_RANGE_OUTLINE) {
-    if (is_copy_key_pressed(msg))
+    if (msg && is_copy_key_pressed(msg))
       ui::set_mouse_cursor(kArrowPlusCursor);
     else
       ui::set_mouse_cursor(kMoveCursor);
@@ -2162,6 +2174,11 @@ void Timeline::drawPart(ui::Graphics* g,
                     (is_clicked ? ui::Style::Layer::kSelected : 0) |
                     (is_disabled ? ui::Style::Layer::kDisabled : 0);
 
+  text::FontMetrics metrics;
+  font()->metrics(&metrics);
+  info.baseline = guiscaled_center(bounds.y, bounds.h, metrics.descent - metrics.ascent) -
+                  metrics.ascent;
+
   theme()->paintWidgetPart(g, style, bounds, info);
 }
 
@@ -2508,7 +2525,8 @@ void Timeline::drawCel(ui::Graphics* g,
     gfx::Rect thumb_bounds = gfx::Rect(bounds).shrink(skinTheme()->calcBorder(this, style));
 
     if (!thumb_bounds.isEmpty()) {
-      if (os::SurfaceRef surface = thumb::get_cel_thumbnail(cel, thumb_bounds.size())) {
+      if (os::SurfaceRef surface =
+            thumb::get_cel_thumbnail(cel, m_scaleUpToFit, thumb_bounds.size())) {
         const int t = std::clamp(thumb_bounds.w / 8, 4, 16);
         draw_checkered_grid(g, thumb_bounds, gfx::Size(t, t), docPref());
 
@@ -2600,7 +2618,7 @@ void Timeline::drawCelOverlay(ui::Graphics* g)
     return;
 
   gfx::Rect rc = m_sprite->bounds().fitIn(gfx::Rect(m_thumbnailsOverlayBounds).shrink(1));
-  if (os::SurfaceRef surface = thumb::get_cel_thumbnail(cel, rc.size())) {
+  if (os::SurfaceRef surface = thumb::get_cel_thumbnail(cel, m_scaleUpToFit, rc.size())) {
     draw_checkered_grid(g, rc, gfx::Size(8, 8) * ui::guiscale(), docPref());
 
     g->drawRgbaSurface(surface.get(),
@@ -2661,9 +2679,11 @@ void Timeline::drawTags(ui::Graphics* g)
   SkinTheme* theme = skinTheme();
   auto& styles = theme->styles;
 
-  g->fillRect(
-    theme->colors.workspace(),
-    gfx::Rect(0, font()->height(), clientBounds().w, theme->dimensions.timelineTagsAreaHeight()));
+  g->fillRect(theme->colors.workspace(),
+              gfx::Rect(0,
+                        font()->lineHeight(),
+                        clientBounds().w,
+                        theme->dimensions.timelineTagsAreaHeight()));
 
   // Draw active frame tag band
   if (m_hot.band >= 0 && m_tagBands > 1 && m_tagFocusBand < 0) {
@@ -2808,6 +2828,43 @@ void Timeline::drawTagBraces(ui::Graphics* g,
   }
 }
 
+void Timeline::paintDropFrameDeco(ui::Graphics* g, PaintWidgetPartInfo info, gfx::Rect dropBounds)
+{
+  auto& styles = skinTheme()->styles;
+  int w = 5 * guiscale(); // TODO get width from the skin info
+
+  if (m_dropTarget.hhit == DropTarget::Before)
+    dropBounds.x -= w / 2;
+  else if (m_dropRange == m_range)
+    dropBounds.x = dropBounds.x + getRangeBounds(m_range).w - w / 2;
+  else
+    dropBounds.x = dropBounds.x + dropBounds.w - w / 2;
+
+  dropBounds.w = w;
+
+  info.styleFlags = 0;
+  theme()->paintWidgetPart(g, styles.timelineDropFrameDeco(), dropBounds, info);
+}
+
+void Timeline::paintDropLayerDeco(ui::Graphics* g,
+                                  const PaintWidgetPartInfo& info,
+                                  gfx::Rect dropBounds)
+{
+  auto& styles = skinTheme()->styles;
+  int h = 5 * guiscale(); // TODO get height from the skin info
+
+  if (m_dropTarget.vhit == DropTarget::Top)
+    dropBounds.y -= h / 2;
+  else if (m_dropRange == m_range)
+    dropBounds.y = dropBounds.y + getRangeBounds(m_range).h - h / 2;
+  else
+    dropBounds.y = dropBounds.y + dropBounds.h - h / 2;
+
+  dropBounds.h = h;
+
+  theme()->paintWidgetPart(g, styles.timelineDropLayerDeco(), dropBounds, info);
+}
+
 void Timeline::drawRangeOutline(ui::Graphics* g)
 {
   auto& styles = skinTheme()->styles;
@@ -2827,42 +2884,24 @@ void Timeline::drawRangeOutline(ui::Graphics* g)
 
   switch (m_dropRange.type()) {
     case Range::kCels: {
-      dropBounds = dropBounds.enlarge(outlineWidth());
+      gfx::Rect outlineBounds(dropBounds);
+      outlineBounds.enlarge(outlineWidth());
       info.styleFlags = ui::Style::Layer::kFocus;
-      theme()->paintWidgetPart(g, styles.timelineRangeOutline(), dropBounds, info);
+      theme()->paintWidgetPart(g, styles.timelineRangeOutline(), outlineBounds, info);
+
+      if (m_state == STATE_DRAGGING_EXTERNAL_RANGE)
+        paintDropLayerDeco(g, info, getSelectedLayersBounds(m_dropRange));
+
       break;
     }
 
     case Range::kFrames: {
-      int w = 5 * guiscale(); // TODO get width from the skin info
-
-      if (m_dropTarget.hhit == DropTarget::Before)
-        dropBounds.x -= w / 2;
-      else if (m_dropRange == m_range)
-        dropBounds.x = dropBounds.x + getRangeBounds(m_range).w - w / 2;
-      else
-        dropBounds.x = dropBounds.x + dropBounds.w - w / 2;
-
-      dropBounds.w = w;
-
-      info.styleFlags = 0;
-      theme()->paintWidgetPart(g, styles.timelineDropFrameDeco(), dropBounds, info);
+      paintDropFrameDeco(g, info, dropBounds);
       break;
     }
 
     case Range::kLayers: {
-      int h = 5 * guiscale(); // TODO get height from the skin info
-
-      if (m_dropTarget.vhit == DropTarget::Top)
-        dropBounds.y -= h / 2;
-      else if (m_dropRange == m_range)
-        dropBounds.y = dropBounds.y + getRangeBounds(m_range).h - h / 2;
-      else
-        dropBounds.y = dropBounds.y + dropBounds.h - h / 2;
-
-      dropBounds.h = h;
-
-      theme()->paintWidgetPart(g, styles.timelineDropLayerDeco(), dropBounds, info);
+      paintDropLayerDeco(g, info, dropBounds);
       break;
     }
   }
@@ -3105,11 +3144,11 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
         gfx::Rect bounds = bounds1.createUnion(bounds2);
         bounds.y -= skinTheme()->dimensions.timelineTagsAreaHeight();
 
-        int textHeight = font()->height();
+        int textHeight = font()->lineHeight();
         bounds.y -= textHeight + 2 * ui::guiscale();
         bounds.x += 3 * ui::guiscale();
         bounds.w = font()->textLength(tag->name().c_str()) + 4 * ui::guiscale();
-        bounds.h = font()->height() + 2 * ui::guiscale();
+        bounds.h = font()->lineHeight() + 2 * ui::guiscale();
 
         if (m_tagFocusBand < 0) {
           auto it = m_tagBand.find(tag);
@@ -3157,6 +3196,27 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
   return gfx::Rect();
 }
 
+gfx::Rect Timeline::getSelectedFramesBounds(const Range& range) const
+{
+  gfx::Rect rc;
+  for (frame_t frame : range.selectedFrames()) {
+    rc |= getPartBounds(Hit(PART_HEADER_FRAME, 0, col_t(frame)));
+    rc |= getPartBounds(Hit(PART_CEL, 0, col_t(frame)));
+  }
+  return rc;
+}
+
+gfx::Rect Timeline::getSelectedLayersBounds(const Range& range) const
+{
+  gfx::Rect rc;
+  for (auto* layer : range.selectedLayers()) {
+    layer_t layerIdx = getLayerIndex(layer);
+    rc |= getPartBounds(Hit(PART_ROW_TEXT, layerIdx));
+    rc |= getPartBounds(Hit(PART_CEL, layerIdx, lastFrame()));
+  }
+  return rc;
+}
+
 gfx::Rect Timeline::getRangeBounds(const Range& range) const
 {
   gfx::Rect rc;
@@ -3165,26 +3225,15 @@ gfx::Rect Timeline::getRangeBounds(const Range& range) const
       // Return empty rectangle
       break;
     case Range::kCels:
-      for (auto layer : range.selectedLayers()) {
+      for (auto* layer : range.selectedLayers()) {
         layer_t layerIdx = getLayerIndex(layer);
         for (frame_t frame : range.selectedFrames())
           rc |= getPartBounds(Hit(PART_CEL, layerIdx, col_t(frame)));
       }
       break;
-    case Range::kFrames: {
-      for (frame_t frame : range.selectedFrames()) {
-        rc |= getPartBounds(Hit(PART_HEADER_FRAME, 0, col_t(frame)));
-        rc |= getPartBounds(Hit(PART_CEL, 0, col_t(frame)));
-      }
-      break;
-    }
-    case Range::kLayers:
-      for (auto layer : range.selectedLayers()) {
-        layer_t layerIdx = getLayerIndex(layer);
-        rc |= getPartBounds(Hit(PART_ROW_TEXT, layerIdx));
-        rc |= getPartBounds(Hit(PART_CEL, layerIdx, lastFrame()));
-      }
-      break;
+    case Range::kFrames: return getSelectedFramesBounds(range);
+
+    case Range::kLayers: return getSelectedLayersBounds(range);
   }
   return rc;
 }
@@ -3194,7 +3243,12 @@ gfx::Rect Timeline::getRangeClipBounds(const Range& range) const
   gfx::Rect celBounds = getCelsBounds();
   gfx::Rect clipBounds, unionBounds;
   switch (range.type()) {
-    case Range::kCels:   clipBounds = celBounds; break;
+    case Range::kCels: {
+      clipBounds = celBounds;
+      if (m_state == STATE_DRAGGING_EXTERNAL_RANGE)
+        clipBounds |= getLayerHeadersBounds();
+      break;
+    }
     case Range::kFrames: {
       clipBounds = getFrameHeadersBounds();
 
@@ -4171,7 +4225,7 @@ void Timeline::updateDropRange(const gfx::Point& pt)
   m_dropTarget.vhit = DropTarget::VNone;
   m_dropTarget.outside = false;
 
-  if (m_state != STATE_MOVING_RANGE) {
+  if (m_state != STATE_MOVING_RANGE && m_state != STATE_DRAGGING_EXTERNAL_RANGE) {
     m_dropRange.clearRange();
     return;
   }
@@ -4309,7 +4363,8 @@ int Timeline::outlineWidth() const
 
 int Timeline::oneTagHeight() const
 {
-  return font()->height() + 2 * ui::guiscale() + skinTheme()->dimensions.timelineTagsAreaHeight();
+  return font()->lineHeight() + 2 * ui::guiscale() +
+         skinTheme()->dimensions.timelineTagsAreaHeight();
 }
 
 double Timeline::zoom() const
@@ -4464,18 +4519,23 @@ void Timeline::onCancel(Context* ctx)
 
 void Timeline::onDragEnter(ui::DragEvent& e)
 {
-  m_state = STATE_MOVING_RANGE;
+  Widget::onDragEnter(e);
+
+  m_state = STATE_DRAGGING_EXTERNAL_RANGE;
+  setCursor(nullptr, Hit());
 }
 
 void Timeline::onDragLeave(ui::DragEvent& e)
 {
+  Widget::onDragLeave(e);
+
   m_state = STATE_STANDBY;
   m_range.clearRange();
   m_dropRange.clearRange();
   invalidate();
   flushRedraw();
-  os::Event ev;
-  os::System::instance()->eventQueue()->queueEvent(ev);
+  flushMessages();
+  updateByMousePos(nullptr, e.position());
 }
 
 void Timeline::onDrag(ui::DragEvent& e)
@@ -4485,6 +4545,7 @@ void Timeline::onDrag(ui::DragEvent& e)
   m_range.clearRange();
   setHot(hitTest(nullptr, e.position()));
   switch (m_hot.part) {
+    case PART_NOTHING:             invalidate();
     case PART_ROW:
     case PART_ROW_EYE_ICON:
     case PART_ROW_CONTINUOUS_ICON:
@@ -4504,28 +4565,34 @@ void Timeline::onDrag(ui::DragEvent& e)
 
   updateDropRange(e.position());
   flushRedraw();
-  os::Event ev;
-  os::System::instance()->eventQueue()->queueEvent(ev);
+  flushMessages();
 }
 
 void Timeline::onDrop(ui::DragEvent& e)
 {
-  using InsertionPoint = cmd::DropOnTimeline::InsertionPoint;
-  using DroppedOn = cmd::DropOnTimeline::DroppedOn;
+  using InsertionPoint = docapi::InsertionPoint;
+  using DroppedOn = docapi::DroppedOn;
   Widget::onDrop(e);
 
   // Determine at which frame and layer the content was dropped on.
   frame_t frame = m_frame;
-  layer_t layerIndex = getLayerIndex(m_layer);
+  layer_t layerIndex = m_sprite->root()->getLayerIndex(m_layer);
   InsertionPoint insert = InsertionPoint::BeforeLayer;
   DroppedOn droppedOn = DroppedOn::Unspecified;
+  TRACE("m_dropRange.type() %d\n", m_dropRange.type());
   switch (m_dropRange.type()) {
     case Range::kCels:
       frame = m_hot.frame;
-      layerIndex = m_hot.layer;
+      if (!m_hot.veryBottom)
+        layerIndex = m_hot.layer;
       droppedOn = DroppedOn::Cel;
       insert = (m_dropTarget.vhit == DropTarget::Top ? InsertionPoint::AfterLayer :
                                                        InsertionPoint::BeforeLayer);
+      TRACE("m_hot part=%d veryBottom=%d frame=%d layer=%d\n",
+            m_hot.part,
+            m_hot.veryBottom,
+            m_hot.frame,
+            m_hot.layer);
       break;
     case Range::kFrames:
       frame = m_dropRange.firstFrame();
@@ -4535,7 +4602,7 @@ void Timeline::onDrop(ui::DragEvent& e)
       break;
     case Range::kLayers:
       droppedOn = DroppedOn::Layer;
-      if (m_dropTarget.vhit != DropTarget::VeryBottom) {
+      if (m_dropTarget.vhit != DropTarget::VeryBottom && !m_dropRange.selectedLayers().empty()) {
         auto* selectedLayer = *m_dropRange.selectedLayers().begin();
         layerIndex = getLayerIndex(selectedLayer);
       }
@@ -4554,16 +4621,22 @@ void Timeline::onDrop(ui::DragEvent& e)
     auto surface = e.getImage();
 
     execute_from_ui_thread([=] {
-      std::string txmsg = (droppedImage ? "Dropped image on timeline" :
-                                          "Dropped paths on timeline");
-      Tx tx(m_document, txmsg);
+      std::string txmsg;
+      std::unique_ptr<docapi::DocProvider> docProvider = nullptr;
       if (droppedImage) {
+        txmsg = "Dropped image on timeline";
         doc::ImageRef image = nullptr;
         convert_surface_to_image(surface.get(), 0, 0, surface->width(), surface->height(), image);
-        tx(new cmd::DropOnTimeline(m_document, frame, layerIndex, insert, droppedOn, image));
+        docProvider = std::make_unique<DocProviderFromImage>(image);
       }
-      else
-        tx(new cmd::DropOnTimeline(m_document, frame, layerIndex, insert, droppedOn, paths));
+      else {
+        txmsg = "Dropped paths on timeline";
+        docProvider = std::make_unique<DocProviderFromPaths>(m_document->context(), paths);
+      }
+
+      Tx tx(m_document, txmsg);
+      DocApi docApi(m_document, tx);
+      docApi.dropDocumentsOnTimeline(m_document, frame, layerIndex, insert, droppedOn, *docProvider);
       tx.commit();
       m_document->notifyGeneralUpdate();
     });
@@ -4575,8 +4648,7 @@ void Timeline::onDrop(ui::DragEvent& e)
   m_dropRange.clearRange();
   invalidate();
   flushRedraw();
-  os::Event ev;
-  os::System::instance()->eventQueue()->queueEvent(ev);
+  flushMessages();
 }
 
 int Timeline::tagFramesDuration(const Tag* tag) const
diff --git a/src/app/ui/timeline/timeline.h b/src/app/ui/timeline/timeline.h
index be231cd3d..4e6efa13d 100644
--- a/src/app/ui/timeline/timeline.h
+++ b/src/app/ui/timeline/timeline.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -13,6 +13,7 @@
 #include "app/docs_observer.h"
 #include "app/loop_tag.h"
 #include "app/pref/preferences.h"
+#include "app/ui/dockable.h"
 #include "app/ui/editor/editor_observer.h"
 #include "app/ui/input_chain_element.h"
 #include "app/ui/timeline/ani_controls.h"
@@ -48,6 +49,7 @@ namespace ui {
 class Graphics;
 class TooltipManager;
 class DragEvent;
+struct PaintWidgetPartInfo;
 } // namespace ui
 
 namespace app {
@@ -72,7 +74,8 @@ class Timeline : public ui::Widget,
                  public DocObserver,
                  public EditorObserver,
                  public InputChainElement,
-                 public TagProvider {
+                 public TagProvider,
+                 public Dockable {
 public:
   using Range = view::Range;
   using RealRange = view::RealRange;
@@ -103,6 +106,8 @@ public:
     STATE_DISABLING_CONTINUOUS_LAYERS,
     STATE_EXPANDING_LAYERS,
     STATE_COLLAPSING_LAYERS,
+    // Drag & drop handling state
+    STATE_DRAGGING_EXTERNAL_RANGE,
   };
 
   enum DropOp { kMove, kCopy };
@@ -152,6 +157,12 @@ public:
 
   void clearAndInvalidateRange();
 
+  // Dockable impl
+  int dockableAt() const override
+  {
+    return ui::TOP | ui::BOTTOM | ui::LEFT | ui::RIGHT | ui::EXPANSIVE;
+  }
+
 protected:
   bool onProcessMessage(ui::Message* msg) override;
   void onInitTheme(ui::InitThemeEvent& ev) override;
@@ -311,6 +322,10 @@ private:
                      gfx::Color tagColor,
                      const gfx::Rect& bounds,
                      const gfx::Rect& clipBounds);
+  void paintDropFrameDeco(ui::Graphics* g, ui::PaintWidgetPartInfo info, gfx::Rect dropBounds);
+  void paintDropLayerDeco(ui::Graphics* g,
+                          const ui::PaintWidgetPartInfo& info,
+                          gfx::Rect dropBounds);
   void drawRangeOutline(ui::Graphics* g);
   void drawPaddings(ui::Graphics* g);
   bool drawPart(ui::Graphics* g, int part, layer_t layer, col_t frame);
@@ -320,6 +335,8 @@ private:
   gfx::Rect getOnionskinFramesBounds() const;
   gfx::Rect getCelsBounds() const;
   gfx::Rect getPartBounds(const Hit& hit) const;
+  gfx::Rect getSelectedFramesBounds(const Range& range) const;
+  gfx::Rect getSelectedLayersBounds(const Range& range) const;
   gfx::Rect getRangeBounds(const Range& range) const;
   gfx::Rect getRangeClipBounds(const Range& range) const;
   int getFrameXPos(const col_t frame) const;
@@ -410,6 +427,7 @@ private:
   ui::ScrollBar m_vbar;
   gfx::Rect m_viewportArea;
   double m_zoom;
+  bool m_scaleUpToFit;
   Context* m_context;
   Editor* m_editor;
   Doc* m_document;
diff --git a/src/app/ui/toolbar.cpp b/src/app/ui/toolbar.cpp
index c13ecf13e..c0714027d 100644
--- a/src/app/ui/toolbar.cpp
+++ b/src/app/ui/toolbar.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -94,9 +94,6 @@ ToolBar::ToolBar() : Widget(kGenericWidget), m_openedRecently(false), m_tipTimer
   m_hotTool = NULL;
   m_hotIndex = NoneIndex;
   m_openOnHot = false;
-  m_popupWindow = NULL;
-  m_currentStrip = NULL;
-  m_tipWindow = NULL;
   m_tipOpened = false;
   m_minHeight = 0;
 
@@ -112,9 +109,6 @@ ToolBar::ToolBar() : Widget(kGenericWidget), m_openedRecently(false), m_tipTimer
 ToolBar::~ToolBar()
 {
   App::instance()->activeToolManager()->remove_observer(this);
-
-  delete m_popupWindow;
-  delete m_tipWindow;
 }
 
 bool ToolBar::isToolVisible(Tool* tool)
@@ -125,18 +119,6 @@ bool ToolBar::isToolVisible(Tool* tool)
 bool ToolBar::onProcessMessage(Message* msg)
 {
   switch (msg->type()) {
-    case kPaintMessage: {
-      auto toolbox = App::instance()->toolBox();
-      auto lastToolBounds = getToolGroupBounds(toolbox->getGroupsCount());
-      int minHeight = lastToolBounds.y + lastToolBounds.h;
-
-      if (minHeight != m_minHeight) {
-        m_minHeight = minHeight;
-        invalidate();
-      }
-      break;
-    }
-
     case kMouseDownMessage: {
       auto mouseMsg = static_cast<const MouseMessage*>(msg);
       const Point mousePos = mouseMsg->positionForDisplay(display());
@@ -266,17 +248,10 @@ bool ToolBar::onProcessMessage(Message* msg)
       // mouse over the ToolBar.
       if (hasCapture()) {
         MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
-        Widget* pick = manager()->pickFromScreenPos(mouseMsg->screenPosition());
+        Manager* mgr = manager();
+        Widget* pick = mgr->pickFromScreenPos(mouseMsg->screenPosition());
         if (ToolStrip* strip = dynamic_cast<ToolStrip*>(pick)) {
-          releaseMouse();
-
-          MouseMessage* mouseMsg2 = new MouseMessage(
-            kMouseDownMessage,
-            *mouseMsg,
-            mouseMsg->positionForDisplay(strip->display()));
-          mouseMsg2->setRecipient(strip);
-          mouseMsg2->setDisplay(strip->display());
-          manager()->enqueueMessage(mouseMsg2);
+          mgr->transferAsMouseDownMessage(this, strip, mouseMsg);
         }
       }
       break;
@@ -333,10 +308,26 @@ void ToolBar::onSizeHint(SizeHintEvent& ev)
   iconsize.h += border().height();
   ev.setSizeHint(iconsize);
 
+#if 0 // The Dock widget will ask for sizeHint() of this widget when
+      // we open the popup, so we cannot close the recently closed
+      // popup.
   if (m_popupWindow) {
     closePopupWindow();
     closeTipWindow();
   }
+#endif
+}
+
+void ToolBar::onResize(ui::ResizeEvent& ev)
+{
+  Widget::onResize(ev);
+
+  auto* toolbox = App::instance()->toolBox();
+  auto lastToolBounds = getToolGroupBounds(toolbox->getGroupsCount());
+  m_minHeight = lastToolBounds.y2() -
+                origin().y
+                // Preview and timeline buttons
+                + 2 * (getToolIconSize(this).h - 1) + 3 * guiscale();
 }
 
 void ToolBar::onPaint(ui::PaintEvent& ev)
@@ -408,6 +399,11 @@ void ToolBar::onVisible(bool visible)
   }
 }
 
+bool ToolBar::isDockedAtLeftSide() const
+{
+  return bounds().center().x < window()->bounds().center().x;
+}
+
 int ToolBar::getToolGroupIndex(ToolGroup* group)
 {
   ToolBox* toolbox = App::instance()->toolBox();
@@ -472,7 +468,7 @@ void ToolBar::openPopupWindow(GroupType group_type, int group_index, tools::Tool
 
   // In case this tool contains more than just one tool, show the popup window
   m_openOnHot = true;
-  m_popupWindow = new TransparentPopupWindow(
+  m_popupWindow = std::make_unique<TransparentPopupWindow>(
     PopupWindow::ClickBehavior::CloseOnClickOutsideHotRegion);
   m_closeConn = m_popupWindow->Close.connect([this] { onClosePopup(); });
   m_openedRecently = true;
@@ -481,19 +477,23 @@ void ToolBar::openPopupWindow(GroupType group_type, int group_index, tools::Tool
   m_currentStrip = toolstrip;
   m_popupWindow->addChild(toolstrip);
 
+  const int borderWidth = border().width();
   Rect rc = getToolGroupBounds(group_index);
-  int w = 0;
+  int w = borderWidth;
   for (const auto* tool : tools) {
     (void)tool;
-    w += bounds().w - border().width() - 1 * guiscale();
+    w += bounds().w - borderWidth - 1 * guiscale();
   }
 
-  rc.x -= w;
+  if (isDockedAtLeftSide())
+    rc.x = bounds().x2() - borderWidth;
+  else
+    rc.x -= w - borderWidth;
   rc.w = w;
 
   // Set hotregion of popup window
   m_popupWindow->setAutoRemap(false);
-  ui::fit_bounds(display(), m_popupWindow, rc);
+  ui::fit_bounds(display(), m_popupWindow.get(), rc);
   m_popupWindow->setBounds(rc);
 
   Region rgn(m_popupWindow->boundsOnScreen().enlarge(16 * guiscale()));
@@ -507,8 +507,7 @@ void ToolBar::closePopupWindow()
 {
   if (m_popupWindow) {
     m_popupWindow->closeWindow(nullptr);
-    delete m_popupWindow;
-    m_popupWindow = nullptr;
+    m_popupWindow.reset();
   }
 }
 
@@ -549,7 +548,7 @@ Point ToolBar::getToolPositionInGroup(const Tool* tool) const
   const auto& tools = m_currentStrip->tools();
   const int nth = std::find(tools.begin(), tools.end(), tool) - tools.begin();
 
-  return Point(iconsize.w / 2 + nth * (iconsize.w - 1 * guiscale()), iconsize.h);
+  return Point(iconsize.w / 2 + nth * (iconsize.w - border().right()), iconsize.h);
 }
 
 void ToolBar::openTipWindow(ToolGroup* tool_group, Tool* tool)
@@ -578,9 +577,9 @@ void ToolBar::openTipWindow(int group_index, Tool* tool)
 
     // Tool shortcut
     KeyPtr key = KeyboardShortcuts::instance()->tool(tool);
-    if (key && !key->accels().empty()) {
+    if (key && !key->shortcuts().empty()) {
       tooltip += "\n\n";
-      tooltip += Strings::tools_shortcut(key->accels().front().toString());
+      tooltip += Strings::tools_shortcut(key->shortcuts().front().toString());
     }
   }
   else if (group_index == PreviewVisibilityIndex) {
@@ -598,15 +597,31 @@ void ToolBar::openTipWindow(int group_index, Tool* tool)
   else
     return;
 
-  m_tipWindow = new TipWindow(tooltip);
+  m_tipWindow = std::make_unique<TipWindow>(tooltip);
   m_tipWindow->remapWindow();
 
   Rect toolrc = getToolGroupBounds(group_index);
   Point arrow = (tool ? getToolPositionInGroup(tool) : Point(0, 0));
-  if (tool && m_popupWindow && m_popupWindow->isVisible())
-    toolrc.x += arrow.x - m_popupWindow->bounds().w;
 
-  m_tipWindow->pointAt(TOP | RIGHT, toolrc, ui::Manager::getDefault()->display());
+  int pointAt = TOP;
+  if (isDockedAtLeftSide()) {
+    pointAt |= LEFT;
+    toolrc.x -= border().width();
+  }
+  else {
+    pointAt |= RIGHT;
+    toolrc.x += border().width();
+  }
+
+  // Tooltip for subtools (tools inside groups)
+  if (tool && m_popupWindow && m_popupWindow->isVisible()) {
+    if (isDockedAtLeftSide())
+      toolrc.x += arrow.x + bounds().w - border().width();
+    else
+      toolrc.x += arrow.x - m_popupWindow->bounds().w + border().width();
+  }
+
+  m_tipWindow->pointAt(pointAt, toolrc, ui::Manager::getDefault()->display());
 
   if (m_tipOpened)
     m_tipWindow->openWindow();
@@ -620,8 +635,7 @@ void ToolBar::closeTipWindow()
 
   if (m_tipWindow) {
     m_tipWindow->closeWindow(NULL);
-    delete m_tipWindow;
-    m_tipWindow = NULL;
+    m_tipWindow.reset();
   }
 }
 
@@ -658,7 +672,7 @@ void ToolBar::onClosePopup()
   m_openOnHot = false;
   m_hotTool = NULL;
   m_hotIndex = NoneIndex;
-  m_currentStrip = NULL;
+  m_currentStrip = nullptr;
 
   invalidate();
 }
@@ -673,8 +687,8 @@ void ToolBar::drawToolIcon(Graphics* g, int group_index, SkinPartPtr skin, os::S
 
   if (icon) {
     g->drawRgbaSurface(icon,
-                       CALC_FOR_CENTER(toolrc.x, toolrc.w, icon->width()),
-                       CALC_FOR_CENTER(toolrc.y, toolrc.h, icon->height()));
+                       guiscaled_center(toolrc.x, toolrc.w, icon->width()),
+                       guiscaled_center(toolrc.y, toolrc.h, icon->height()));
   }
 }
 
@@ -683,9 +697,9 @@ int ToolBar::getHiddenGroups() const
   auto* toolbox = App::instance()->toolBox();
   const int height = size().h;
   if (height < m_minHeight) {
-    int hidden = (m_minHeight - height) / getToolIconSize(this).h;
+    int hidden = (m_minHeight - height) / (getToolIconSize(this).h - 1 * guiscale());
     if (hidden >= 1)
-      return std::clamp(hidden + 1, 2, toolbox->getGroupsCount() - 1);
+      return std::clamp(hidden + 1, 2, toolbox->getGroupsCount());
   }
   return 0;
 }
@@ -755,16 +769,10 @@ bool ToolBar::ToolStrip::onProcessMessage(Message* msg)
         if (m_hotTool)
           m_toolbar->selectTool(m_hotTool);
 
-        Widget* pick = manager()->pickFromScreenPos(mouseMsg->screenPosition());
+        Manager* mgr = manager();
+        Widget* pick = mgr->pickFromScreenPos(mouseMsg->screenPosition());
         if (ToolBar* bar = dynamic_cast<ToolBar*>(pick)) {
-          releaseMouse();
-
-          MouseMessage* mouseMsg2 = new MouseMessage(kMouseDownMessage,
-                                                     *mouseMsg,
-                                                     mouseMsg->positionForDisplay(pick->display()));
-          mouseMsg2->setRecipient(bar);
-          mouseMsg2->setDisplay(pick->display());
-          manager()->enqueueMessage(mouseMsg2);
+          mgr->transferAsMouseDownMessage(this, bar, mouseMsg);
         }
       }
       break;
@@ -812,8 +820,8 @@ void ToolBar::ToolStrip::onPaint(PaintEvent& ev)
     os::Surface* icon = theme->getToolIcon(tool->getId().c_str());
     if (icon) {
       g->drawRgbaSurface(icon,
-                         CALC_FOR_CENTER(toolrc.x, toolrc.w, icon->width()),
-                         CALC_FOR_CENTER(toolrc.y, toolrc.h, icon->height()));
+                         guiscaled_center(toolrc.x, toolrc.w, icon->width()),
+                         guiscaled_center(toolrc.y, toolrc.h, icon->height()));
     }
   }
 }
diff --git a/src/app/ui/toolbar.h b/src/app/ui/toolbar.h
index 9b1f988ea..faea6ab6a 100644
--- a/src/app/ui/toolbar.h
+++ b/src/app/ui/toolbar.h
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2021-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -9,6 +10,7 @@
 #pragma once
 
 #include "app/tools/active_tool_observer.h"
+#include "app/ui/dockable.h"
 #include "app/ui/skin/skin_part.h"
 #include "gfx/point.h"
 #include "obs/connection.h"
@@ -16,6 +18,7 @@
 #include "ui/widget.h"
 
 #include <map>
+#include <memory>
 
 namespace ui {
 class CloseEvent;
@@ -31,6 +34,7 @@ class ToolGroup;
 
 // Class to show selected tools for each tool (vertically)
 class ToolBar : public ui::Widget,
+                public Dockable,
                 public tools::ActiveToolObserver {
   static ToolBar* m_instance;
 
@@ -51,15 +55,25 @@ public:
   void openTipWindow(tools::ToolGroup* toolGroup, tools::Tool* tool);
   void closeTipWindow();
 
+  // Dockable impl
+  int dockableAt() const override
+  {
+    // TODO add future support to dock the tool bar at the
+    // top/bottom sides
+    return ui::LEFT | ui::RIGHT;
+  }
+
 protected:
   bool onProcessMessage(ui::Message* msg) override;
   void onSizeHint(ui::SizeHintEvent& ev) override;
+  void onResize(ui::ResizeEvent& ev) override;
   void onPaint(ui::PaintEvent& ev) override;
   void onVisible(bool visible) override;
 
 private:
   enum class GroupType { Regular, Overflow };
 
+  bool isDockedAtLeftSide() const;
   int getToolGroupIndex(tools::ToolGroup* group);
   void openPopupWindow(GroupType group_type,
                        int group_index = 0,
@@ -93,12 +107,12 @@ private:
   bool m_openedRecently;
 
   // Window displayed to show a tool-group
-  ui::PopupWindow* m_popupWindow;
+  std::unique_ptr<ui::PopupWindow> m_popupWindow;
   class ToolStrip;
-  ToolStrip* m_currentStrip;
+  ToolStrip* m_currentStrip = nullptr;
 
   // Tool-tip window
-  ui::TipWindow* m_tipWindow;
+  std::unique_ptr<ui::TipWindow> m_tipWindow;
 
   ui::Timer m_tipTimer;
   bool m_tipOpened;
diff --git a/src/app/ui/workspace.h b/src/app/ui/workspace.h
index a3b78c5f4..f491422d6 100644
--- a/src/app/ui/workspace.h
+++ b/src/app/ui/workspace.h
@@ -19,7 +19,8 @@ namespace app {
 class WorkspaceTabs;
 
 class Workspace : public ui::Widget,
-                  public app::InputChainElement {
+                  public app::InputChainElement,
+                  public Dockable {
 public:
   typedef WorkspaceViews::iterator iterator;
 
@@ -75,6 +76,11 @@ public:
 
   WorkspacePanel* mainPanel() { return &m_mainPanel; }
 
+  // Dockable impl
+  int dockableAt() const override { return 0; }
+  int dockHandleSide() const override { return 0; } // No handles
+
+  // Signals
   obs::signal<void()> BeforeViewChanged;
   obs::signal<void()> ActiveViewChanged;
 
diff --git a/src/app/ui/workspace_tabs.h b/src/app/ui/workspace_tabs.h
index b307db066..8c22ca338 100644
--- a/src/app/ui/workspace_tabs.h
+++ b/src/app/ui/workspace_tabs.h
@@ -20,6 +20,10 @@ public:
   WorkspaceTabs(TabsDelegate* tabsDelegate);
   ~WorkspaceTabs();
 
+  // Dockable impl
+  int dockableAt() const override { return ui::TOP | ui::BOTTOM; }
+  int dockHandleSide() const override { return ui::LEFT; }
+
   WorkspacePanel* panel() const { return m_panel; }
   void setPanel(WorkspacePanel* panel);
 
diff --git a/src/app/util/clipboard.cpp b/src/app/util/clipboard.cpp
index 014a9c2ac..92026df1d 100644
--- a/src/app/util/clipboard.cpp
+++ b/src/app/util/clipboard.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -198,6 +198,16 @@ bool Clipboard::getClipboardText(std::string& text)
   }
 }
 
+bool Clipboard::hasClipboardText()
+{
+  if (use_native_clipboard()) {
+    return clip::has(clip::text_format());
+  }
+  else {
+    return !m_data->text.empty();
+  }
+}
+
 void Clipboard::setData(Image* image,
                         Mask* mask,
                         Palette* palette,
diff --git a/src/app/util/clipboard.h b/src/app/util/clipboard.h
index e95b655f6..5b36b1b3a 100644
--- a/src/app/util/clipboard.h
+++ b/src/app/util/clipboard.h
@@ -89,6 +89,7 @@ public:
   // ui::ClipboardDelegate impl
   void setClipboardText(const std::string& text) override;
   bool getClipboardText(std::string& text) override;
+  bool hasClipboardText() override;
 
   bool setNativeBitmap(const doc::Image* image,
                        const doc::Mask* mask,
diff --git a/src/app/util/conversion_to_surface.cpp b/src/app/util/conversion_to_surface.cpp
index 3d92fc036..3edb00a7d 100644
--- a/src/app/util/conversion_to_surface.cpp
+++ b/src/app/util/conversion_to_surface.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2020-2024  Igara Studio S.A.
+// Copyright (c) 2020-2025  Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This program is distributed under the terms of
@@ -250,6 +250,11 @@ void convert_image_to_surface(const doc::Image* image,
   os::SurfaceLock lockDst(surface);
   os::SurfaceFormatData fd;
   surface->getFormat(&fd);
+#if LAF_SKIA
+  // Needed because Skia surfaces work with premultiplied alpha and
+  // here we need to copy unpremultiplied alpha RGB values to the Skia surface.
+  ((os::SkiaSurface*)surface)->bitmap().setAlphaType(kUnpremul_SkAlphaType);
+#endif
 
   switch (image->pixelFormat()) {
     case IMAGE_RGB:
diff --git a/src/app/util/decode_webp.cpp b/src/app/util/decode_webp.cpp
index 40f1499ef..cab622d6c 100644
--- a/src/app/util/decode_webp.cpp
+++ b/src/app/util/decode_webp.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2024  Igara Studio S.A.
+// Copyright (C) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -15,10 +15,9 @@ namespace app { namespace util {
 
 static WEBP_CSP_MODE colorMode()
 {
-  auto surface = os::instance()->makeSurface(1, 1);
-  os::SurfaceFormatData fd;
-  surface->getFormat(&fd);
-  return (fd.redShift == 0 ? MODE_RGBA : MODE_BGRA);
+  return (os::Surface::getNativeColorChannelsOrder() == os::Surface::ColorChannelsOrder::RGB ?
+            MODE_RGBA :
+            MODE_BGRA);
 }
 
 os::SurfaceRef decode_webp(const uint8_t* buf, uint32_t len)
@@ -61,7 +60,7 @@ os::SurfaceRef decode_webp(const uint8_t* buf, uint32_t len)
   if (anim_info.frame_count <= 0)
     return nullptr;
 
-  auto surface = os::instance()->makeSurface(w, h);
+  auto surface = os::System::instance()->makeSurface(w, h);
 
   // We just want the first frame, so we don't iterate.
   WebPAnimDecoderHasMoreFrames(dec);
diff --git a/src/app/util/layer_utils.cpp b/src/app/util/layer_utils.cpp
index 108784b2c..8f3e8793f 100644
--- a/src/app/util/layer_utils.cpp
+++ b/src/app/util/layer_utils.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -15,6 +15,7 @@
 #include "doc/sprite.h"
 #include "doc/tilesets.h"
 #include "fmt/format.h"
+#include <memory>
 
 namespace app {
 
@@ -54,39 +55,4 @@ std::string get_layer_path(const Layer* layer)
   return path;
 }
 
-Layer* copy_layer(doc::Layer* layer)
-{
-  return copy_layer_with_sprite(layer, layer->sprite());
-}
-
-Layer* copy_layer_with_sprite(doc::Layer* layer, doc::Sprite* sprite)
-{
-  std::unique_ptr<doc::Layer> clone;
-  if (layer->isTilemap()) {
-    auto* srcTilemap = static_cast<LayerTilemap*>(layer);
-    tileset_index tilesetIndex = srcTilemap->tilesetIndex();
-    // If the caller is trying to make a copy of a tilemap layer specifying a
-    // different sprite as its owner, then we must copy the tilesets of the
-    // given tilemap layer into the new owner.
-    if (sprite != srcTilemap->sprite()) {
-      auto* srcTilesetCopy = Tileset::MakeCopyCopyingImages(srcTilemap->tileset());
-      tilesetIndex = sprite->tilesets()->add(srcTilesetCopy);
-    }
-
-    clone.reset(new LayerTilemap(sprite, tilesetIndex));
-  }
-  else if (layer->isImage())
-    clone.reset(new LayerImage(sprite));
-  else if (layer->isGroup())
-    clone.reset(new LayerGroup(sprite));
-  else
-    throw std::runtime_error("Invalid layer type");
-
-  if (auto* doc = dynamic_cast<app::Doc*>(sprite->document())) {
-    doc->copyLayerContent(layer, doc, clone.get());
-  }
-
-  return clone.release();
-}
-
 } // namespace app
diff --git a/src/app/util/layer_utils.h b/src/app/util/layer_utils.h
index 7c0f5522e..110ab2ca7 100644
--- a/src/app/util/layer_utils.h
+++ b/src/app/util/layer_utils.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -25,9 +25,6 @@ bool layer_is_locked(Editor* editor);
 
 std::string get_layer_path(const doc::Layer* layer);
 
-doc::Layer* copy_layer(doc::Layer* layer);
-doc::Layer* copy_layer_with_sprite(doc::Layer* layer, doc::Sprite* sprite);
-
 } // namespace app
 
 #endif
diff --git a/src/app/util/open_file_job.cpp b/src/app/util/open_file_job.cpp
new file mode 100644
index 000000000..5ff1fa8b6
--- /dev/null
+++ b/src/app/util/open_file_job.cpp
@@ -0,0 +1,37 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#include "app/util/open_file_job.h"
+
+namespace app {
+
+void OpenFileJob::showProgressWindow()
+{
+  startJob();
+
+  if (isCanceled())
+    m_fop->stop();
+
+  waitJob();
+}
+
+// Thread to do the hard work: load the file from the disk.
+void OpenFileJob::onJob()
+{
+  try {
+    m_fop->operate(this);
+  }
+  catch (const std::exception& e) {
+    m_fop->setError("Error loading file:\n%s", e.what());
+  }
+
+  if (m_fop->isStop() && m_fop->document())
+    delete m_fop->releaseDocument();
+
+  m_fop->done();
+}
+
+} // namespace app
diff --git a/src/app/util/open_file_job.h b/src/app/util/open_file_job.h
index 53c5cab28..2c45c0aca 100644
--- a/src/app/util/open_file_job.h
+++ b/src/app/util/open_file_job.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2024  Igara Studio S.A.
+// Copyright (C) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -23,32 +23,11 @@ public:
   {
   }
 
-  void showProgressWindow()
-  {
-    startJob();
-
-    if (isCanceled())
-      m_fop->stop();
-
-    waitJob();
-  }
+  void showProgressWindow();
 
 private:
   // Thread to do the hard work: load the file from the disk.
-  virtual void onJob() override
-  {
-    try {
-      m_fop->operate(this);
-    }
-    catch (const std::exception& e) {
-      m_fop->setError("Error loading file:\n%s", e.what());
-    }
-
-    if (m_fop->isStop() && m_fop->document())
-      delete m_fop->releaseDocument();
-
-    m_fop->done();
-  }
+  virtual void onJob() override;
 
   virtual void ackFileOpProgress(double progress) override { jobProgress(progress); }
 
diff --git a/src/app/util/render_text.cpp b/src/app/util/render_text.cpp
index 8249c4580..29418f3cb 100644
--- a/src/app/util/render_text.cpp
+++ b/src/app/util/render_text.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2022-2024  Igara Studio S.A.
+// Copyright (C) 2022-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -11,14 +11,15 @@
 
 #include "app/util/render_text.h"
 
-#include "app/font_info.h"
-#include "app/ui/skin/skin_theme.h"
+#include "app/fonts/font_info.h"
+#include "app/fonts/fonts.h"
 #include "base/fs.h"
 #include "doc/blend_funcs.h"
 #include "doc/blend_internals.h"
 #include "doc/color.h"
 #include "doc/image.h"
 #include "doc/primitives.h"
+#include "os/paint.h"
 #include "text/draw_text.h"
 #include "text/font_metrics.h"
 #include "text/text_blob.h"
@@ -48,12 +49,8 @@ public:
   {
     ASSERT(info.font);
     if (info.clusters && info.glyphCount > 0) {
-      const float height = info.font->metrics(nullptr);
-
-      for (int i = 0; i < info.glyphCount; ++i) {
-        auto rc = info.getGlyphBounds(i);
-        m_bounds |= gfx::RectF(rc.x, 0, rc.w, height);
-      }
+      for (int i = 0; i < info.glyphCount; ++i)
+        m_bounds |= info.getGlyphBounds(i);
     }
   }
 
@@ -63,54 +60,7 @@ private:
 
 } // anonymous namespace
 
-text::FontRef get_font_from_info(const FontInfo& fontInfo)
-{
-  auto* theme = skin::SkinTheme::instance();
-  ASSERT(theme);
-  if (!theme)
-    return nullptr;
-
-  const text::FontMgrRef fontMgr = theme->fontMgr();
-  if (!fontMgr)
-    return nullptr;
-
-  text::FontRef font;
-  if (fontInfo.type() == FontInfo::Type::System) {
-    // Just in case the typeface is not present in the FontInfo
-    auto typeface = fontInfo.findTypeface(fontMgr);
-
-    font = fontMgr->makeFont(typeface);
-    if (!fontInfo.useDefaultSize())
-      font->setSize(fontInfo.size());
-  }
-  else {
-    const int size = (fontInfo.useDefaultSize() ? 18 : fontInfo.size());
-    font = theme->getFontByName(fontInfo.name(), size);
-
-    if (!font && fontInfo.type() == FontInfo::Type::File) {
-      font = fontMgr->loadTrueTypeFont(fontInfo.name().c_str(), size);
-    }
-  }
-
-  if (font)
-    font->setAntialias(fontInfo.antialias());
-
-  return font;
-}
-
-text::TextBlobRef create_text_blob(const FontInfo& fontInfo, const std::string& text)
-{
-  const text::FontRef font = get_font_from_info(fontInfo);
-  if (!font)
-    return nullptr;
-
-  auto* theme = skin::SkinTheme::instance();
-  const text::FontMgrRef fontMgr = theme->fontMgr();
-
-  return text::TextBlob::MakeWithShaper(fontMgr, font, text);
-}
-
-gfx::Size get_text_blob_required_size(const text::TextBlobRef& blob)
+gfx::RectF get_text_blob_required_bounds(const text::TextBlobRef& blob)
 {
   ASSERT(blob != nullptr);
 
@@ -118,50 +68,46 @@ gfx::Size get_text_blob_required_size(const text::TextBlobRef& blob)
   blob->visitRuns([&bounds](text::TextBlob::RunInfo& run) {
     for (int i = 0; i < run.glyphCount; ++i) {
       bounds |= run.getGlyphBounds(i);
-      bounds |= gfx::RectF(0, 0, 1, run.font->metrics(nullptr));
     }
   });
   if (bounds.w < 1)
     bounds.w = 1;
   if (bounds.h < 1)
     bounds.h = 1;
-  return gfx::Size(std::ceil(bounds.w), std::ceil(bounds.h));
+  return bounds;
 }
 
-doc::ImageRef render_text_blob(const text::TextBlobRef& blob, gfx::Color color)
+doc::ImageRef render_text_blob(const text::TextBlobRef& blob,
+                               const gfx::RectF& textBounds,
+                               const ui::Paint& paint)
 {
   ASSERT(blob != nullptr);
 
-  os::Paint paint;
-  // TODO offer Stroke, StrokeAndFill, and Fill styles
-  paint.style(os::Paint::Fill);
-  paint.color(color);
-
-  gfx::Size blobSize = get_text_blob_required_size(blob);
-
-  doc::ImageRef image(doc::Image::create(doc::IMAGE_RGB, blobSize.w, blobSize.h));
+  doc::ImageRef image(
+    doc::Image::create(doc::IMAGE_RGB, std::ceil(textBounds.w), std::ceil(textBounds.h)));
 
 #ifdef LAF_SKIA
   sk_sp<SkSurface> skSurface = wrap_docimage_in_sksurface(image.get());
   os::SurfaceRef surface = base::make_ref<os::SkiaSurface>(skSurface);
-  text::draw_text(surface.get(), blob, gfx::PointF(0, 0), &paint);
+  text::draw_text(surface.get(), blob, -textBounds.origin(), &paint);
 #endif // LAF_SKIA
 
   return image;
 }
 
-doc::ImageRef render_text(const FontInfo& fontInfo, const std::string& text, gfx::Color color)
+doc::ImageRef render_text(const FontInfo& fontInfo, const std::string& text, const ui::Paint& paint)
 {
-  const text::FontRef font = get_font_from_info(fontInfo);
+  Fonts* fonts = Fonts::instance();
+  ASSERT(fonts);
+  if (!fonts)
+    return nullptr;
+
+  const text::FontRef font = fonts->fontFromInfo(fontInfo);
   if (!font)
     return nullptr;
 
-  auto* theme = skin::SkinTheme::instance();
-  const text::FontMgrRef fontMgr = theme->fontMgr();
-
-  os::Paint paint;
-  paint.style(os::Paint::StrokeAndFill);
-  paint.color(color);
+  const text::FontMgrRef fontMgr = fonts->fontMgr();
+  ASSERT(fontMgr);
 
   // We have to measure all text runs which might use different
   // fonts (e.g. if the given font is not enough to shape other code
diff --git a/src/app/util/render_text.h b/src/app/util/render_text.h
index 9fa35e33d..8e2c1b9da 100644
--- a/src/app/util/render_text.h
+++ b/src/app/util/render_text.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2024  Igara Studio S.A.
+// Copyright (C) 2024-2025  Igara Studio S.A.
 // Copyright (C) 2001-2015  David Capello
 //
 // This program is distributed under the terms of
@@ -11,27 +11,28 @@
 
 #include "doc/image_ref.h"
 #include "gfx/color.h"
-#include "text/font_mgr.h"
+#include "gfx/rect.h"
 #include "text/text_blob.h"
+#include "ui/paint.h"
 
 #include <string>
 
 namespace app {
 
-class Color;
 class FontInfo;
 
-text::FontRef get_font_from_info(const FontInfo& fontInfo);
+// Returns the exact bounds that are required to draw this TextBlob in
+// the origin point (0, 0), i.e. the image size that will be required
+// in render_text_blob().
+gfx::RectF get_text_blob_required_bounds(const text::TextBlobRef& blob);
 
-text::TextBlobRef create_text_blob(const FontInfo& fontInfo, const std::string& text);
+doc::ImageRef render_text_blob(const text::TextBlobRef& blob,
+                               const gfx::RectF& textBounds,
+                               const ui::Paint& paint);
 
-// Returns the exact bounds that are required to draw this TextBlob,
-// i.e. the image size that will be required in render_text_blob().
-gfx::Size get_text_blob_required_size(const text::TextBlobRef& blob);
-
-doc::ImageRef render_text_blob(const text::TextBlobRef& blob, gfx::Color color);
-
-doc::ImageRef render_text(const FontInfo& fontInfo, const std::string& text, gfx::Color color);
+doc::ImageRef render_text(const FontInfo& fontInfo,
+                          const std::string& text,
+                          const ui::Paint& paint);
 
 } // namespace app
 
diff --git a/src/app/util/resize_image.cpp b/src/app/util/resize_image.cpp
index 0aef03334..c8d0b652c 100644
--- a/src/app/util/resize_image.cpp
+++ b/src/app/util/resize_image.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2019-2022  Igara Studio S.A.
+// Copyright (c) 2019-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -26,7 +26,7 @@
 
 namespace app {
 
-doc::Image* resize_image(const doc::Image* image,
+doc::Image* resize_image(doc::Image* image,
                          const gfx::SizeF& scale,
                          const doc::algorithm::ResizeMethod method,
                          const Palette* pal,
@@ -38,7 +38,6 @@ doc::Image* resize_image(const doc::Image* image,
   std::unique_ptr<doc::Image> newImage(doc::Image::create(spec));
   newImage->setMaskColor(image->maskColor());
 
-  doc::algorithm::fixup_image_transparent_colors(newImage.get());
   doc::algorithm::resize_image(image, newImage.get(), method, pal, rgbmap, newImage->maskColor());
 
   return newImage.release();
@@ -77,7 +76,6 @@ void resize_cel_image(Tx& tx,
         doc::Image::create(image->pixelFormat(), std::max(1, w), std::max(1, h)));
       newImage->setMaskColor(image->maskColor());
 
-      doc::algorithm::fixup_image_transparent_colors(image);
       doc::algorithm::resize_image(
         image,
         newImage.get(),
diff --git a/src/app/util/resize_image.h b/src/app/util/resize_image.h
index 5d6ab9249..163c263f2 100644
--- a/src/app/util/resize_image.h
+++ b/src/app/util/resize_image.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2019-2021  Igara Studio S.A.
+// Copyright (c) 2019-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -23,7 +23,10 @@ class RgbMap;
 namespace app {
 class Tx;
 
-doc::Image* resize_image(const doc::Image* image,
+// The "image" parameter can be modified with
+// doc::algorithm::fixup_image_transparent_colors() function if
+// it's needed.
+doc::Image* resize_image(doc::Image* image,
                          const gfx::SizeF& scale,
                          const doc::algorithm::ResizeMethod method,
                          const doc::Palette* pal,
diff --git a/src/app/widget_loader.cpp b/src/app/widget_loader.cpp
index 6d2e3b0d1..788fde0cf 100644
--- a/src/app/widget_loader.cpp
+++ b/src/app/widget_loader.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -257,11 +257,9 @@ Widget* WidgetLoader::convertXmlElementToWidget(const XMLElement* elem,
       ((ExprEntry*)widget)->setDecimals(strtol(decimals, nullptr, 10));
   }
   if (elem_name == "filename") {
-    const char* button_only = elem->Attribute("button_only");
-    const app::FilenameField::Type type = ((button_only != nullptr &&
-                                            strtol(button_only, nullptr, 10) == 1) ?
-                                             app::FilenameField::Type::ButtonOnly :
-                                             app::FilenameField::Type::EntryAndButton);
+    const bool buttononly = bool_attr(elem, "buttononly", false);
+    const app::FilenameField::Type type = (buttononly ? app::FilenameField::Type::ButtonOnly :
+                                                        app::FilenameField::Type::EntryAndButton);
 
     widget = new app::FilenameField(type, "");
   }
@@ -534,7 +532,7 @@ Widget* WidgetLoader::convertXmlElementToWidget(const XMLElement* elem,
   }
   else if (elem_name == "font") {
     if (!widget)
-      widget = new FontEntry;
+      widget = new FontEntry(false);
   }
 
   // Was the widget created?
diff --git a/src/dio/aseprite_common.h b/src/dio/aseprite_common.h
index 7a2d0ec0c..8308f3d4c 100644
--- a/src/dio/aseprite_common.h
+++ b/src/dio/aseprite_common.h
@@ -1,5 +1,5 @@
 // Aseprite Document IO Library
-// Copyright (c) 2018-2023 Igara Studio S.A.
+// Copyright (c) 2018-2025 Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -19,6 +19,7 @@
 
 #define ASE_FILE_FLAG_LAYER_WITH_OPACITY 1
 #define ASE_FILE_FLAG_COMPOSITE_GROUPS   2
+#define ASE_FILE_FLAG_LAYER_WITH_UUID    4
 
 #define ASE_FILE_CHUNK_FLI_COLOR2        4
 #define ASE_FILE_CHUNK_FLI_COLOR         11
diff --git a/src/dio/aseprite_decoder.cpp b/src/dio/aseprite_decoder.cpp
index e3422a0b1..fba197ed5 100644
--- a/src/dio/aseprite_decoder.cpp
+++ b/src/dio/aseprite_decoder.cpp
@@ -76,6 +76,9 @@ bool AsepriteDecoder::decode()
     gfx::Rect(header.grid_x, header.grid_y, header.grid_width, header.grid_height));
   sprite->setGridType(static_cast<doc::Grid::Type>(header.grid_type));
 
+  sprite->useLayerUuids((header.flags & ASE_FILE_FLAG_LAYER_WITH_UUID) ==
+                        ASE_FILE_FLAG_LAYER_WITH_UUID);
+
   // Prepare variables for layer chunks
   doc::Layer* last_layer = sprite->root();
   doc::WithUserData* last_object_with_user_data = sprite.get();
@@ -579,48 +582,53 @@ doc::Layer* AsepriteDecoder::readLayerChunk(AsepriteHeader* header,
       break;
   }
 
-  if (layer) {
-    const bool composeGroups = (header->flags & ASE_FILE_FLAG_COMPOSITE_GROUPS);
+  if (!layer)
+    return nullptr;
 
-    if ((layer->isImage() || (layer->isGroup() && composeGroups)) &&
-        // Only transparent layers can have blend mode and opacity
-        !(flags & int(doc::LayerFlags::Background))) {
-      layer->setBlendMode((doc::BlendMode)blendmode);
-      if (header->flags & ASE_FILE_FLAG_LAYER_WITH_OPACITY)
-        layer->setOpacity(opacity);
-    }
+  // Read UUID if usage is enabled
+  if (sprite->useLayerUuids())
+    layer->setUuid(readUuid());
 
-    // flags
-    layer->setFlags(
-      static_cast<doc::LayerFlags>(flags & static_cast<int>(doc::LayerFlags::PersistentFlagsMask)));
+  const bool composeGroups = (header->flags & ASE_FILE_FLAG_COMPOSITE_GROUPS);
 
-    // name
-    layer->setName(name.c_str());
-
-    // Child level
-    if (child_level == *current_level)
-      (*previous_layer)->parent()->addLayer(layer);
-    else if (child_level > *current_level)
-      static_cast<doc::LayerGroup*>(*previous_layer)->addLayer(layer);
-    else if (child_level < *current_level) {
-      doc::LayerGroup* parent = (*previous_layer)->parent();
-      ASSERT(parent);
-      if (parent) {
-        int levels = (*current_level - child_level);
-        while (levels--) {
-          ASSERT(parent->parent());
-          if (!parent->parent())
-            break;
-          parent = parent->parent();
-        }
-        parent->addLayer(layer);
-      }
-    }
-
-    *previous_layer = layer;
-    *current_level = child_level;
+  if ((layer->isImage() || (layer->isGroup() && composeGroups)) &&
+      // Only transparent layers can have blend mode and opacity
+      !(flags & int(doc::LayerFlags::Background))) {
+    layer->setBlendMode((doc::BlendMode)blendmode);
+    if (header->flags & ASE_FILE_FLAG_LAYER_WITH_OPACITY)
+      layer->setOpacity(opacity);
   }
 
+  // flags
+  layer->setFlags(
+    static_cast<doc::LayerFlags>(flags & static_cast<int>(doc::LayerFlags::PersistentFlagsMask)));
+
+  // name
+  layer->setName(name.c_str());
+
+  // Child level
+  if (child_level == *current_level)
+    (*previous_layer)->parent()->addLayer(layer);
+  else if (child_level > *current_level)
+    static_cast<doc::LayerGroup*>(*previous_layer)->addLayer(layer);
+  else if (child_level < *current_level) {
+    doc::LayerGroup* parent = (*previous_layer)->parent();
+    ASSERT(parent);
+    if (parent) {
+      int levels = (*current_level - child_level);
+      while (levels--) {
+        ASSERT(parent->parent());
+        if (!parent->parent())
+          break;
+        parent = parent->parent();
+      }
+      parent->addLayer(layer);
+    }
+  }
+
+  *previous_layer = layer;
+  *current_level = child_level;
+
   return layer;
 }
 
@@ -1435,12 +1443,7 @@ const doc::UserData::Variant AsepriteDecoder::readPropertyValue(uint16_t type)
       return value;
     }
     case USER_DATA_PROPERTY_TYPE_UUID: {
-      base::Uuid value;
-      uint8_t* bytes = value.bytes();
-      for (int i = 0; i < 16; ++i) {
-        bytes[i] = read8();
-      }
-      return value;
+      return readUuid();
     }
     default: {
       throw base::Exception(
@@ -1476,4 +1479,14 @@ void AsepriteDecoder::readTilesData(doc::Tileset* tileset, const AsepriteExterna
   }
 }
 
+base::Uuid AsepriteDecoder::readUuid()
+{
+  base::Uuid value;
+  uint8_t* bytes = value.bytes();
+  for (int i = 0; i < 16; ++i) {
+    bytes[i] = read8();
+  }
+  return value;
+}
+
 } // namespace dio
diff --git a/src/dio/aseprite_decoder.h b/src/dio/aseprite_decoder.h
index 5b1b9e45f..d92a1d223 100644
--- a/src/dio/aseprite_decoder.h
+++ b/src/dio/aseprite_decoder.h
@@ -9,6 +9,7 @@
 #define DIO_ASEPRITE_DECODER_H_INCLUDED
 #pragma once
 
+#include "base/uuid.h"
 #include "dio/aseprite_common.h"
 #include "dio/decoder.h"
 #include "doc/frame.h"
@@ -77,6 +78,7 @@ private:
                           const AsepriteExternalFiles& extFiles);
   const doc::UserData::Variant readPropertyValue(uint16_t type);
   void readTilesData(doc::Tileset* tileset, const AsepriteExternalFiles& extFiles);
+  base::Uuid readUuid();
 
   doc::LayerList m_allLayers;
   std::vector<uint32_t> m_tilesetFlags;
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 308fe7c77..aa09e8da4 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -82,7 +82,8 @@ add_library(doc-lib
   tilesets.cpp
   user_data.cpp
   user_data_io.cpp
-  util.cpp)
+  util.cpp
+  uuid_io.cpp)
 
 target_link_libraries(doc-lib
   laf-gfx
diff --git a/src/doc/algorithm/flip_tests.cpp b/src/doc/algorithm/flip_tests.cpp
index 24e756a73..824942536 100644
--- a/src/doc/algorithm/flip_tests.cpp
+++ b/src/doc/algorithm/flip_tests.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2023  Igara Studio S.A.
+// Copyright (c) 2023-2025  Igara Studio S.A.
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -19,8 +19,8 @@ using namespace gfx;
 TEST(Flip, Image)
 {
   for (auto pf : { IMAGE_RGB, IMAGE_GRAYSCALE, IMAGE_INDEXED, IMAGE_BITMAP, IMAGE_TILEMAP }) {
-    for (int h = 2; h < 200; h += 5) {
-      for (int w = 2; w < 200; w += 5) {
+    for (int h = 2; h <= 200; h += 50) {
+      for (int w = 2; w <= 200; w += 50) {
         ImageRef a(Image::create(pf, w, h));
         doc::algorithm::random_image(a.get());
 
diff --git a/src/doc/algorithm/resize_image.cpp b/src/doc/algorithm/resize_image.cpp
index ee0e0624a..e66961812 100644
--- a/src/doc/algorithm/resize_image.cpp
+++ b/src/doc/algorithm/resize_image.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2019  Igara Studio S.A.
+// Copyright (c) 2019-2025  Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -41,13 +41,18 @@ void resize_image_nearest(const Image* src, Image* dst)
   }
 }
 
-void resize_image(const Image* src,
+void resize_image(Image* src,
                   Image* dst,
                   const ResizeMethod method,
                   const Palette* pal,
                   const RgbMap* rgbmap,
                   const color_t maskColor)
 {
+  // For resize methods that will merge neighbor pixels, we have to
+  // call fixup_image_transparent_colors().
+  if (method != RESIZE_METHOD_NEAREST_NEIGHBOR)
+    fixup_image_transparent_colors(src);
+
   switch (method) {
     // TODO optimize this
     case RESIZE_METHOD_NEAREST_NEIGHBOR: {
diff --git a/src/doc/algorithm/resize_image.h b/src/doc/algorithm/resize_image.h
index f0c5a75fd..85f634666 100644
--- a/src/doc/algorithm/resize_image.h
+++ b/src/doc/algorithm/resize_image.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2019  Igara Studio S.A.
+// Copyright (c) 2019-2025  Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -25,12 +25,13 @@ enum ResizeMethod {
   RESIZE_METHOD_ROTSPRITE,
 };
 
-// Resizes the source image 'src' to the destination image 'dst'.
+// Resizes the source image "src" to the destination image "dst".
 //
-// Warning: If you are using the RESIZE_METHOD_BILINEAR, it is
-// recommended to use 'fixup_image_transparent_colors' function
-// over the source image 'src' BEFORE using this routine.
-void resize_image(const Image* src,
+// Warning: If you are using the RESIZE_METHOD_BILINEAR, the "src"
+// image will be first filtered with the
+// fixup_image_transparent_colors() function, which modifies the
+// transparent pixels of the "src" image.
+void resize_image(Image* src,
                   Image* dst,
                   const ResizeMethod method,
                   const Palette* palette,
diff --git a/src/doc/blend_funcs.cpp b/src/doc/blend_funcs.cpp
index c8fdd35dd..1e8ae2b80 100644
--- a/src/doc/blend_funcs.cpp
+++ b/src/doc/blend_funcs.cpp
@@ -397,6 +397,43 @@ static void set_lum(double& r, double& g, double& b, double l)
   clip_color(r, g, b);
 }
 
+static inline uint8_t get_imin_channel(const double r, const double g, const double b)
+{
+  // We use '<=' to get min so as to catch two channels being equal
+  if (r <= g && r <= b)
+    return 0b001;
+  if (g <= r && g <= b)
+    return 0b010;
+
+  return 0b100;
+}
+
+static inline uint8_t get_imax_channel(const double r, const double g, const double b)
+{
+  if (r > g && r > b)
+    return 0b001;
+  if (g > r && g > b)
+    return 0b010;
+
+  return 0b100;
+}
+
+static inline uint8_t get_imid_channel(uint8_t imin, uint8_t imax)
+{
+  // Getting the remaining channel through exclusion guarantees that it is neither min nor max
+  return (~(imax | imin)) & 0b111;
+}
+
+static inline double& index_to_ref(double& r, double& g, double& b, uint8_t i)
+{
+  if (i == 0b001)
+    return r;
+  if (i == 0b010)
+    return g;
+
+  return b;
+}
+
 // TODO replace this with a better impl (and test this, not sure if it's correct)
 static void set_sat(double& r, double& g, double& b, double s)
 {
@@ -409,9 +446,15 @@ static void set_sat(double& r, double& g, double& b, double s)
   ((x) > (y) ? ((y) > (z) ? (y) : ((x) > (z) ? (z) : (x))) :                                       \
                ((y) > (z) ? ((z) > (x) ? (z) : (x)) : (y)))
 
-  double& min = MIN(r, MIN(g, b));
-  double& mid = MID(r, g, b);
-  double& max = MAX(r, MAX(g, b));
+  // Fetch channel indices
+  const uint8_t imin = get_imin_channel(r, g, b);
+  const uint8_t imax = get_imax_channel(r, g, b);
+  const uint8_t imid = get_imid_channel(imin, imax);
+
+  // Map the indices for each channel to references
+  double& min = index_to_ref(r, g, b, imin);
+  double& max = index_to_ref(r, g, b, imax);
+  double& mid = index_to_ref(r, g, b, imid);
 
   if (max > min) {
     mid = ((mid - min) * s) / (max - min);
diff --git a/src/doc/blend_internals.h b/src/doc/blend_internals.h
index 205dd4984..e17c6e222 100644
--- a/src/doc/blend_internals.h
+++ b/src/doc/blend_internals.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2024 Igara Studio S.A.
+// Copyright (c) 2024-2025 Igara Studio S.A.
 // Copyright (c) 2001-2015 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -26,6 +26,7 @@ namespace doc {
 
 template<class DstTraits, class SrcTraits>
 class BlenderHelper {
+  BlendMode m_blendMode;
   BlendFunc m_blendFunc;
   color_t m_maskColor;
 
@@ -36,6 +37,7 @@ public:
                 const BlendMode blendMode,
                 const bool newBlend)
   {
+    m_blendMode = blendMode;
     m_blendFunc = SrcTraits::get_blender(blendMode, newBlend);
     m_maskColor = src->maskColor();
   }
@@ -44,6 +46,8 @@ public:
                                                 typename SrcTraits::pixel_t src,
                                                 int opacity)
   {
+    if (m_blendMode == BlendMode::SRC)
+      return src;
     if (src != m_maskColor)
       return (*m_blendFunc)(dst, src, opacity);
     else
@@ -56,6 +60,7 @@ public:
 
 template<>
 class BlenderHelper<RgbTraits, GrayscaleTraits> {
+  BlendMode m_blendMode;
   BlendFunc m_blendFunc;
   color_t m_maskColor;
 
@@ -66,6 +71,7 @@ public:
                 const BlendMode blendMode,
                 const bool newBlend)
   {
+    m_blendMode = blendMode;
     m_blendFunc = RgbTraits::get_blender(blendMode, newBlend);
     m_maskColor = src->maskColor();
   }
@@ -74,6 +80,8 @@ public:
                                        GrayscaleTraits::pixel_t src,
                                        int opacity)
   {
+    if (m_blendMode == BlendMode::SRC)
+      return src;
     if (src != m_maskColor) {
       int v = graya_getv(src);
       return (*m_blendFunc)(dst, rgba(v, v, v, graya_geta(src)), opacity);
diff --git a/src/doc/brush.cpp b/src/doc/brush.cpp
index eaa342f67..463c45753 100644
--- a/src/doc/brush.cpp
+++ b/src/doc/brush.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -20,11 +20,12 @@
 #include "doc/primitives.h"
 
 #include <algorithm>
+#include <atomic>
 #include <cmath>
 
 namespace doc {
 
-static int generation = 0;
+static std::atomic<int> g_generation = 0;
 
 Brush::Brush()
 {
@@ -300,7 +301,7 @@ void Brush::setCenter(const gfx::Point& center)
 // Cleans the brush's data (image and region).
 void Brush::clean()
 {
-  m_gen = ++generation;
+  m_gen = ++g_generation;
   m_image.reset();
   m_maskBitmap.reset();
   m_backupImage.reset();
diff --git a/src/doc/image_tests.cpp b/src/doc/image_tests.cpp
index 42922957c..9db85a552 100644
--- a/src/doc/image_tests.cpp
+++ b/src/doc/image_tests.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2018 Igara Studio S.A.
+// Copyright (c) 2018-2025 Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -30,30 +30,18 @@ TYPED_TEST_SUITE(ImageAllTypes, ImageAllTraits);
 
 TYPED_TEST(ImageAllTypes, PutGetAndIterators)
 {
-  typedef TypeParam ImageTraits;
+  using ImageTraits = TypeParam;
 
-  std::vector<int> lengths;
-  lengths.push_back(1);
-  lengths.push_back(4);
-  lengths.push_back(7);
-  lengths.push_back(8);
-  lengths.push_back(9);
-  lengths.push_back(15);
-  lengths.push_back(16);
-  lengths.push_back(17);
-  lengths.push_back(31);
-  lengths.push_back(32);
-  lengths.push_back(33);
-
-  std::vector<gfx::Size> sizes;
+  std::vector<int> lengths = { 1, 4, 7, 8, 9, 15, 33 };
+  std::vector<gfx::Size> sizes(lengths.size() * lengths.size());
+  std::size_t k = 0;
   for (std::size_t i = 0; i < lengths.size(); ++i)
     for (std::size_t j = 0; j < lengths.size(); ++j)
-      sizes.push_back(gfx::Size(lengths[j], lengths[i]));
+      sizes[k++] = gfx::Size(lengths[j], lengths[i]);
 
-  for (std::vector<gfx::Size>::iterator sizes_it = sizes.begin(); sizes_it != sizes.end();
-       ++sizes_it) {
-    int w = sizes_it->w;
-    int h = sizes_it->h;
+  for (const auto& size : sizes) {
+    const int w = size.w;
+    const int h = size.h;
     std::unique_ptr<Image> image(Image::create(ImageTraits::pixel_format, w, h));
     std::vector<int> data(w * h);
 
@@ -72,8 +60,7 @@ TYPED_TEST(ImageAllTypes, PutGetAndIterators)
     // Read-only iterator (whole image)
     {
       const LockImageBits<ImageTraits> bits((const Image*)image.get());
-      typename LockImageBits<ImageTraits>::const_iterator begin = bits.begin(), it = begin,
-                                                          end = bits.end();
+      auto begin = bits.begin(), it = begin, end = bits.end();
 
       for (int i = 0; it != end; ++it, ++i) {
         assert(data[i] == *it);
@@ -88,8 +75,7 @@ TYPED_TEST(ImageAllTypes, PutGetAndIterators)
         break;
 
       const LockImageBits<ImageTraits> bits((const Image*)image.get(), bounds);
-      typename LockImageBits<ImageTraits>::const_iterator begin = bits.begin(), it = begin,
-                                                          end = bits.end();
+      auto begin = bits.begin(), it = begin, end = bits.end();
 
       for (int y = bounds.y; y < bounds.y + bounds.h; ++y) {
         for (int x = bounds.x; x < bounds.x + bounds.w; ++x, ++it) {
@@ -107,8 +93,7 @@ TYPED_TEST(ImageAllTypes, PutGetAndIterators)
     // Write iterator (whole image)
     {
       LockImageBits<ImageTraits> bits(image.get(), Image::WriteLock);
-      typename LockImageBits<ImageTraits>::iterator begin = bits.begin(), it = begin,
-                                                    end = bits.end();
+      auto begin = bits.begin(), it = begin, end = bits.end();
 
       for (int i = 0; it != end; ++it, ++i) {
         *it = 1;
@@ -150,28 +135,18 @@ TEST(Image, DiffRgbImages)
 
 TYPED_TEST(ImageAllTypes, DrawHLine)
 {
-  typedef TypeParam ImageTraits;
+  using ImageTraits = TypeParam;
 
-  std::vector<int> lengths;
-  lengths.push_back(7);
-  lengths.push_back(8);
-  lengths.push_back(9);
-  lengths.push_back(15);
-  lengths.push_back(16);
-  lengths.push_back(17);
-  lengths.push_back(31);
-  lengths.push_back(32);
-  lengths.push_back(33);
-
-  std::vector<gfx::Size> sizes;
+  std::vector<int> lengths = { 7, 8, 9, 15, 16, 17, 31, 32, 33 };
+  std::vector<gfx::Size> sizes(lengths.size() * lengths.size());
+  std::size_t k = 0;
   for (std::size_t i = 0; i < lengths.size(); ++i)
     for (std::size_t j = 0; j < lengths.size(); ++j)
-      sizes.push_back(gfx::Size(lengths[j], lengths[i]));
+      sizes[k++] = gfx::Size(lengths[j], lengths[i]);
 
-  for (std::vector<gfx::Size>::iterator sizes_it = sizes.begin(); sizes_it != sizes.end();
-       ++sizes_it) {
-    int w = sizes_it->w;
-    int h = sizes_it->h;
+  for (const auto& size : sizes) {
+    const int w = size.w;
+    const int h = size.h;
     std::unique_ptr<Image> image(Image::create(ImageTraits::pixel_format, w, h));
     image->clear(0);
 
@@ -186,22 +161,22 @@ TYPED_TEST(ImageAllTypes, DrawHLine)
 
 TYPED_TEST(ImageAllTypes, FillRect)
 {
-  typedef TypeParam ImageTraits;
+  using ImageTraits = TypeParam;
 
-  for (int i = 0; i < 100; ++i) {
-    int w = 1 + i;
-    int h = 1 + i;
+  for (int i = 0; i <= 110; i += 11) {
+    const int w = 1 + i;
+    const int h = 1 + i;
 
     std::unique_ptr<Image> image(Image::create(ImageTraits::pixel_format, w, h));
     color_t color = (rand() % ImageTraits::max_value);
     if (!color)
       color = 1;
 
-    for (int j = 0; j < 1000; ++j) {
-      int x1 = rand() % w;
-      int y1 = rand() % h;
-      int x2 = x1 + (rand() % (w - x1));
-      int y2 = y1 + (rand() % (h - y1));
+    for (int j = 0; j <= 1100; j += 11) {
+      const int x1 = rand() % w;
+      const int y1 = rand() % h;
+      const int x2 = x1 + (rand() % (w - x1));
+      const int y2 = y1 + (rand() % (h - y1));
 
       image->clear(0);
       fill_rect(image.get(), x1, y1, x2, y2, color);
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index 5b0aca8c2..b7f77ea6c 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (C) 2019-2021  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -597,4 +597,22 @@ void LayerGroup::displaceFrames(frame_t fromThis, frame_t delta)
     layer->displaceFrames(fromThis, delta);
 }
 
+layer_t LayerGroup::getLayerIndex(const Layer* layer, layer_t& index) const
+{
+  for (Layer* child : this->layers()) {
+    if ((child->isGroup() && static_cast<LayerGroup*>(child)->getLayerIndex(layer, index) != -1) ||
+        (child == layer)) {
+      return index;
+    }
+    index++;
+  }
+  return -1;
+}
+
+layer_t LayerGroup::getLayerIndex(const Layer* layer) const
+{
+  layer_t index = 0;
+  return this->getLayerIndex(layer, index);
+}
+
 } // namespace doc
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 33111f7b7..0ede0371d 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -9,6 +9,8 @@
 #define DOC_LAYER_H_INCLUDED
 #pragma once
 
+#include "base/debug.h"
+#include "base/uuid.h"
 #include "doc/blend_mode.h"
 #include "doc/cel_list.h"
 #include "doc/frame.h"
@@ -128,16 +130,29 @@ public:
   int opacity() const { return m_opacity; }
   void setOpacity(int opacity) { m_opacity = opacity; }
 
+  const base::Uuid& uuid() const
+  {
+    if (m_uuid == base::Uuid())
+      m_uuid = base::Uuid::Generate();
+    return m_uuid;
+  }
+  void setUuid(const base::Uuid& uuid)
+  {
+    ASSERT(m_uuid == base::Uuid());
+    m_uuid = uuid;
+  }
+
   virtual Grid grid() const;
   virtual Cel* cel(frame_t frame) const;
   virtual void getCels(CelList& cels) const = 0;
   virtual void displaceFrames(frame_t fromThis, frame_t delta) = 0;
 
 private:
-  std::string m_name;   // layer name
-  Sprite* m_sprite;     // owner of the layer
-  LayerGroup* m_parent; // parent layer
-  LayerFlags m_flags;   // stack order cannot be changed
+  std::string m_name;        // layer name
+  Sprite* m_sprite;          // owner of the layer
+  LayerGroup* m_parent;      // parent layer
+  LayerFlags m_flags;        // stack order cannot be changed
+  mutable base::Uuid m_uuid; // lazily generated layer's UUID
 
   BlendMode m_blendmode;
   int m_opacity;
@@ -221,9 +236,13 @@ public:
 
   bool isBrowsable() const override { return isGroup() && isExpanded() && !m_layers.empty(); }
 
+  layer_t getLayerIndex(const Layer* layer) const;
+
 private:
   void destroyAllLayers();
 
+  layer_t getLayerIndex(const Layer* layer, layer_t& index) const;
+
   LayerList m_layers;
 };
 
diff --git a/src/doc/layer_io.cpp b/src/doc/layer_io.cpp
index d417f81bb..17f57540a 100644
--- a/src/doc/layer_io.cpp
+++ b/src/doc/layer_io.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2019 Igara Studio S.A.
+// Copyright (c) 2019-2025 Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -24,6 +24,7 @@
 #include "doc/string_io.h"
 #include "doc/subobjects_io.h"
 #include "doc/user_data_io.h"
+#include "doc/uuid_io.h"
 
 #include <iostream>
 #include <memory>
@@ -40,7 +41,6 @@ void write_layer(std::ostream& os, const Layer* layer)
 {
   write32(os, layer->id());
   write_string(os, layer->name());
-
   write32(os, static_cast<int>(layer->flags())); // Flags
   write16(os, static_cast<int>(layer->type()));  // Type
 
@@ -106,6 +106,7 @@ void write_layer(std::ostream& os, const Layer* layer)
   }
 
   write_user_data(os, layer->userData());
+  write_uuid(os, layer->uuid());
 }
 
 Layer* read_layer(std::istream& is, SubObjectsFromSprite* subObjects, const SerialFormat serial)
@@ -187,12 +188,19 @@ Layer* read_layer(std::istream& is, SubObjectsFromSprite* subObjects, const Seri
 
   const UserData userData = read_user_data(is, serial);
 
-  if (layer) {
-    layer->setName(name);
-    layer->setFlags(static_cast<LayerFlags>(flags));
-    layer->setId(id);
-    layer->setUserData(userData);
-  }
+  base::Uuid uuid;
+  if (serial >= SerialFormat::Ver3)
+    uuid = read_uuid(is);
+
+  if (!layer)
+    return nullptr;
+
+  layer->setName(name);
+  layer->setFlags(static_cast<LayerFlags>(flags));
+  layer->setId(id);
+  layer->setUserData(userData);
+  if (serial >= SerialFormat::Ver3)
+    layer->setUuid(uuid);
 
   return layer.release();
 }
diff --git a/src/doc/mask_boundaries.cpp b/src/doc/mask_boundaries.cpp
index 24286a8d5..916d7a82c 100644
--- a/src/doc/mask_boundaries.cpp
+++ b/src/doc/mask_boundaries.cpp
@@ -1,4 +1,5 @@
 // Aseprite Document Library
+// Copyright (c) 2025 Igara Studio S.A.
 // Copyright (c) 2001-2015 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -11,6 +12,7 @@
 #include "doc/mask_boundaries.h"
 
 #include "doc/image.h"
+#include "doc/mask.h"
 
 namespace doc {
 
@@ -21,6 +23,18 @@ void MaskBoundaries::reset()
     m_path.rewind();
 }
 
+void MaskBoundaries::regen(const Mask* mask)
+{
+  reset();
+
+  ASSERT(mask);
+  if (!mask || mask->isEmpty())
+    return;
+
+  regen(mask->bitmap());
+  offset(mask->bounds().x, mask->bounds().y);
+}
+
 void MaskBoundaries::regen(const Image* bitmap)
 {
   reset();
diff --git a/src/doc/mask_boundaries.h b/src/doc/mask_boundaries.h
index 90a89e514..177ac6bed 100644
--- a/src/doc/mask_boundaries.h
+++ b/src/doc/mask_boundaries.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2020 Igara Studio S.A.
+// Copyright (c) 2020-2025 Igara Studio S.A.
 // Copyright (c) 2001-2015 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -16,6 +16,7 @@
 
 namespace doc {
 class Image;
+class Mask;
 
 class MaskBoundaries {
 public:
@@ -44,6 +45,7 @@ public:
 
   bool isEmpty() const { return m_segs.empty(); }
   void reset();
+  void regen(const Mask* mask);
   void regen(const Image* bitmap);
 
   const_iterator begin() const { return m_segs.begin(); }
diff --git a/src/doc/primitives_tests.cpp b/src/doc/primitives_tests.cpp
index c539595ce..6f4148178 100644
--- a/src/doc/primitives_tests.cpp
+++ b/src/doc/primitives_tests.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2023  Igara Studio S.A.
+// Copyright (c) 2023-2025  Igara Studio S.A.
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -43,13 +43,13 @@ TYPED_TEST(Primitives, IsSameImage)
   std::uniform_int_distribution<int> dist(0, 256);
 
 #if FULL_TEST
+  for (int h = 2; h < 207; h += 5) {
+    for (int w = 2; w < 207; w += 5) {
+#else
   int w = 200;
   int h = 200;
   {
     {
-#else
-  for (int h = 2; h < 207; h += 5) {
-    for (int w = 2; w < 207; w += 5) {
 #endif
       ImageRef a(Image::create(ImageTraits::pixel_format, w, h));
       doc::algorithm::random_image(a.get());
diff --git a/src/doc/serial_format.h b/src/doc/serial_format.h
index 4f40e7df4..3bf2fc7b0 100644
--- a/src/doc/serial_format.h
+++ b/src/doc/serial_format.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2020-2024  Igara Studio S.A.
+// Copyright (c) 2020-2025  Igara Studio S.A.
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -19,7 +19,8 @@ enum class SerialFormat : uint16_t {
   Ver0 = 0, // Old version
   Ver1 = 1, // New version with tilesets
   Ver2 = 2, // Version 2 adds custom properties to user data
-  LastVer = Ver2
+  Ver3 = 3, // Version 3 adds UUIDs to layers
+  LastVer = Ver3
 };
 
 } // namespace doc
diff --git a/src/doc/sort_palette.cpp b/src/doc/sort_palette.cpp
index 7ecc6a552..6891ec82e 100644
--- a/src/doc/sort_palette.cpp
+++ b/src/doc/sort_palette.cpp
@@ -4,6 +4,12 @@
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
 
+#if defined(__GNUC__) || defined(__clang__)
+  // To avoid deprecated warning on gcc/clang using
+  // std::get_temporary_buffer() from std::stable_sort()
+  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #ifdef HAVE_CONFIG_H
   #include "config.h"
 #endif
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index 665a03e10..d8a6d10e3 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -250,6 +250,9 @@ public:
 
   void setTileManagementPlugin(const std::string& plugin) { m_tileManagementPlugin = plugin; }
 
+  void useLayerUuids(bool value) { m_useLayerUuids = value; }
+  bool useLayerUuids() const { return m_useLayerUuids; }
+
 private:
   Document* m_document;
   ImageSpec m_spec;
@@ -279,6 +282,9 @@ private:
   // giving the possibility to handle tiles exclusively to a plugin.
   std::string m_tileManagementPlugin;
 
+  // This setting indicates if the layers of this sprite are using UUIDs.
+  bool m_useLayerUuids = false;
+
   // Disable default constructor and copying
   Sprite();
   DISABLE_COPYING(Sprite);
diff --git a/src/doc/tileset.cpp b/src/doc/tileset.cpp
index 6448b22cc..77fd4550b 100644
--- a/src/doc/tileset.cpp
+++ b/src/doc/tileset.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2019-2023  Igara Studio S.A.
+// Copyright (c) 2019-2025  Igara Studio S.A.
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -65,7 +65,13 @@ Tileset::Tileset(Sprite* sprite, const Tileset* other)
 // static
 Tileset* Tileset::MakeCopyWithoutImages(const Tileset* tileset)
 {
-  std::unique_ptr<Tileset> copy(new Tileset(tileset->sprite(), tileset->grid(), tileset->size()));
+  return MakeCopyWithoutImagesForSprite(tileset, tileset->sprite());
+}
+
+// static
+Tileset* Tileset::MakeCopyWithoutImagesForSprite(const Tileset* tileset, Sprite* sprite)
+{
+  std::unique_ptr<Tileset> copy(new Tileset(sprite, tileset->grid(), tileset->size()));
   copy->setName(tileset->name());
   copy->setUserData(tileset->userData());
   return copy.release();
@@ -87,7 +93,13 @@ Tileset* Tileset::MakeCopyWithSameImages(const Tileset* tileset)
 // static
 Tileset* Tileset::MakeCopyCopyingImages(const Tileset* tileset)
 {
-  std::unique_ptr<Tileset> copy(MakeCopyWithoutImages(tileset));
+  return MakeCopyCopyingImagesForSprite(tileset, tileset->sprite());
+}
+
+// static
+Tileset* Tileset::MakeCopyCopyingImagesForSprite(const Tileset* tileset, Sprite* sprite)
+{
+  std::unique_ptr<Tileset> copy(MakeCopyWithoutImagesForSprite(tileset, sprite));
   for (tile_index ti = 0; ti < copy->size(); ++ti) {
     ImageRef image = tileset->get(ti);
     ASSERT(image);
diff --git a/src/doc/tileset.h b/src/doc/tileset.h
index ed34c6646..0ba642221 100644
--- a/src/doc/tileset.h
+++ b/src/doc/tileset.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2019-2023  Igara Studio S.A.
+// Copyright (c) 2019-2025  Igara Studio S.A.
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -47,8 +47,10 @@ public:
   Tileset(Sprite* sprite, const Tileset* other);
 
   static Tileset* MakeCopyWithoutImages(const Tileset* tileset);
+  static Tileset* MakeCopyWithoutImagesForSprite(const Tileset* tileset, Sprite* sprite);
   static Tileset* MakeCopyWithSameImages(const Tileset* tileset);
   static Tileset* MakeCopyCopyingImages(const Tileset* tileset);
+  static Tileset* MakeCopyCopyingImagesForSprite(const Tileset* tileset, Sprite* sprite);
 
   Sprite* sprite() const { return m_sprite; }
   const Grid& grid() const { return m_grid; }
diff --git a/src/doc/user_data_io.cpp b/src/doc/user_data_io.cpp
index fa37f80be..57aefaf84 100644
--- a/src/doc/user_data_io.cpp
+++ b/src/doc/user_data_io.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2023 Igara Studio S.A.
+// Copyright (c) 2023-2025 Igara Studio S.A.
 // Copyright (c) 2001-2015 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -14,6 +14,7 @@
 #include "base/serialization.h"
 #include "doc/string_io.h"
 #include "doc/user_data.h"
+#include "doc/uuid_io.h"
 
 #include <iostream>
 
@@ -86,9 +87,7 @@ static void write_property_value(std::ostream& os, const UserData::Variant& vari
     }
     case USER_DATA_PROPERTY_TYPE_UUID: {
       auto uuid = get_value<base::Uuid>(variant);
-      for (int i = 0; i < 16; ++i) {
-        write8(os, uuid[i]);
-      }
+      write_uuid(os, uuid);
       break;
     }
   }
@@ -207,12 +206,7 @@ static UserData::Variant read_property_value(std::istream& is, uint16_t type)
       return value;
     }
     case USER_DATA_PROPERTY_TYPE_UUID: {
-      base::Uuid value;
-      uint8_t* bytes = value.bytes();
-      for (int i = 0; i < 16; ++i) {
-        bytes[i] = read8(is);
-      }
-      return value;
+      return read_uuid(is);
     }
   }
 
diff --git a/src/doc/uuid_io.cpp b/src/doc/uuid_io.cpp
new file mode 100644
index 000000000..1c3603aad
--- /dev/null
+++ b/src/doc/uuid_io.cpp
@@ -0,0 +1,33 @@
+// Aseprite Document Library
+// Copyright (c) 2025 Igara Studio S.A.
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#include "doc/uuid_io.h"
+
+#include "base/serialization.h"
+#include "base/uuid.h"
+
+namespace doc {
+
+using namespace base::serialization;
+
+base::Uuid read_uuid(std::istream& is)
+{
+  base::Uuid value;
+  uint8_t* bytes = value.bytes();
+  for (int i = 0; i < 16; ++i) {
+    bytes[i] = read8(is);
+  }
+  return value;
+}
+
+void write_uuid(std::ostream& os, const base::Uuid& uuid)
+{
+  for (int i = 0; i < 16; ++i) {
+    write8(os, uuid[i]);
+  }
+}
+
+} // namespace doc
diff --git a/src/doc/uuid_io.h b/src/doc/uuid_io.h
new file mode 100644
index 000000000..c5b0a4900
--- /dev/null
+++ b/src/doc/uuid_io.h
@@ -0,0 +1,23 @@
+// Aseprite Document Library
+// Copyright (c) 2025 Igara Studio S.A.
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef DOC_UUID_IO_H_INCLUDED
+#define DOC_UUID_IO_H_INCLUDED
+#pragma once
+
+#include "base/uuid.h"
+
+#include <iosfwd>
+
+namespace doc {
+
+base::Uuid read_uuid(std::istream& is);
+
+void write_uuid(std::ostream& os, const base::Uuid& uuid);
+
+} // namespace doc
+
+#endif
diff --git a/src/flic b/src/flic
index 876ef60df..a37fe2d46 160000
--- a/src/flic
+++ b/src/flic
@@ -1 +1 @@
-Subproject commit 876ef60df5fec606f8eb0638ee893e4967db4673
+Subproject commit a37fe2d46e5ae7dd68b6048be7765c0bb436efa0
diff --git a/src/main/osx/Entitlements.plist b/src/main/osx/Entitlements.plist
new file mode 100644
index 000000000..cefa2bf93
--- /dev/null
+++ b/src/main/osx/Entitlements.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+</dict>
+</plist>
diff --git a/src/main/osx/Info.plist b/src/main/osx/Info.plist
new file mode 100644
index 000000000..4b0c949d0
--- /dev/null
+++ b/src/main/osx/Info.plist
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>aseprite</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>Document.icns</string>
+            <key>CFBundleTypeName</key>
+            <string>Aseprite Sprite</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>LSHandlerRank</key>
+            <string>Owner</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>ase</string>
+                <string>bmp</string>
+                <string>flc</string>
+                <string>fli</string>
+                <string>gif</string>
+                <string>ico</string>
+                <string>jpeg</string>
+                <string>jpg</string>
+                <string>pcx</string>
+                <string>png</string>
+                <string>tga</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>Document.icns</string>
+            <key>CFBundleTypeName</key>
+            <string>Aseprite Sprite</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>aseprite-extension</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>Extension.icns</string>
+            <key>CFBundleTypeName</key>
+            <string>Aseprite Extension</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>LSHandlerRank</key>
+            <string>Owner</string>
+        </dict>
+    </array>
+    <key>CFBundleDisplayName</key>
+    <string>Aseprite</string>
+    <key>CFBundleExecutable</key>
+    <string>aseprite</string>
+    <key>CFBundleIdentifier</key>
+    <string>org.aseprite.Aseprite</string>
+    <key>CFBundleName</key>
+    <string>Aseprite</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.3</string>
+    <key>CFBundleVersion</key>
+    <string>1.3</string>
+    <key>CFBundleIconFile</key>
+    <string>Aseprite.icns</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.graphics-design</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright © 2001-2025, Igara Studio S.A.
+All rights reserved.</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>NSRequiresAquaSystemAppearance</key>
+    <false/>
+</dict>
+</plist>
diff --git a/src/main/resources_win32.rc b/src/main/win/resources_win32.rc
similarity index 100%
rename from src/main/resources_win32.rc
rename to src/main/win/resources_win32.rc
diff --git a/src/main/settings.manifest b/src/main/win/settings.manifest
similarity index 100%
rename from src/main/settings.manifest
rename to src/main/win/settings.manifest
diff --git a/src/observable b/src/observable
index 09cb138a1..addca27fb 160000
--- a/src/observable
+++ b/src/observable
@@ -1 +1 @@
-Subproject commit 09cb138a1f4d7e8c610c199694cb7c6d61cf6c88
+Subproject commit addca27fbeb2958044da8d70a92ba3a302d43360
diff --git a/src/psd b/src/psd
index 5a357fb96..87af728fe 160000
--- a/src/psd
+++ b/src/psd
@@ -1 +1 @@
-Subproject commit 5a357fb964ef158bce4b1774157dc16a8bcd1f8d
+Subproject commit 87af728fe4b35ed79d94de0932017dcf50737ae7
diff --git a/src/render/projection.h b/src/render/projection.h
index 1597ecac0..bb95c2449 100644
--- a/src/render/projection.h
+++ b/src/render/projection.h
@@ -1,5 +1,5 @@
 // Aseprite Render Library
-// Copyright (c) 2020 Igara Studio S.A.
+// Copyright (c) 2020-2025 Igara Studio S.A.
 // Copyright (c) 2016 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -31,6 +31,20 @@ public:
   void setPixelRatio(const doc::PixelRatio& pixelRatio) { m_pixelRatio = pixelRatio; }
   void setZoom(const Zoom& zoom) { m_zoom = zoom; }
 
+  // To identify simplest composite scale up cases'
+  bool isSimpleScaleUpCase() const
+  {
+    return scaleX() >= 1.0 && scaleY() >= 1.0 && (m_pixelRatio.w == 1 || m_pixelRatio.w % 2 == 0) &&
+           (m_pixelRatio.h == 1 || m_pixelRatio.h % 2 == 0);
+  }
+
+  // To identify simplest composite scale down cases
+  bool isSimpleScaleDownCase() const
+  {
+    return scaleX() <= 1.0 && scaleY() <= 1.0 && std::fmod(1.0 / scaleX(), 1.0) == 0.0 &&
+           std::fmod(1.0 / scaleY(), 1.0) == 0.0;
+  }
+
   double scaleX() const { return m_zoom.scale() * m_pixelRatio.w; }
   double scaleY() const { return m_zoom.scale() * m_pixelRatio.h; }
 
@@ -70,6 +84,20 @@ public:
     return T(m_zoom.removeCeiling(y)) / T(m_pixelRatio.h);
   }
 
+  // Used in 'editor.cpp' to do some math between x,y values.
+  // Useful for calculating diagonal symmetry axis positions when pixel ratio is other than 1:1
+  template<typename T>
+  T turnXinTermsOfY(T x) const
+  {
+    return x * T(m_pixelRatio.h) / T(m_pixelRatio.w);
+  }
+
+  template<typename T>
+  T turnYinTermsOfX(T y) const
+  {
+    return y * T(m_pixelRatio.w) / T(m_pixelRatio.h);
+  }
+
   gfx::Rect apply(const gfx::Rect& r) const
   {
     int u = applyX(r.x);
diff --git a/src/render/render.cpp b/src/render/render.cpp
index b19fea603..21e81d57b 100644
--- a/src/render/render.cpp
+++ b/src/render/render.cpp
@@ -1,5 +1,5 @@
 // Aseprite Render Library
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -11,6 +11,7 @@
 
 #include "render/render.h"
 
+#include "base/gcd.h"
 #include "doc/blend_internals.h"
 #include "doc/blend_mode.h"
 #include "doc/doc.h"
@@ -497,19 +498,18 @@ CompositeImageFunc get_fastest_composition_path(const Projection& proj,
   else if (finegrain || !proj.zoom().isSimpleZoomLevel()) {
     return composite_image_general<DstTraits, SrcTraits>;
   }
-  else if (proj.applyX(1) == 1 && proj.applyY(1) == 1) {
+  else if (proj.scaleX() == 1.0 && proj.scaleY() == 1.0) {
     return composite_image_without_scale<DstTraits, SrcTraits>;
   }
-  else if (proj.scaleX() >= 1.0 && proj.scaleY() >= 1.0) {
+  else if (proj.isSimpleScaleUpCase()) {
     return composite_image_scale_up<DstTraits, SrcTraits>;
   }
-  // Slower composite function for special cases with odd zoom and non-square pixel ratio
-  else if (((proj.removeX(1) > 1) && (proj.removeX(1) & 1)) ||
-           ((proj.removeY(1) > 1) && (proj.removeY(1) & 1))) {
-    return composite_image_general<DstTraits, SrcTraits>;
+  else if (proj.isSimpleScaleDownCase()) {
+    return composite_image_scale_down<DstTraits, SrcTraits>;
   }
   else {
-    return composite_image_scale_down<DstTraits, SrcTraits>;
+    // Slower composite function for remaining cases not considered
+    return composite_image_general<DstTraits, SrcTraits>;
   }
 }
 
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 6322e3547..479b531f1 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Aseprite UI Library
-# Copyright (C) 2019-2024  Igara Studio S.A.
+# Copyright (C) 2019-2025  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 if(WIN32)
@@ -7,7 +7,6 @@ if(WIN32)
 endif()
 
 add_library(ui-lib
-  accelerator.cpp
   alert.cpp
   app_state.cpp
   box.cpp
@@ -44,6 +43,7 @@ add_library(ui-lib
   scroll_bar.cpp
   scroll_helper.cpp
   separator.cpp
+  shortcut.cpp
   size_hint_event.cpp
   slider.cpp
   splitter.cpp
diff --git a/src/ui/accelerator_ui_tests.cpp b/src/ui/accelerator_ui_tests.cpp
deleted file mode 100644
index 8a37cd2aa..000000000
--- a/src/ui/accelerator_ui_tests.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#define TEST_GUI
-#include "tests/app_test.h"
-
-using namespace ui;
-
-TEST(Accelerator, Parser)
-{
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyF1, '\0'), Accelerator("F1"));
-  EXPECT_EQ(Accelerator(kKeyAltModifier, kKeyQ, 'q'), Accelerator("Alt+Q"));
-  EXPECT_EQ(Accelerator(kKeyCtrlModifier, kKeyQ, 'q'), Accelerator("Ctrl+Q"));
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyMinus, '-'), Accelerator("-"));
-  EXPECT_EQ(Accelerator(kKeyShiftModifier, kKeyMinus, '-'), Accelerator("Shift+-"));
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyEquals, '='), Accelerator("="));
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyNil, '+'), Accelerator("+"));
-  EXPECT_EQ(Accelerator(kKeyShiftModifier, kKeyNil, '+'), Accelerator("Shift++"));
-  EXPECT_EQ(Accelerator(kKeyCtrlModifier, kKeyNil, '+'), Accelerator("Ctrl++"));
-
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyMinusPad, 0), Accelerator("Minus Pad"));
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyMinusPad, 0), Accelerator("- Pad"));
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyPlusPad, 0), Accelerator("Plus Pad"));
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyPlusPad, 0), Accelerator("+ Pad"));
-  EXPECT_EQ(Accelerator(kKeyCtrlModifier, kKeyPlusPad, 0), Accelerator("Ctrl++ Pad"));
-}
-
-TEST(Accelerator, ToString)
-{
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyF1, '\0').toString(), Accelerator("F1").toString());
-  EXPECT_EQ(Accelerator(kKeyAltModifier, kKeyQ, 'q').toString(), Accelerator("Alt+Q").toString());
-  EXPECT_EQ(Accelerator(kKeyCtrlModifier, kKeyQ, 'q').toString(), Accelerator("Ctrl+Q").toString());
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyMinus, '-').toString(), Accelerator("-").toString());
-  EXPECT_EQ(Accelerator(kKeyShiftModifier, kKeyMinus, '-').toString(),
-            Accelerator("Shift+-").toString());
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyEquals, '=').toString(), Accelerator("=").toString());
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyNil, '+').toString(), Accelerator("+").toString());
-  EXPECT_EQ(Accelerator(kKeyShiftModifier, kKeyNil, '+').toString(),
-            Accelerator("Shift++").toString());
-  EXPECT_EQ(Accelerator(kKeyCtrlModifier, kKeyNil, '+').toString(),
-            Accelerator("Ctrl++").toString());
-
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyMinusPad, 0).toString(),
-            Accelerator("Minus Pad").toString());
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyMinusPad, 0).toString(),
-            Accelerator("- Pad").toString());
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyPlusPad, 0).toString(),
-            Accelerator("Plus Pad").toString());
-  EXPECT_EQ(Accelerator(kKeyNoneModifier, kKeyPlusPad, 0).toString(),
-            Accelerator("+ Pad").toString());
-  EXPECT_EQ(Accelerator(kKeyCtrlModifier, kKeyPlusPad, 0).toString(),
-            Accelerator("Ctrl++ Pad").toString());
-
-  EXPECT_EQ("- Pad", Accelerator(kKeyNoneModifier, kKeyMinusPad, 0).toString());
-  EXPECT_EQ("- Pad", Accelerator("Minus Pad").toString());
-  EXPECT_EQ("- Pad", Accelerator("- Pad").toString());
-
-  EXPECT_EQ("+ Pad", Accelerator(kKeyNoneModifier, kKeyPlusPad, 0).toString());
-  EXPECT_EQ("+ Pad", Accelerator("Plus Pad").toString());
-  EXPECT_EQ("+ Pad", Accelerator("+ Pad").toString());
-}
diff --git a/src/ui/box.cpp b/src/ui/box.cpp
index 77169f93c..0f778f38b 100644
--- a/src/ui/box.cpp
+++ b/src/ui/box.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2022  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -13,6 +13,7 @@
 #include "ui/box.h"
 #include "ui/message.h"
 #include "ui/resize_event.h"
+#include "ui/scale.h"
 #include "ui/size_hint_event.h"
 #include "ui/theme.h"
 
@@ -38,6 +39,7 @@ void Box::onSizeHint(SizeHintEvent& ev)
     else                                                                                           \
       prefSize.w += childSize.w;                                                                   \
     prefSize.h = std::max(prefSize.h, childSize.h);                                                \
+    fitIn.w = std::max(0, fitIn.w - prefSize.w);                                                   \
   }
 
 #define FINAL_ADJUSTMENT(w)                                                                        \
@@ -48,17 +50,23 @@ void Box::onSizeHint(SizeHintEvent& ev)
   }
 
   int visibleChildren = 0;
-  for (auto child : children()) {
+  for (auto* child : children()) {
     if (!child->hasFlags(HIDDEN))
       ++visibleChildren;
   }
 
   Size prefSize(0, 0);
+  Size fitIn(0, 0);
+  if (align() & HORIZONTAL)
+    fitIn.w = ev.fitInWidth();
+  else
+    fitIn.h = ev.fitInHeight();
+
   for (auto child : children()) {
     if (child->hasFlags(HIDDEN))
       continue;
 
-    Size childSize = child->sizeHint();
+    Size childSize = child->sizeHint(fitIn);
     if (align() & HORIZONTAL) {
       ADD_CHILD_SIZE(w, h);
     }
@@ -106,15 +114,18 @@ void Box::onResize(ResizeEvent& ev)
           size = availSize.w;                                                                      \
       }                                                                                            \
       else {                                                                                       \
-        size = child->sizeHint().w;                                                                \
+        size = child->sizeHint(availSize).w;                                                       \
                                                                                                    \
         if (child->isExpansive()) {                                                                \
-          int extraSize = (availExtraSize / (expansiveChildren - j));                              \
+          const int extraSize = guiscaled_div(availExtraSize, (expansiveChildren - j));            \
           size += extraSize;                                                                       \
           availExtraSize -= extraSize;                                                             \
           if (++j == expansiveChildren)                                                            \
             size += availExtraSize;                                                                \
         }                                                                                          \
+        else {                                                                                     \
+          availExtraSize -= (size - child->sizeHint().w);                                          \
+        }                                                                                          \
       }                                                                                            \
                                                                                                    \
       Rect childPos = defChildPos;                                                                 \
@@ -141,8 +152,8 @@ void Box::onResize(ResizeEvent& ev)
   }
 
   if (visibleChildren > 0) {
-    Size prefSize(sizeHint());
-    Size availSize(childrenBounds().size());
+    Size availSize = childrenBounds().size();
+    Size prefSize = sizeHint(availSize);
     int homogeneousSize = 0;
     int availExtraSize = 0;
 
diff --git a/src/ui/clipboard_delegate.h b/src/ui/clipboard_delegate.h
index 02b06545e..c769bcb6f 100644
--- a/src/ui/clipboard_delegate.h
+++ b/src/ui/clipboard_delegate.h
@@ -1,4 +1,5 @@
 // Aseprite UI Library
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -17,6 +18,7 @@ public:
   virtual ~ClipboardDelegate() {}
   virtual void setClipboardText(const std::string& text) = 0;
   virtual bool getClipboardText(std::string& text) = 0;
+  virtual bool hasClipboardText() = 0;
 };
 
 } // namespace ui
diff --git a/src/ui/combobox.cpp b/src/ui/combobox.cpp
index 44d5266a9..e83fc40a2 100644
--- a/src/ui/combobox.cpp
+++ b/src/ui/combobox.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -503,18 +503,17 @@ bool ComboBoxEntry::onProcessMessage(Message* msg)
         MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
         gfx::Point screenPos = mouseMsg->display()->nativeWindow()->pointToScreen(
           mouseMsg->position());
-        Widget* pick = manager()->pickFromScreenPos(screenPos);
+        Manager* mgr = manager();
+        Widget* pick = mgr->pickFromScreenPos(screenPos);
         Widget* listbox = m_comboBox->m_listbox;
 
         if (pick != nullptr && (pick == listbox || pick->hasAncestor(listbox))) {
-          releaseMouse();
-
-          MouseMessage mouseMsg2(kMouseDownMessage,
-                                 *mouseMsg,
-                                 mouseMsg->positionForDisplay(pick->display()));
-          mouseMsg2.setRecipient(pick);
-          mouseMsg2.setDisplay(pick->display());
-          pick->sendMessage(&mouseMsg2);
+          mgr->transferAsMouseDownMessage(this,
+                                          pick,
+                                          mouseMsg,
+                                          // Send the message right now, if we enqueue
+                                          // the message the popup window is closed.
+                                          true);
           return true;
         }
       }
diff --git a/src/ui/combobox.h b/src/ui/combobox.h
index 26b7f4ac4..22467cf68 100644
--- a/src/ui/combobox.h
+++ b/src/ui/combobox.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2023  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -38,6 +38,8 @@ public:
 
   Items::iterator begin() { return m_items.begin(); }
   Items::iterator end() { return m_items.end(); }
+  bool empty() const { return m_items.empty(); }
+  const Items& items() { return m_items; }
 
   void setEditable(bool state);
   void setClickOpen(bool state);
diff --git a/src/ui/entry.cpp b/src/ui/entry.cpp
index c8fd920e1..5b22dcdd4 100644
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -15,6 +15,8 @@
 #include "os/system.h"
 #include "text/draw_text.h"
 #include "text/font.h"
+#include "text/font_metrics.h"
+#include "ui/clipboard_delegate.h"
 #include "ui/display.h"
 #include "ui/menu.h"
 #include "ui/message.h"
@@ -23,6 +25,7 @@
 #include "ui/system.h"
 #include "ui/theme.h"
 #include "ui/timer.h"
+#include "ui/translation_delegate.h"
 #include "ui/widget.h"
 
 #include <algorithm>
@@ -33,6 +36,12 @@
 
 namespace ui {
 
+// Maximum width for Entry fields as size hint (like half the screen /
+// a screen of 800x600).  We were using Display::workareaSizeUIScale()
+// but that might be slow on Linux/X11 for each mouse motion/window
+// resize event to ask.
+static int kMaxWidthHintForEntry = 400;
+
 // Shared timer between all entries.
 static std::unique_ptr<Timer> s_timer;
 
@@ -119,6 +128,15 @@ int Entry::lastCaretPos() const
   return int(m_boxes.size() - 1);
 }
 
+gfx::Point Entry::caretPosOnScreen() const
+{
+  const gfx::Point caretPos = getCharBoxBounds(m_caret).point2();
+  const os::Window* nativeWindow = display()->nativeWindow();
+  const gfx::Point pos = nativeWindow->pointToScreen(caretPos + bounds().origin());
+
+  return pos;
+}
+
 void Entry::setCaretPos(const int pos)
 {
   gfx::Size caretSize = theme()->getEntryCaretSize(this);
@@ -151,6 +169,8 @@ void Entry::setCaretPos(const int pos)
     startTimer();
   m_state = true;
 
+  os::System::instance()->setTextInput(true, caretPosOnScreen());
+
   invalidate();
 }
 
@@ -242,7 +262,7 @@ gfx::Rect Entry::getEntryTextBounds() const
   return onGetEntryTextBounds();
 }
 
-gfx::Rect Entry::getCharBoxBounds(const int i)
+gfx::Rect Entry::getCharBoxBounds(const int i) const
 {
   ASSERT(i >= 0 && i < int(m_boxes.size()));
   if (i >= 0 && i < int(m_boxes.size()))
@@ -279,8 +299,9 @@ bool Entry::onProcessMessage(Message* msg)
       }
 
       // Start processing dead keys
-      if (m_translate_dead_keys)
-        os::System::instance()->setTranslateDeadKeys(true);
+      if (m_translate_dead_keys) {
+        os::System::instance()->setTextInput(true, caretPosOnScreen());
+      }
       break;
 
     case kFocusLeaveMessage:
@@ -295,7 +316,7 @@ bool Entry::onProcessMessage(Message* msg)
 
       // Stop processing dead keys
       if (m_translate_dead_keys)
-        os::System::instance()->setTranslateDeadKeys(false);
+        os::System::instance()->setTextInput(false);
       break;
 
     case kKeyDownMessage:
@@ -503,9 +524,9 @@ gfx::Size Entry::sizeHintWithText(Entry* entry, const std::string& text)
   int w = font->textLength(text) + +2 * entry->theme()->getEntryCaretSize(entry).w +
           entry->border().width();
 
-  w = std::min(w, entry->display()->workareaSizeUIScale().w / 2);
+  w = std::min(w, guiscale() * kMaxWidthHintForEntry);
 
-  const int h = +font->height() + entry->border().height();
+  const int h = font->lineHeight() + entry->border().height();
 
   return gfx::Size(w, h);
 }
@@ -519,9 +540,9 @@ void Entry::onSizeHint(SizeHintEvent& ev)
 
   int w = font->textLength("w") * std::min(m_maxsize, 6) + +trailing + border().width();
 
-  w = std::min(w, display()->workareaSizeUIScale().w / 2);
+  w = std::min(w, guiscale() * kMaxWidthHintForEntry);
 
-  int h = +font->height() + border().height();
+  int h = font->lineHeight() + border().height();
 
   ev.setSizeHint(w, h);
 }
@@ -547,6 +568,18 @@ void Entry::onSetText()
     m_caret = textlen;
 }
 
+float Entry::onGetTextBaseline() const
+{
+  text::FontMetrics metrics;
+  font()->metrics(&metrics);
+  // Here we only use the descent+ascent to measure the text height,
+  // without the metrics.leading part (which is the used to separate
+  // text lines in a paragraph, but here'd make widgets too big)
+  const float textHeight = metrics.descent - metrics.ascent;
+  const gfx::Rect rc = getEntryTextBounds();
+  return guiscaled_center(rc.y, rc.h, textHeight) - metrics.ascent;
+}
+
 void Entry::onChange()
 {
   Change();
@@ -556,7 +589,7 @@ gfx::Rect Entry::onGetEntryTextBounds() const
 {
   gfx::Rect bounds = clientBounds();
   bounds.x += border().left();
-  bounds.y += CALC_FOR_CENTER(0, bounds.h, textHeight());
+  bounds.y += guiscaled_center(0, bounds.h, textHeight());
   bounds.w -= border().width();
   bounds.h = textHeight();
   return bounds;
@@ -872,20 +905,37 @@ bool Entry::isPosInSelection(int pos)
 void Entry::showEditPopupMenu(const gfx::Point& pt)
 {
   Menu menu;
-  MenuItem cut("Cut");
-  MenuItem copy("Copy");
-  MenuItem paste("Paste");
+
+  auto* clipboard = UISystem::instance()->clipboardDelegate();
+  if (!clipboard)
+    return;
+
+  auto* translate = UISystem::instance()->translationDelegate();
+  ASSERT(translate); // We provide UISystem as default translation delegate
+  if (!translate)
+    return;
+
+  MenuItem cut(translate->cut());
+  MenuItem copy(translate->copy());
+  MenuItem paste(translate->paste());
+  MenuItem selectAll(translate->selectAll());
   menu.addChild(&cut);
   menu.addChild(&copy);
   menu.addChild(&paste);
+  menu.addChild(new MenuSeparator);
+  menu.addChild(&selectAll);
+
+  for (auto* item : menu.children())
+    item->processMnemonicFromText();
+
   cut.Click.connect([this] { executeCmd(EntryCmd::Cut, 0, false); });
   copy.Click.connect([this] { executeCmd(EntryCmd::Copy, 0, false); });
   paste.Click.connect([this] { executeCmd(EntryCmd::Paste, 0, false); });
+  selectAll.Click.connect([this] { executeCmd(EntryCmd::SelectAll, 0, false); });
 
-  if (isReadOnly()) {
-    cut.setEnabled(false);
-    paste.setEnabled(false);
-  }
+  copy.setEnabled(m_select >= 0);
+  cut.setEnabled(m_select >= 0 && !isReadOnly());
+  paste.setEnabled(clipboard->hasClipboardText() && !isReadOnly());
 
   menu.showPopup(pt, display());
 }
diff --git a/src/ui/entry.h b/src/ui/entry.h
index 7b15221c0..b9fc1ceb9 100644
--- a/src/ui/entry.h
+++ b/src/ui/entry.h
@@ -43,6 +43,7 @@ public:
 
   int caretPos() const { return m_caret; }
   int lastCaretPos() const;
+  gfx::Point caretPosOnScreen() const;
 
   void setCaretPos(int pos);
   void setCaretToEnd();
@@ -76,7 +77,7 @@ public:
   obs::signal<void()> Change;
 
 protected:
-  gfx::Rect getCharBoxBounds(int i);
+  gfx::Rect getCharBoxBounds(int i) const;
 
   // Events
   bool onProcessMessage(Message* msg) override;
@@ -84,6 +85,7 @@ protected:
   void onPaint(PaintEvent& ev) override;
   void onSetFont() override;
   void onSetText() override;
+  float onGetTextBaseline() const override;
 
   // New Events
   virtual void onChange();
diff --git a/src/ui/graphics.cpp b/src/ui/graphics.cpp
index 2449a6e25..cc52eaaf8 100644
--- a/src/ui/graphics.cpp
+++ b/src/ui/graphics.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -189,6 +189,16 @@ void Graphics::drawLine(gfx::Color color, const gfx::Point& _a, const gfx::Point
   m_surface->drawLine(a, b, paint);
 }
 
+void Graphics::drawLine(const gfx::PointF& _a, const gfx::PointF& _b, const Paint& paint)
+{
+  gfx::PointF a(m_dx + _a.x, m_dy + _a.y);
+  gfx::PointF b(m_dx + _b.x, m_dy + _b.y);
+  dirty(gfx::RectF(a, b));
+
+  os::SurfaceLock lock(m_surface.get());
+  m_surface->drawLine(a, b, paint);
+}
+
 void Graphics::drawPath(gfx::Path& path, const Paint& paint)
 {
   os::SurfaceLock lock(m_surface.get());
@@ -214,6 +224,16 @@ void Graphics::drawRect(const gfx::Rect& rcOrig, const Paint& paint)
   m_surface->drawRect(rc, paint);
 }
 
+void Graphics::drawRect(const gfx::RectF& rcOrig, const Paint& paint)
+{
+  gfx::RectF rc(rcOrig);
+  rc.offset(m_dx, m_dy);
+  dirty(rc);
+
+  os::SurfaceLock lock(m_surface.get());
+  m_surface->drawRect(rc, paint);
+}
+
 void Graphics::drawRect(gfx::Color color, const gfx::Rect& rcOrig)
 {
   gfx::Rect rc(rcOrig);
@@ -357,12 +377,12 @@ void Graphics::setFont(const text::FontRef& font)
   m_font = font;
 }
 
-void Graphics::drawText(const std::string& str,
-                        gfx::Color fg,
-                        gfx::Color bg,
-                        const gfx::Point& origPt,
-                        text::DrawTextDelegate* delegate,
-                        text::ShaperFeatures features)
+void Graphics::drawTextWithDelegate(const std::string& str,
+                                    gfx::Color fg,
+                                    gfx::Color bg,
+                                    const gfx::Point& origPt,
+                                    text::DrawTextDelegate* delegate,
+                                    text::ShaperFeatures features)
 {
   ASSERT(m_font);
   if (str.empty())
@@ -404,76 +424,10 @@ void Graphics::drawTextBlob(const text::TextBlobRef& textBlob,
   dirty(textBounds);
 }
 
-namespace {
-
-class DrawUITextDelegate : public text::DrawTextDelegate {
-public:
-  DrawUITextDelegate(os::Surface* surface, text::Font* font, const int mnemonic)
-    : m_surface(surface)
-    , m_font(font)
-    , m_mnemonic(std::tolower(mnemonic))
-    , m_underscoreColor(gfx::ColorNone)
-  {
-    ASSERT(m_font);
-  }
-
-  gfx::Rect bounds() const { return m_bounds; }
-
-  void preProcessChar(const int index,
-                      const base::codepoint_t codepoint,
-                      gfx::Color& fg,
-                      gfx::Color& bg,
-                      const gfx::Rect& charBounds) override
-  {
-    if (m_surface) {
-      if (m_mnemonic &&
-          // TODO use ICU library to lower unicode chars
-          std::tolower(codepoint) == m_mnemonic) {
-        m_underscoreColor = fg;
-        m_mnemonic = 0; // Just one time
-      }
-      else {
-        m_underscoreColor = gfx::ColorNone;
-      }
-    }
-  }
-
-  bool preDrawChar(const gfx::Rect& charBounds) override
-  {
-    m_bounds |= charBounds;
-    return true;
-  }
-
-  void postDrawChar(const gfx::Rect& charBounds) override
-  {
-    if (!gfx::is_transparent(m_underscoreColor)) {
-      text::FontMetrics metrics;
-      float height = m_font->metrics(&metrics);
-
-      gfx::RectF underscoreBounds(charBounds.x,
-                                  charBounds.y + (-metrics.ascent + metrics.underlinePosition -
-                                                  metrics.underlineThickness / 2.0f),
-                                  charBounds.w,
-                                  metrics.underlineThickness * guiscale());
-
-      os::Paint paint;
-      paint.color(m_underscoreColor);
-      paint.style(os::Paint::Fill);
-      m_surface->drawRect(underscoreBounds, paint);
-
-      m_bounds |= underscoreBounds;
-    }
-  }
-
-private:
-  os::Surface* m_surface;
-  text::Font* m_font;
-  int m_mnemonic;
-  gfx::Color m_underscoreColor;
-  gfx::Rect m_bounds;
-};
-
-} // namespace
+void Graphics::drawText(const std::string& str, gfx::Color fg, gfx::Color bg, const gfx::Point& pt)
+{
+  drawUIText(str, fg, bg, pt, 0);
+}
 
 void Graphics::drawUIText(const std::string& str,
                           gfx::Color fg,
@@ -485,14 +439,21 @@ void Graphics::drawUIText(const std::string& str,
   if (str.empty())
     return;
 
-  os::SurfaceLock lock(m_surface.get());
-  int x = m_dx + pt.x;
-  int y = m_dy + pt.y;
+  auto fontMgr = get_theme()->fontMgr();
+  auto textBlob = text::TextBlob::MakeWithShaper(fontMgr, m_font, str);
 
-  DrawUITextDelegate delegate(m_surface.get(), m_font.get(), mnemonic);
-  text::draw_text(m_surface.get(), get_theme()->fontMgr(), m_font, str, fg, bg, x, y, &delegate);
+  Paint paint;
+  if (gfx::geta(bg) > 0) { // Paint background
+    paint.color(bg);
+    paint.style(os::Paint::Fill);
+    drawRect(gfx::RectF(textBlob->bounds()).offset(pt), paint);
+  }
+  paint.color(fg);
 
-  dirty(delegate.bounds());
+  drawTextBlob(textBlob, gfx::PointF(pt), paint);
+
+  if (mnemonic != 0)
+    Theme::drawMnemonicUnderline(this, str, textBlob, gfx::PointF(pt), mnemonic, paint);
 }
 
 void Graphics::drawAlignedUIText(const std::string& str,
@@ -504,10 +465,13 @@ void Graphics::drawAlignedUIText(const std::string& str,
   doUIStringAlgorithm(str, fg, bg, rc, align, true);
 }
 
+// TODO We should try to cache TextBlobs as much as possible instead
+//      of measuring text directly (which is a slow operation).
 gfx::Size Graphics::measureText(const std::string& str)
 {
   ASSERT(m_font);
-  return gfx::Size(m_font->textLength(str), m_font->height());
+  return text::draw_text(nullptr, get_theme()->fontMgr(), m_font, str.c_str(), 0, 0, 0, 0, nullptr)
+    .size();
 }
 
 gfx::Size Graphics::fitString(const std::string& str, int maxWidth, int align)
@@ -531,12 +495,16 @@ gfx::Size Graphics::doUIStringAlgorithm(const std::string& str,
 
   gfx::Point pt(0, rc.y);
 
+  text::FontMetrics metrics;
+  m_font->metrics(&metrics);
+
   if ((align & (MIDDLE | BOTTOM)) != 0) {
-    gfx::Size preSize = doUIStringAlgorithm(str, gfx::ColorNone, gfx::ColorNone, rc, 0, false);
-    if (align & MIDDLE)
-      pt.y = rc.y + rc.h / 2 - preSize.h / 2;
-    else if (align & BOTTOM)
-      pt.y = rc.y + rc.h - preSize.h;
+    if (align & MIDDLE) {
+      pt.y = rc.y + rc.h / 2 + metrics.ascent;
+    }
+    else if (align & BOTTOM) {
+      pt.y = rc.y + rc.h + metrics.ascent;
+    }
   }
 
   gfx::Size calculatedSize(0, 0);
@@ -614,30 +582,40 @@ gfx::Size Graphics::doUIStringAlgorithm(const std::string& str,
     else
       line = str.substr(beg);
 
-    gfx::Size lineSize(m_font->textLength(line), m_font->height() + lineSeparation);
-    calculatedSize.w = std::max(calculatedSize.w, lineSize.w);
+    text::TextBlobRef lineBlob =
+      text::TextBlob::MakeWithShaper(get_theme()->fontMgr(), m_font, line);
+    gfx::SizeF lineSize;
+    if (lineBlob) {
+      lineSize = lineBlob->bounds().size();
+      lineSize.h += lineSeparation;
+      calculatedSize.w = std::max<int>(calculatedSize.w, std::ceil(lineSize.w));
 
-    // Render the text
-    if (draw) {
-      int xout;
-      if ((align & CENTER) == CENTER)
-        xout = pt.x + rc.w / 2 - lineSize.w / 2;
-      else if ((align & RIGHT) == RIGHT)
-        xout = pt.x + rc.w - lineSize.w;
-      else
-        xout = pt.x;
+      // Render the text
+      if (draw) {
+        int xout;
+        if ((align & CENTER) == CENTER)
+          xout = pt.x + rc.w / 2 - lineSize.w / 2;
+        else if ((align & RIGHT) == RIGHT)
+          xout = pt.x + rc.w - lineSize.w;
+        else
+          xout = pt.x;
 
-      if (!line.empty())
-        drawText(line, fg, bg, gfx::Point(xout, pt.y));
+        Paint paint;
+        paint.style(os::Paint::Fill);
+        if (!gfx::is_transparent(bg)) {
+          paint.color(bg);
+          drawRect(gfx::RectF(xout, pt.y, rc.w, lineSize.h), paint);
+        }
+        paint.color(fg);
 
-      if (!gfx::is_transparent(bg))
-        fillAreaBetweenRects(bg,
-                             gfx::Rect(rc.x, pt.y, rc.w, lineSize.h),
-                             gfx::Rect(xout, pt.y, lineSize.w, lineSize.h));
+        float baselineDelta = -metrics.ascent - lineBlob->baseline();
+        drawTextBlob(lineBlob, gfx::PointF(xout, pt.y + baselineDelta), paint);
+      }
+
+      pt.y += lineSize.h;
+      calculatedSize.h += lineSize.h;
     }
 
-    pt.y += lineSize.h;
-    calculatedSize.h += lineSize.h;
     beg = newBeg;
 
     if (pt.y + lineSize.h >= rc.y2())
diff --git a/src/ui/graphics.h b/src/ui/graphics.h
index c1000c1e4..8b08b717a 100644
--- a/src/ui/graphics.h
+++ b/src/ui/graphics.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -73,9 +73,11 @@ public:
   void drawVLine(int x, int y, int h, const Paint& paint);
   void drawVLine(gfx::Color color, int x, int y, int h);
   void drawLine(gfx::Color color, const gfx::Point& a, const gfx::Point& b);
+  void drawLine(const gfx::PointF& a, const gfx::PointF& b, const Paint& paint);
   void drawPath(gfx::Path& path, const Paint& paint);
 
   void drawRect(const gfx::Rect& rc, const Paint& paint);
+  void drawRect(const gfx::RectF& rc, const Paint& paint);
   void drawRect(gfx::Color color, const gfx::Rect& rc);
   void fillRect(gfx::Color color, const gfx::Rect& rc);
   void fillRegion(gfx::Color color, const gfx::Region& rgn);
@@ -113,15 +115,16 @@ public:
   void setFont(const text::FontRef& font);
 
   [[deprecated]]
-  void drawText(const std::string& str,
-                gfx::Color fg,
-                gfx::Color bg,
-                const gfx::Point& pt,
-                text::DrawTextDelegate* delegate = nullptr,
-                text::ShaperFeatures features = {});
+  void drawTextWithDelegate(const std::string& str,
+                            gfx::Color fg,
+                            gfx::Color bg,
+                            const gfx::Point& pt,
+                            text::DrawTextDelegate* delegate = nullptr,
+                            text::ShaperFeatures features = {});
 
   void drawTextBlob(const text::TextBlobRef& textBlob, const gfx::PointF& pt, const Paint& paint);
 
+  void drawText(const std::string& str, gfx::Color fg, gfx::Color bg, const gfx::Point& pt);
   void drawUIText(const std::string& str,
                   gfx::Color fg,
                   gfx::Color bg,
diff --git a/src/ui/grid.cpp b/src/ui/grid.cpp
index 7d8a4fb1c..478365f4d 100644
--- a/src/ui/grid.cpp
+++ b/src/ui/grid.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -14,6 +14,7 @@
 #include "ui/grid.h"
 #include "ui/message.h"
 #include "ui/resize_event.h"
+#include "ui/scale.h"
 #include "ui/size_hint_event.h"
 #include "ui/theme.h"
 #include "ui/widget.h"
@@ -180,13 +181,13 @@ void Grid::onResize(ResizeEvent& ev)
         calculateCellSize(col, cell->hspan, m_colstrip, w);
         calculateCellSize(row, cell->vspan, m_rowstrip, h);
 
-        reqSize = cell->child->sizeHint();
+        reqSize = cell->child->sizeHint(Size(w, h));
 
         if (cell->align & LEFT) {
           w = reqSize.w;
         }
         else if (cell->align & CENTER) {
-          x += w / 2 - reqSize.w / 2;
+          x = guiscaled_center(x, w, reqSize.w);
           w = reqSize.w;
         }
         else if (cell->align & RIGHT) {
@@ -198,7 +199,7 @@ void Grid::onResize(ResizeEvent& ev)
           h = reqSize.h;
         }
         else if (cell->align & MIDDLE) {
-          y += h / 2 - reqSize.h / 2;
+          y = guiscaled_center(y, h, reqSize.h);
           h = reqSize.h;
         }
         else if (cell->align & BOTTOM) {
@@ -394,7 +395,7 @@ void Grid::expandStrip(std::vector<Strip>& colstrip,
             }
 
             // Divide the available size of the cell in the number of columns which are expandible
-            int size = cell_size / expand;
+            int size = guiscaled_div(cell_size, expand);
             for (i = col; i < col + cell_span; ++i) {
               if (colstrip[i].expand_count == max_expand_count) {
                 // For the last column, use all the available space in the column
@@ -468,7 +469,7 @@ void Grid::distributeStripSize(std::vector<Strip>& colstrip,
       }
     }
 
-    int extra_foreach = extra_total / wantmore_count;
+    int extra_foreach = guiscaled_div(extra_total, wantmore_count);
 
     for (i = 0; i < (int)colstrip.size(); ++i) {
       if (colstrip[i].expand_count == max_expand_count || same_width) {
diff --git a/src/ui/int_entry.cpp b/src/ui/int_entry.cpp
index 9dd994ac7..90d0d53d2 100644
--- a/src/ui/int_entry.cpp
+++ b/src/ui/int_entry.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -89,17 +89,11 @@ bool IntEntry::onProcessMessage(Message* msg)
     case kMouseMoveMessage:
       if (hasCapture()) {
         MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
-        Widget* pick = manager()->pickFromScreenPos(
+        Manager* mgr = manager();
+        Widget* pick = mgr->pickFromScreenPos(
           display()->nativeWindow()->pointToScreen(mouseMsg->position()));
         if (pick == m_slider.get()) {
-          releaseMouse();
-
-          MouseMessage mouseMsg2(kMouseDownMessage,
-                                 *mouseMsg,
-                                 mouseMsg->positionForDisplay(pick->display()));
-          mouseMsg2.setRecipient(pick);
-          mouseMsg2.setDisplay(pick->display());
-          pick->sendMessage(&mouseMsg2);
+          mgr->transferAsMouseDownMessage(this, pick, mouseMsg);
         }
       }
       break;
@@ -121,8 +115,8 @@ bool IntEntry::onProcessMessage(Message* msg)
     case kKeyDownMessage:
       if (hasFocus() && !isReadOnly()) {
         KeyMessage* keymsg = static_cast<KeyMessage*>(msg);
-        int chr = keymsg->unicodeChar();
-        if (chr >= 32 && (chr < '0' || chr > '9')) {
+        const int chr = keymsg->unicodeChar();
+        if (chr >= 32 && !onAcceptUnicodeChar(chr)) {
           // "Eat" all keys that aren't number
           return true;
         }
@@ -172,6 +166,11 @@ void IntEntry::onValueChange()
   // Do nothing
 }
 
+bool IntEntry::onAcceptUnicodeChar(const int unicodeChar)
+{
+  return (unicodeChar >= '0' && unicodeChar <= '9');
+}
+
 void IntEntry::openPopup()
 {
   m_slider->setValue(getValue());
diff --git a/src/ui/int_entry.h b/src/ui/int_entry.h
index 4d3d2f8d8..21734a593 100644
--- a/src/ui/int_entry.h
+++ b/src/ui/int_entry.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2022  Igara Studio S.A.
+// Copyright (C) 2022-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -36,6 +36,7 @@ protected:
 
   // New events
   virtual void onValueChange();
+  virtual bool onAcceptUnicodeChar(int unicodeChar);
 
   int m_min;
   int m_max;
diff --git a/src/ui/listbox.cpp b/src/ui/listbox.cpp
index f054b3fa4..53f33d5ad 100644
--- a/src/ui/listbox.cpp
+++ b/src/ui/listbox.cpp
@@ -26,11 +26,6 @@
 
 namespace ui {
 
-static inline bool sort_by_text(Widget* a, Widget* b)
-{
-  return (base::compare_filenames(a->text(), b->text()) < 0);
-}
-
 using namespace gfx;
 
 ListBox::ListBox()
@@ -182,10 +177,12 @@ void ListBox::centerScroll()
 
 void ListBox::sortItems()
 {
-  sortItems(&sort_by_text);
+  sortItems([](const Widget* a, const Widget* b) {
+    return (base::compare_filenames(a->text(), b->text()) < 0);
+  });
 }
 
-void ListBox::sortItems(bool (*cmp)(Widget* a, Widget* b))
+void ListBox::sortItems(const std::function<bool(Widget*, Widget*)>& cmp)
 {
   WidgetsList widgets = children();
   std::sort(widgets.begin(), widgets.end(), cmp);
diff --git a/src/ui/listbox.h b/src/ui/listbox.h
index e096c70de..8afbac9cc 100644
--- a/src/ui/listbox.h
+++ b/src/ui/listbox.h
@@ -35,8 +35,8 @@ public:
 
   void makeChildVisible(Widget* item);
   void centerScroll();
-  void sortItems();
-  void sortItems(bool (*cmp)(Widget* a, Widget* b));
+  virtual void sortItems();
+  void sortItems(const std::function<bool(Widget*, Widget*)>& cmp);
 
   obs::signal<void()> Change;
   obs::signal<void()> DoubleClickItem;
diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 3070fbdc7..0666e6b2d 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -13,6 +13,7 @@
 // #define DEBUG_PAINT_MESSAGES      1
 // #define LIMIT_DISPATCH_TIME       1
 #define GARBAGE_TRACE(...) // TRACE(__VA_ARGS__)
+#define CAPTURE_TRACE(...) // TRACE(__VA_ARGS__)
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -21,6 +22,8 @@
 #include "ui/manager.h"
 
 #include "base/concurrent_queue.h"
+#include "base/contains.h"
+#include "base/remove_from_container.h"
 #include "base/scoped_value.h"
 #include "base/thread.h"
 #include "base/time.h"
@@ -183,8 +186,7 @@ os::Hit handle_native_hittest(os::Window* osWindow, const gfx::Point& pos)
 bool Manager::widgetAssociatedToManager(Widget* widget)
 {
   return (focus_widget == widget || mouse_widget == widget || capture_widget == widget ||
-          std::find(mouse_widgets_list.begin(), mouse_widgets_list.end(), widget) !=
-            mouse_widgets_list.end());
+          base::contains(mouse_widgets_list, widget));
 }
 
 Manager::Manager(const os::WindowRef& nativeWindow)
@@ -195,10 +197,8 @@ Manager::Manager(const os::WindowRef& nativeWindow)
   , m_mouseButton(kButtonNone)
 {
   // The native window can be nullptr when running tests
-  if (nativeWindow) {
+  if (nativeWindow)
     nativeWindow->setUserData(&m_display);
-    nativeWindow->setDragTarget(this);
-  }
 
   ASSERT(manager_thread == std::thread::id());
   manager_thread = std::this_thread::get_id();
@@ -240,6 +240,14 @@ Manager::Manager(const os::WindowRef& nativeWindow)
 
   // TODO check if this is needed
   onNewDisplayConfiguration(&m_display);
+
+  if (nativeWindow) {
+    // Setting the drag target has a slight performance cost that we can offset by running it later.
+    auto* callbackMessage = new CallbackMessage(
+      [this, nativeWindow] { nativeWindow->setDragTarget(this); });
+    callbackMessage->setRecipient(this);
+    enqueueMessage(callbackMessage);
+  }
 }
 
 Manager::~Manager()
@@ -873,6 +881,13 @@ void Manager::dispatchMessages()
   }
 }
 
+void Manager::flushMessages() const
+{
+  // Send a dummy event just to break the waiting loop.
+  os::Event evt;
+  m_eventQueue->queueEvent(evt);
+}
+
 void Manager::addToGarbage(Widget* widget)
 {
   ASSERT(widget);
@@ -889,12 +904,12 @@ void Manager::enqueueMessage(Message* msg)
     concurrent_msg_queue.push(msg);
 }
 
-Window* Manager::getTopWindow()
+Window* Manager::getTopWindow() const
 {
   return static_cast<Window*>(UI_FIRST_WIDGET(children()));
 }
 
-Window* Manager::getDesktopWindow()
+Window* Manager::getDesktopWindow() const
 {
   for (auto child : children()) {
     Window* window = static_cast<Window*>(child);
@@ -904,7 +919,7 @@ Window* Manager::getDesktopWindow()
   return nullptr;
 }
 
-Window* Manager::getForegroundWindow()
+Window* Manager::getForegroundWindow() const
 {
   for (auto child : children()) {
     Window* window = static_cast<Window*>(child);
@@ -1033,8 +1048,33 @@ void Manager::setMouse(Widget* widget)
   }
 }
 
-void Manager::setCapture(Widget* widget)
+void Manager::setCapture(Widget* widget, bool force)
 {
+  ASSERT(widget);
+  if (!widget)
+    return;
+
+  CAPTURE_TRACE("Manager::setCapture %s\n", typeid(*widget).name());
+  if (!force &&
+      // The given "widget" cannot capture the mouse if it's not
+      // "clickable".  The definition of "clickable" generally means
+      // that the widget is in the current foreground/modal window, or
+      // in the desktop window (or in any floating non-modal window).
+      // But it can also be in a top window, e.g. a combobox popup.
+      !isWidgetClickable(widget) &&
+      // In some special cases, a widget transfers a mouse message to
+      // another widget which doesn't belong to the current foreground
+      // modal window, this is done using onBroadcastMouseMessage()
+      // and/or transferAsMouseDownMessage(), so here we allow capturing
+      // the mouse from widgets inside the "mouse_widgets_list"
+      // (widgets that are allowed to capture the mouse / added with
+      // allowCapture() function).
+      (widget != mouse_widget && !base::contains(mouse_widgets_list, widget))) {
+    CAPTURE_TRACE("-> FILTERED!\n");
+    return;
+  }
+  CAPTURE_TRACE("-> OK\n");
+
   // To set the capture, we set first the mouse_widget (because
   // mouse_widget shouldn't be != capture_widget)
   setMouse(widget);
@@ -1048,6 +1088,13 @@ void Manager::setCapture(Widget* widget)
     display->nativeWindow()->captureMouse();
 }
 
+void Manager::allowCapture(Widget* widget)
+{
+  ASSERT(widget);
+  if (!base::contains(mouse_widgets_list, widget))
+    mouse_widgets_list.push_back(widget);
+}
+
 // Sets the focus to the "magnetic" widget inside the window
 void Manager::attractFocus(Widget* widget)
 {
@@ -1082,6 +1129,8 @@ void Manager::freeMouse()
 void Manager::freeCapture()
 {
   if (capture_widget) {
+    CAPTURE_TRACE("Manager::freeCapture() %s\n", typeid(*capture_widget).name());
+
     Display* display = capture_widget->display();
 
     capture_widget->disableFlags(HAS_CAPTURE);
@@ -1113,9 +1162,7 @@ void Manager::freeWidget(Widget* widget)
   if (widget->hasMouse() || (widget == mouse_widget))
     freeMouse();
 
-  auto it = std::find(mouse_widgets_list.begin(), mouse_widgets_list.end(), widget);
-  if (it != mouse_widgets_list.end())
-    mouse_widgets_list.erase(it);
+  base::remove_from_container(mouse_widgets_list, widget);
 
   ASSERT(!Manager::widgetAssociatedToManager(widget));
 }
@@ -1279,6 +1326,53 @@ Widget* Manager::pickFromScreenPos(const gfx::Point& screenPos) const
   return Widget::pickFromScreenPos(screenPos);
 }
 
+void Manager::transferAsMouseDownMessage(Widget* from,
+                                         Widget* to,
+                                         const MouseMessage* mouseMsg,
+                                         const bool sendNow)
+{
+  ASSERT(to);
+  ASSERT(from);
+
+  // Remove the capture from the "from" widget.
+  if (from->hasCapture())
+    from->releaseMouse();
+
+  // Allow the "to" widget to re-capture the mouse.
+  allowCapture(to);
+
+  // We enqueue a copy of the mouse message but as a kMouseDownMessage.
+  auto mouseMsg2 = std::make_unique<MouseMessage>(kMouseDownMessage,
+                                                  *mouseMsg,
+                                                  mouseMsg->positionForDisplay(to->display()));
+  mouseMsg2->setRecipient(to);
+  mouseMsg2->setDisplay(to->display());
+
+  if (sendNow)
+    to->sendMessage(mouseMsg2.get());
+  else
+    enqueueMessage(mouseMsg2.release());
+}
+
+bool Manager::isWidgetClickable(const Widget* widget) const
+{
+  Window* widgetWindow = widget->window();
+  if (!widgetWindow)
+    return false;
+
+  for (auto* child : children()) {
+    Window* window = static_cast<Window*>(child);
+
+    if (widgetWindow == window)
+      return true;
+
+    if (window->isForeground() || window->isDesktop())
+      break;
+  }
+
+  return false;
+}
+
 void Manager::_closingAppWithException()
 {
   redrawState = RedrawState::ClosingApp;
@@ -1962,80 +2056,57 @@ bool Manager::sendMessageToWidget(Message* msg, Widget* widget)
   return used;
 }
 
-Widget* Manager::findForDragAndDrop(Widget* widget)
-{
-  // If widget doesn't support drag & drop, try to find the nearest ancestor
-  // that supports it.
-  while (widget && !widget->hasFlags(ALLOW_DROP))
-    widget = widget->parent();
-
-  return widget;
-}
-
 void Manager::dragEnter(os::DragEvent& ev)
 {
-  Widget* widget = findForDragAndDrop(pick(ev.position()));
-
-  ASSERT(!widget || widget && widget->hasFlags(ALLOW_DROP));
+  Widget* widget = pick(ev.position());
 
   if (widget) {
-    m_dragOverWidget = widget;
-    DragEvent uiev(this, widget, ev);
-    widget->onDragEnter(uiev);
-    ev.dropResult(uiev.supportsOperation());
+    DragEnterMessage msg(ev);
+    msg.setPropagateToParent(true);
+    if (widget->sendMessage(&msg))
+      m_dragOverWidget = msg.widget();
   }
 }
 
 void Manager::dragLeave(os::DragEvent& ev)
 {
-  Widget* widget = m_dragOverWidget;
-  if (widget) {
-    DragEvent uiev(this, widget, ev);
-    widget->onDragLeave(uiev);
+  if (m_dragOverWidget) {
+    DragLeaveMessage msg(ev);
+    m_dragOverWidget->sendMessage(&msg);
     m_dragOverWidget = nullptr;
   }
 }
 
 void Manager::drag(os::DragEvent& ev)
 {
-  Widget* widget = findForDragAndDrop(pick(ev.position()));
-
-  ASSERT(!widget || widget && widget->hasFlags(ALLOW_DROP));
-
-  if (m_dragOverWidget && m_dragOverWidget != widget) {
-    DragEvent uiev(this, m_dragOverWidget, ev);
-    m_dragOverWidget->onDragLeave(uiev);
-    m_dragOverWidget = nullptr;
-  }
-
+  Widget* widget = pick(ev.position());
+  bool handled = false;
   if (widget) {
-    DragEvent uiev(this, widget, ev);
-    if (m_dragOverWidget != widget) {
-      m_dragOverWidget = widget;
-      widget->onDragEnter(uiev);
-    }
-    widget->onDrag(uiev);
-    ev.dropResult(uiev.supportsOperation());
+    DragMessage msg(ev);
+    msg.widget(m_dragOverWidget);
+    msg.setPropagateToParent(true);
+    handled = widget->sendMessage(&msg);
+    m_dragOverWidget = msg.widget();
   }
+
+  // If there wasn't any widget able to handle the DragMessage then just send
+  // a DragLeaveMessage to the last widget that processed a DragMessage.
+  if (!handled)
+    dragLeave(ev);
 }
 
 void Manager::drop(os::DragEvent& ev)
 {
   m_dragOverWidget = nullptr;
-  Widget* widget = findForDragAndDrop(pick(ev.position()));
-
-  ASSERT(!widget || widget && widget->hasFlags(ALLOW_DROP));
-
-  DragEvent uiev(this, widget, ev);
-  while (widget) {
-    widget->onDrop(uiev);
-    if (uiev.handled()) {
+  Widget* widget = pick(ev.position());
+  if (widget) {
+    DropMessage msg(ev);
+    msg.setPropagateToParent(true);
+    // If the message was handled
+    if (widget->sendMessage(&msg)) {
       ev.acceptDrop(true);
       return;
     }
-    // Propagate unhandled drop events to ancestors.
-    // TODO: Should we propagate dragEnter, dragLeave and drag events too?
-    widget = findForDragAndDrop(widget->parent());
   }
 
   // There were no widget that accepted the drop, then see if we can treat it
diff --git a/src/ui/manager.h b/src/ui/manager.h
index 46273eca1..ef4226078 100644
--- a/src/ui/manager.h
+++ b/src/ui/manager.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -63,6 +63,10 @@ public:
   bool generateMessages();
   void dispatchMessages();
 
+  // Wakes up the system's events queue to process the currently enqueued UI
+  // messages.
+  void flushMessages() const;
+
   // Makes the generateMessages() function to return immediately if
   // there is no user events in the OS queue. Useful only for tests
   // or benchmarks where we don't wait the user (or we don't even
@@ -72,9 +76,9 @@ public:
   void addToGarbage(Widget* widget);
   void collectGarbage();
 
-  Window* getTopWindow();
-  Window* getDesktopWindow();
-  Window* getForegroundWindow();
+  Window* getTopWindow() const;
+  Window* getDesktopWindow() const;
+  Window* getForegroundWindow() const;
   Display* getForegroundDisplay();
 
   Widget* getFocus();
@@ -83,7 +87,7 @@ public:
 
   void setFocus(Widget* widget);
   void setMouse(Widget* widget);
-  void setCapture(Widget* widget);
+  void setCapture(Widget* widget, bool force = false);
   void attractFocus(Widget* widget);
   void focusFirstChild(Widget* widget);
   void freeFocus();
@@ -107,6 +111,30 @@ public:
 
   Widget* pickFromScreenPos(const gfx::Point& screenPos) const override;
 
+  // Transfers the given MouseMessage received "from" (generally a
+  // kMouseMoveMessage) to the given "to" widget, sending a copy of
+  // the message but changing its type to kMouseDownMessage. By
+  // default it enqueues the message.
+  //
+  // If "from" has the mouse capture, it will be released as it is
+  // highly probable that the "to" widget will recapture the mouse
+  // again.
+  //
+  // This is used in cases were the user presses the mouse button on
+  // one widget, and then drags the mouse to another widget. With this
+  // we can transfer the mouse capture between widgets (from -> to)
+  // simulating a kMouseDownMessage for the new widget "to".
+  void transferAsMouseDownMessage(Widget* from,
+                                  Widget* to,
+                                  const MouseMessage* mouseMsg,
+                                  bool sendNow = false);
+
+  // Returns true if the widget is accessible with the mouse, i.e. the
+  // widget is in the current foreground window (or a top window above
+  // the foreground, e.g. a combobox popup), or there is no foreground
+  // window and the widget is in the desktop window.
+  bool isWidgetClickable(const Widget* widget) const;
+
   void _openWindow(Window* window, bool center);
   void _closeWindow(Window* window, bool redraw_background);
   void _runModalWindow(Window* window);
@@ -164,11 +192,11 @@ private:
                           const double magnification);
   bool handleWindowZOrder();
   void updateMouseWidgets(const gfx::Point& mousePos, Display* display);
+  void allowCapture(Widget* widget);
 
   int pumpQueue();
   bool sendMessageToWidget(Message* msg, Widget* widget);
 
-  Widget* findForDragAndDrop(Widget* widget);
   void dragEnter(os::DragEvent& ev) override;
   void dragLeave(os::DragEvent& ev) override;
   void drag(os::DragEvent& ev) override;
diff --git a/src/ui/menu.cpp b/src/ui/menu.cpp
index 2794dd1fb..95b99b13f 100644
--- a/src/ui/menu.cpp
+++ b/src/ui/menu.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -424,6 +424,11 @@ Widget* Menu::findItemById(const char* id) const
   return nullptr;
 }
 
+bool Menu::inBar() const
+{
+  return (parent() && parent()->type() == kMenuBarWidget);
+}
+
 void Menu::onPaint(PaintEvent& ev)
 {
   theme()->paintMenu(ev);
@@ -433,40 +438,59 @@ void Menu::onResize(ResizeEvent& ev)
 {
   setBoundsQuietly(ev.bounds());
 
-  Rect cpos = childrenBounds();
-  bool isBar = (parent()->type() == kMenuBarWidget);
+  const Rect bounds = childrenBounds();
+  const bool inBar = this->inBar();
+  Rect cpos = bounds;
 
   for (auto child : children()) {
     Size reqSize = child->sizeHint();
+    cpos.h = reqSize.h;
 
-    if (isBar)
+    if (inBar) {
       cpos.w = reqSize.w;
+      if (cpos.x > bounds.x && cpos.x2() > bounds.x2()) {
+        cpos.x = bounds.x;
+        cpos.y += cpos.h;
+      }
+    }
     else
       cpos.h = reqSize.h;
 
     child->setBounds(cpos);
 
-    if (isBar)
-      cpos.x += cpos.w;
+    if (inBar)
+      cpos.x += cpos.w + childSpacing();
     else
-      cpos.y += cpos.h;
+      cpos.y += cpos.h + childSpacing();
   }
 }
 
 void Menu::onSizeHint(SizeHintEvent& ev)
 {
+  const bool inBar = this->inBar();
+
   Size size(0, 0);
   Size reqSize;
+  int x = 0;
 
   for (auto it = children().begin(), end = children().end(); it != end;) {
     auto next = it;
     ++next;
 
-    reqSize = (*it)->sizeHint();
+    reqSize = (*it)->sizeHint(ev.fitInSize());
 
-    if (parent() && parent()->type() == kMenuBarWidget) {
-      size.w += reqSize.w + ((next != end) ? childSpacing() : 0);
-      size.h = std::max(size.h, reqSize.h);
+    if (inBar) {
+      size.w = reqSize.w;
+
+      if (ev.fitInSize().w > 0 && x > 0 && x + reqSize.w > ev.fitInSize().w) {
+        x = 0;
+        size.h += reqSize.h;
+      }
+      else {
+        size.h = std::max(size.h, reqSize.h);
+      }
+
+      x += size.w + childSpacing();
     }
     else {
       size.w = std::max(size.w, reqSize.w);
@@ -478,7 +502,6 @@ void Menu::onSizeHint(SizeHintEvent& ev)
 
   size.w += border().width();
   size.h += border().height();
-
   ev.setSizeHint(size);
 }
 
@@ -487,6 +510,22 @@ bool MenuBox::onProcessMessage(Message* msg)
   Menu* menu = MenuBox::getMenu();
 
   switch (msg->type()) {
+    case kCloseDisplayMessage:
+      if (menu)
+        menu->closeAll();
+
+      // In case that this event is received when we are inside a
+      // modal loop to show this menu box
+      // (showPopup()/openWindowInForeground()) we redirect this
+      // kCloseDisplayMessage to the main window.
+      if (window()->isForeground()) {
+        auto* closeMsg2 = new Message(kCloseDisplayMessage);
+        closeMsg2->setRecipient(msg->recipient());
+        closeMsg2->setDisplay(msg->display());
+        manager()->enqueueMessage(closeMsg2);
+      }
+      break;
+
     case kMouseMoveMessage: {
       MenuBaseData* base = get_base(this);
       ASSERT(base);
@@ -828,9 +867,14 @@ void MenuBox::onResize(ResizeEvent& ev)
 void MenuBox::onSizeHint(SizeHintEvent& ev)
 {
   Size size(0, 0);
+  Size fitIn = ev.fitInSize();
+  if (fitIn.w > 0)
+    fitIn.w = std::max(1, fitIn.w - border().width());
+  if (fitIn.h > 0)
+    fitIn.h = std::max(1, fitIn.h - border().height());
 
   if (Menu* menu = getMenu())
-    size = menu->sizeHint();
+    size = menu->sizeHint(fitIn);
 
   size.w += border().width();
   size.h += border().height();
@@ -1363,6 +1407,7 @@ void MenuBox::startFilteringMouseDown()
 {
   if (m_base && !m_base->is_filtering) {
     m_base->is_filtering = true;
+    Manager::getDefault()->addMessageFilter(kCloseDisplayMessage, this);
     Manager::getDefault()->addMessageFilter(kMouseDownMessage, this);
     Manager::getDefault()->addMessageFilter(kDoubleClickMessage, this);
   }
@@ -1372,6 +1417,7 @@ void MenuBox::stopFilteringMouseDown()
 {
   if (m_base && m_base->is_filtering) {
     m_base->is_filtering = false;
+    Manager::getDefault()->removeMessageFilter(kCloseDisplayMessage, this);
     Manager::getDefault()->removeMessageFilter(kMouseDownMessage, this);
     Manager::getDefault()->removeMessageFilter(kDoubleClickMessage, this);
   }
diff --git a/src/ui/menu.h b/src/ui/menu.h
index 595b13345..443c52bc7 100644
--- a/src/ui/menu.h
+++ b/src/ui/menu.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2020-2022  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -38,6 +38,8 @@ public:
   obs::signal<void()> OpenPopup;
 
 protected:
+  bool inBar() const;
+
   virtual void onPaint(PaintEvent& ev) override;
   virtual void onResize(ResizeEvent& ev) override;
   virtual void onSizeHint(SizeHintEvent& ev) override;
diff --git a/src/ui/message.cpp b/src/ui/message.cpp
index ded5d709b..c429b4643 100644
--- a/src/ui/message.cpp
+++ b/src/ui/message.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -26,18 +26,26 @@ Message::Message(MessageType type, KeyModifiers modifiers)
   , m_display(nullptr)
   , m_recipient(nullptr)
   , m_commonAncestor(nullptr)
+  , m_modifiers(modifiers)
 {
-  const os::SystemRef system = os::System::instance();
-  if (modifiers == kKeyUninitializedModifier && system)
-    m_modifiers = system->keyModifiers();
-  else
-    m_modifiers = modifiers;
 }
 
 Message::~Message()
 {
 }
 
+KeyModifiers Message::modifiers() const
+{
+  if (m_modifiers == kKeyUninitializedModifier) {
+    const os::SystemRef system = os::System::instance();
+    if (system)
+      m_modifiers = system->keyModifiers();
+    else
+      m_modifiers = kKeyNoneModifier;
+  }
+  return m_modifiers;
+}
+
 void Message::setDisplay(Display* display)
 {
   m_display = display;
diff --git a/src/ui/message.h b/src/ui/message.h
index 0e501ef5a..e35b42a81 100644
--- a/src/ui/message.h
+++ b/src/ui/message.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -13,6 +13,7 @@
 #include "base/paths.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
+#include "os/dnd.h"
 #include "ui/base.h"
 #include "ui/keys.h"
 #include "ui/message_type.h"
@@ -43,7 +44,7 @@ public:
   Widget* recipient() const { return m_recipient; }
   bool fromFilter() const { return hasFlag(FromFilter); }
   void setFromFilter(const bool state) { setFlag(FromFilter, state); }
-  KeyModifiers modifiers() const { return m_modifiers; }
+  KeyModifiers modifiers() const;
   bool shiftPressed() const { return (m_modifiers & kKeyShiftModifier) == kKeyShiftModifier; }
   bool ctrlPressed() const { return (m_modifiers & kKeyCtrlModifier) == kKeyCtrlModifier; }
   bool altPressed() const { return (m_modifiers & kKeyAltModifier) == kKeyAltModifier; }
@@ -77,9 +78,9 @@ private:
   MessageType m_type; // Type of message
   int m_flags;        // Special flags for this message
   Display* m_display;
-  Widget* m_recipient;      // Recipient of this message
-  Widget* m_commonAncestor; // Common ancestor between the Leave <-> Enter messages
-  KeyModifiers m_modifiers; // Key modifiers pressed when message was created
+  Widget* m_recipient;              // Recipient of this message
+  Widget* m_commonAncestor;         // Common ancestor between the Leave <-> Enter messages
+  mutable KeyModifiers m_modifiers; // Key modifiers pressed when message was created
 };
 
 class CallbackMessage : public Message {
@@ -262,6 +263,62 @@ private:
   base::paths m_files;
 };
 
+class DndMessage : public Message {
+public:
+  os::DragEvent& event() { return m_event; }
+
+protected:
+  DndMessage(MessageType type, os::DragEvent& ev) : Message(type), m_event(ev) {}
+  DndMessage(const DndMessage&) = default;
+  DndMessage(DndMessage&&) = default;
+
+private:
+  os::DragEvent& m_event;
+};
+
+class DragEnterMessage : public DndMessage {
+public:
+  DragEnterMessage(os::DragEvent& ev) : DndMessage(kDragEnterMessage, ev) {}
+
+  // Returns the Widget under the mouse cursor when the user is dragging elements.
+  Widget* widget() { return m_widget; }
+  void widget(Widget* widget) { m_widget = widget; }
+
+private:
+  Widget* m_widget;
+};
+
+class DragLeaveMessage : public DndMessage {
+public:
+  DragLeaveMessage(os::DragEvent& ev) : DndMessage(kDragLeaveMessage, ev) {}
+
+  // Returns the Widget that was under the mouse cursor just before it hovers a
+  // new widget.
+  Widget* widget() { return m_widget; }
+  void widget(Widget* widget) { m_widget = widget; }
+
+private:
+  Widget* m_widget;
+};
+
+class DragMessage : public DndMessage {
+public:
+  DragMessage(os::DragEvent& ev) : DndMessage(kDragMessage, ev) {}
+
+  // Returns the widget currently being hovered by the dragged elements.
+  Widget* widget() { return m_widget; }
+  // Sets the widget currently being hovered by the dragged elements.
+  void widget(Widget* widget) { m_widget = widget; }
+
+private:
+  Widget* m_widget;
+};
+
+class DropMessage : public DndMessage {
+public:
+  DropMessage(os::DragEvent& ev) : DndMessage(kDropMessage, ev) {}
+};
+
 } // namespace ui
 
 #endif
diff --git a/src/ui/message_type.h b/src/ui/message_type.h
index 26de66b66..e49deb78d 100644
--- a/src/ui/message_type.h
+++ b/src/ui/message_type.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2023  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -42,8 +42,14 @@ enum MessageType {
   // Touch related messages.
   kTouchMagnifyMessage,
 
-  // TODO Drag'n'drop messages...
-  // k...DndMessage
+  // Drag'n'drop messages.
+  kDragEnterMessage, // Mouse pointer entered a drop-target widget's bounds while the user is
+                     // dragging elements.
+  kDragLeaveMessage, // Mouse pointer left a drop-target widget's bounds while the user is
+                     // dragging elements.
+  kDragMessage, // Mouse pointer is being moved inside of a drop-target widget's bounds while the
+                // user is dragging elements.
+  kDropMessage, // User dropped elements inside a drop-target widget's bounds.
 
   // Call a generic function when we are processing the queue of
   // messages. Used to process an laf-os event in the same order
diff --git a/src/ui/panel.cpp b/src/ui/panel.cpp
index 7abba02cf..b82746f60 100644
--- a/src/ui/panel.cpp
+++ b/src/ui/panel.cpp
@@ -55,7 +55,7 @@ void Panel::onResize(ResizeEvent& ev)
   // Set all the children to the same "cpos"
   gfx::Rect cpos = childrenBounds();
   for (auto child : children()) {
-    if (!child->isDecorative())
+    if (!child->isDecorative() && child->isVisible())
       child->setBounds(cpos);
   }
 }
diff --git a/src/ui/popup_window.cpp b/src/ui/popup_window.cpp
index 25f1a2d89..8198fae94 100644
--- a/src/ui/popup_window.cpp
+++ b/src/ui/popup_window.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2020-2021  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -101,6 +101,11 @@ bool PopupWindow::onProcessMessage(Message* msg)
 
     case kCloseMessage: stopFilteringMessages(); break;
 
+    case kCloseDisplayMessage:
+      // Close the popup when the main native window (os::Window) is closed.
+      closeWindow(nullptr);
+      break;
+
     case kMouseLeaveMessage:
       if (m_hotRegion.isEmpty() && m_fixed)
         closeWindow(nullptr);
@@ -205,6 +210,7 @@ void PopupWindow::startFilteringMessages()
     m_filtering = true;
 
     Manager* manager = Manager::getDefault();
+    manager->addMessageFilter(kCloseDisplayMessage, this);
     manager->addMessageFilter(kMouseMoveMessage, this);
     manager->addMessageFilter(kMouseDownMessage, this);
     manager->addMessageFilter(kKeyDownMessage, this);
@@ -217,6 +223,7 @@ void PopupWindow::stopFilteringMessages()
     m_filtering = false;
 
     Manager* manager = Manager::getDefault();
+    manager->removeMessageFilter(kCloseDisplayMessage, this);
     manager->removeMessageFilter(kMouseMoveMessage, this);
     manager->removeMessageFilter(kMouseDownMessage, this);
     manager->removeMessageFilter(kKeyDownMessage, this);
diff --git a/src/ui/scale.h b/src/ui/scale.h
index c004989e6..440da4dd5 100644
--- a/src/ui/scale.h
+++ b/src/ui/scale.h
@@ -1,4 +1,5 @@
 // Aseprite UI Library
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -14,6 +15,17 @@ namespace ui {
 // Every icon/graphics/font should be scaled to this factor.
 int guiscale();
 
+// num: is a numerator with the guiscale() already applied.
+inline int guiscaled_div(const int uiscaled_num, const int dem)
+{
+  return ((uiscaled_num / guiscale()) / dem) * guiscale();
+}
+
+inline int guiscaled_center(const int p, const int s1, const int s2)
+{
+  return (p / guiscale() + (s1 / guiscale()) / 2 - (s2 / guiscale()) / 2) * guiscale();
+}
+
 } // namespace ui
 
 #endif
diff --git a/src/ui/scroll_bar.cpp b/src/ui/scroll_bar.cpp
index a6c12f12c..eddb286d7 100644
--- a/src/ui/scroll_bar.cpp
+++ b/src/ui/scroll_bar.cpp
@@ -23,6 +23,7 @@ using namespace gfx;
 // two scroll-bars at the same time).
 int ScrollBar::m_wherepos = 0;
 int ScrollBar::m_whereclick = 0;
+bool ScrollBar::m_dragging = false;
 
 ScrollBar::ScrollBar(int align, ScrollableViewDelegate* delegate)
   : Widget(kViewScrollbarWidget)
@@ -74,6 +75,7 @@ bool ScrollBar::onProcessMessage(Message* msg)
 
       m_wherepos = pos;
       m_whereclick = (align() & HORIZONTAL) ? mousePos.x : mousePos.y;
+      m_dragging = false;
 
       x1 = bounds().x;
       y1 = bounds().y;
@@ -135,6 +137,17 @@ bool ScrollBar::onProcessMessage(Message* msg)
     case kMouseMoveMessage:
       if (hasCapture()) {
         gfx::Point mousePos = static_cast<MouseMessage*>(msg)->position();
+
+        // Only continue drag logic after mouse movement is detected (avoids 1px shift on scrollbar
+        // click)
+        if (!m_dragging) {
+          if (((align() & HORIZONTAL) && mousePos.x == m_whereclick) ||
+              ((!(align() & HORIZONTAL)) && mousePos.y == m_whereclick)) {
+            return true;
+          }
+          m_dragging = true;
+        }
+
         int pos, len, bar_size, viewport_size;
 
         getScrollBarInfo(&pos, &len, &bar_size, &viewport_size);
@@ -162,6 +175,7 @@ bool ScrollBar::onProcessMessage(Message* msg)
       break;
 
     case kMouseUpMessage:
+      m_dragging = false;
       setSelected(false);
       releaseMouse();
       break;
diff --git a/src/ui/scroll_bar.h b/src/ui/scroll_bar.h
index 7710ac1f8..bfda4018a 100644
--- a/src/ui/scroll_bar.h
+++ b/src/ui/scroll_bar.h
@@ -56,6 +56,7 @@ private:
 
   static int m_wherepos;
   static int m_whereclick;
+  static bool m_dragging;
 };
 
 } // namespace ui
diff --git a/src/ui/accelerator.cpp b/src/ui/shortcut.cpp
similarity index 88%
rename from src/ui/accelerator.cpp
rename to src/ui/shortcut.cpp
index ba8c52692..914ce3893 100644
--- a/src/ui/accelerator.cpp
+++ b/src/ui/shortcut.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -9,7 +9,7 @@
   #include "config.h"
 #endif
 
-#include "ui/accelerator.h"
+#include "ui/shortcut.h"
 
 #include "base/debug.h"
 #include "base/replace_string.h"
@@ -144,18 +144,18 @@ int scancode_to_string_size = sizeof(scancode_to_string) / sizeof(scancode_to_st
 
 } // anonymous namespace
 
-Accelerator::Accelerator() : m_modifiers(kKeyNoneModifier), m_scancode(kKeyNil), m_unicodeChar(0)
+Shortcut::Shortcut() : m_modifiers(kKeyNoneModifier), m_scancode(kKeyNil), m_unicodeChar(0)
 {
 }
 
-Accelerator::Accelerator(KeyModifiers modifiers, KeyScancode scancode, int unicodeChar)
+Shortcut::Shortcut(KeyModifiers modifiers, KeyScancode scancode, int unicodeChar)
   : m_modifiers(modifiers)
   , m_scancode(scancode)
   , m_unicodeChar(unicodeChar)
 {
 }
 
-Accelerator::Accelerator(const std::string& str)
+Shortcut::Shortcut(const std::string& str)
   : m_modifiers(kKeyNoneModifier)
   , m_scancode(kKeyNil)
   , m_unicodeChar(0)
@@ -275,18 +275,18 @@ Accelerator::Accelerator(const std::string& str)
   }
 }
 
-bool Accelerator::operator==(const Accelerator& other) const
+bool Shortcut::operator==(const Shortcut& other) const
 {
   // TODO improve this, avoid conversion to std::string
   return toString() == other.toString();
 }
 
-bool Accelerator::isEmpty() const
+bool Shortcut::isEmpty() const
 {
   return (m_modifiers == kKeyNoneModifier && m_scancode == kKeyNil && m_unicodeChar == 0);
 }
 
-std::string Accelerator::toString() const
+std::string Shortcut::toString() const
 {
   std::string buf;
 
@@ -321,13 +321,13 @@ std::string Accelerator::toString() const
   return buf;
 }
 
-bool Accelerator::isPressed(KeyModifiers modifiers, KeyScancode scancode, int unicodeChar) const
+bool Shortcut::isPressed(KeyModifiers modifiers, KeyScancode scancode, int unicodeChar) const
 {
-  return ((scancode && *this == Accelerator(modifiers, scancode, 0)) ||
-          (unicodeChar && *this == Accelerator(modifiers, kKeyNil, unicodeChar)));
+  return ((scancode && *this == Shortcut(modifiers, scancode, 0)) ||
+          (unicodeChar && *this == Shortcut(modifiers, kKeyNil, unicodeChar)));
 }
 
-bool Accelerator::isPressed() const
+bool Shortcut::isPressed() const
 {
   os::SystemRef sys = os::System::instance();
   if (!sys)
@@ -349,7 +349,7 @@ bool Accelerator::isPressed() const
   return false;
 }
 
-bool Accelerator::isLooselyPressed() const
+bool Shortcut::isLooselyPressed() const
 {
   os::SystemRef sys = os::System::instance();
   if (!sys)
@@ -378,22 +378,22 @@ bool Accelerator::isLooselyPressed() const
 }
 
 //////////////////////////////////////////////////////////////////////
-// Accelerators
+// Shortcuts
 
-bool Accelerators::has(const Accelerator& accel) const
+bool Shortcuts::has(const Shortcut& shortcut) const
 {
-  return (std::find(begin(), end(), accel) != end());
+  return (std::find(begin(), end(), shortcut) != end());
 }
 
-void Accelerators::add(const Accelerator& accel)
+void Shortcuts::add(const Shortcut& shortcut)
 {
-  if (!has(accel))
-    m_list.push_back(accel);
+  if (!has(shortcut))
+    m_list.push_back(shortcut);
 }
 
-void Accelerators::remove(const Accelerator& accel)
+void Shortcuts::remove(const Shortcut& shortcut)
 {
-  auto it = std::find(begin(), end(), accel);
+  auto it = std::find(begin(), end(), shortcut);
   if (it != end())
     m_list.erase(it);
 }
diff --git a/src/ui/accelerator.h b/src/ui/shortcut.h
similarity index 61%
rename from src/ui/accelerator.h
rename to src/ui/shortcut.h
index fc7bab4a8..7f7e08b03 100644
--- a/src/ui/accelerator.h
+++ b/src/ui/shortcut.h
@@ -1,11 +1,12 @@
 // Aseprite UI Library
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
 
-#ifndef UI_ACCELERATOR_H_INCLUDED
-#define UI_ACCELERATOR_H_INCLUDED
+#ifndef UI_SHORTCUT_H_INCLUDED
+#define UI_SHORTCUT_H_INCLUDED
 #pragma once
 
 #include <string>
@@ -17,13 +18,12 @@ namespace ui {
 
 extern const char* kWinKeyName;
 
-// TODO rename this class to Shortcut
-class Accelerator {
+class Shortcut {
 public:
-  Accelerator();
-  Accelerator(KeyModifiers modifiers, KeyScancode scancode, int unicodeChar);
-  // Convert string like "Ctrl+Q" or "Alt+X" into an accelerator.
-  explicit Accelerator(const std::string& str);
+  Shortcut();
+  Shortcut(KeyModifiers modifiers, KeyScancode scancode, int unicodeChar);
+  // Convert string like "Ctrl+Q" or "Alt+X" into an shortcut.
+  explicit Shortcut(const std::string& str);
 
   bool isEmpty() const;
   std::string toString() const;
@@ -38,8 +38,8 @@ public:
   // modifiers are allowed too).
   bool isLooselyPressed() const;
 
-  bool operator==(const Accelerator& other) const;
-  bool operator!=(const Accelerator& other) const { return !operator==(other); }
+  bool operator==(const Shortcut& other) const;
+  bool operator!=(const Shortcut& other) const { return !operator==(other); }
 
   KeyModifiers modifiers() const { return m_modifiers; }
   KeyScancode scancode() const { return m_scancode; }
@@ -51,10 +51,9 @@ private:
   int m_unicodeChar;
 };
 
-// TODO rename this class to Shortcuts
-class Accelerators {
+class Shortcuts {
 public:
-  typedef std::vector<Accelerator> List;
+  typedef std::vector<Shortcut> List;
   typedef List::iterator iterator;
   typedef List::const_iterator const_iterator;
 
@@ -66,16 +65,16 @@ public:
   bool empty() const { return m_list.empty(); }
   std::size_t size() const { return m_list.size(); }
 
-  const ui::Accelerator& front() const { return m_list.front(); }
+  const ui::Shortcut& front() const { return m_list.front(); }
 
-  const ui::Accelerator& operator[](int index) const { return m_list[index]; }
+  const ui::Shortcut& operator[](int index) const { return m_list[index]; }
 
-  ui::Accelerator& operator[](int index) { return m_list[index]; }
+  ui::Shortcut& operator[](int index) { return m_list[index]; }
 
   void clear() { m_list.clear(); }
-  bool has(const Accelerator& accel) const;
-  void add(const Accelerator& accel);
-  void remove(const Accelerator& accel);
+  bool has(const Shortcut& shortcut) const;
+  void add(const Shortcut& shortcut);
+  void remove(const Shortcut& shortcut);
 
 private:
   List m_list;
diff --git a/src/ui/shortcut_ui_tests.cpp b/src/ui/shortcut_ui_tests.cpp
new file mode 100644
index 000000000..7dae3d74b
--- /dev/null
+++ b/src/ui/shortcut_ui_tests.cpp
@@ -0,0 +1,59 @@
+// Aseprite UI Library
+// Copyright (C) 2025  Igara Studio S.A.
+// Copyright (C) 2001-2015  David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#define TEST_GUI
+#include "tests/app_test.h"
+
+using namespace ui;
+
+TEST(Shortcut, Parser)
+{
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyF1, '\0'), Shortcut("F1"));
+  EXPECT_EQ(Shortcut(kKeyAltModifier, kKeyQ, 'q'), Shortcut("Alt+Q"));
+  EXPECT_EQ(Shortcut(kKeyCtrlModifier, kKeyQ, 'q'), Shortcut("Ctrl+Q"));
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyMinus, '-'), Shortcut("-"));
+  EXPECT_EQ(Shortcut(kKeyShiftModifier, kKeyMinus, '-'), Shortcut("Shift+-"));
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyEquals, '='), Shortcut("="));
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyNil, '+'), Shortcut("+"));
+  EXPECT_EQ(Shortcut(kKeyShiftModifier, kKeyNil, '+'), Shortcut("Shift++"));
+  EXPECT_EQ(Shortcut(kKeyCtrlModifier, kKeyNil, '+'), Shortcut("Ctrl++"));
+
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyMinusPad, 0), Shortcut("Minus Pad"));
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyMinusPad, 0), Shortcut("- Pad"));
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyPlusPad, 0), Shortcut("Plus Pad"));
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyPlusPad, 0), Shortcut("+ Pad"));
+  EXPECT_EQ(Shortcut(kKeyCtrlModifier, kKeyPlusPad, 0), Shortcut("Ctrl++ Pad"));
+}
+
+TEST(Shortcut, ToString)
+{
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyF1, '\0').toString(), Shortcut("F1").toString());
+  EXPECT_EQ(Shortcut(kKeyAltModifier, kKeyQ, 'q').toString(), Shortcut("Alt+Q").toString());
+  EXPECT_EQ(Shortcut(kKeyCtrlModifier, kKeyQ, 'q').toString(), Shortcut("Ctrl+Q").toString());
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyMinus, '-').toString(), Shortcut("-").toString());
+  EXPECT_EQ(Shortcut(kKeyShiftModifier, kKeyMinus, '-').toString(), Shortcut("Shift+-").toString());
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyEquals, '=').toString(), Shortcut("=").toString());
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyNil, '+').toString(), Shortcut("+").toString());
+  EXPECT_EQ(Shortcut(kKeyShiftModifier, kKeyNil, '+').toString(), Shortcut("Shift++").toString());
+  EXPECT_EQ(Shortcut(kKeyCtrlModifier, kKeyNil, '+').toString(), Shortcut("Ctrl++").toString());
+
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyMinusPad, 0).toString(),
+            Shortcut("Minus Pad").toString());
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyMinusPad, 0).toString(), Shortcut("- Pad").toString());
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyPlusPad, 0).toString(), Shortcut("Plus Pad").toString());
+  EXPECT_EQ(Shortcut(kKeyNoneModifier, kKeyPlusPad, 0).toString(), Shortcut("+ Pad").toString());
+  EXPECT_EQ(Shortcut(kKeyCtrlModifier, kKeyPlusPad, 0).toString(),
+            Shortcut("Ctrl++ Pad").toString());
+
+  EXPECT_EQ("- Pad", Shortcut(kKeyNoneModifier, kKeyMinusPad, 0).toString());
+  EXPECT_EQ("- Pad", Shortcut("Minus Pad").toString());
+  EXPECT_EQ("- Pad", Shortcut("- Pad").toString());
+
+  EXPECT_EQ("+ Pad", Shortcut(kKeyNoneModifier, kKeyPlusPad, 0).toString());
+  EXPECT_EQ("+ Pad", Shortcut("Plus Pad").toString());
+  EXPECT_EQ("+ Pad", Shortcut("+ Pad").toString());
+}
diff --git a/src/ui/size_hint_event.cpp b/src/ui/size_hint_event.cpp
index 5d400d056..8c641dcee 100644
--- a/src/ui/size_hint_event.cpp
+++ b/src/ui/size_hint_event.cpp
@@ -1,5 +1,6 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2025  Igara Studio S.A.
+// Copyright (C) 2001-2015  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -33,33 +34,6 @@ SizeHintEvent::SizeHintEvent(Widget* source, const Size& fitIn)
 {
 }
 
-/**
-   Destroys the SizeHintEvent.
-*/
-SizeHintEvent::~SizeHintEvent()
-{
-}
-
-Size SizeHintEvent::fitInSize() const
-{
-  return m_fitIn;
-}
-
-int SizeHintEvent::fitInWidth() const
-{
-  return m_fitIn.w;
-}
-
-int SizeHintEvent::fitInHeight() const
-{
-  return m_fitIn.h;
-}
-
-Size SizeHintEvent::sizeHint() const
-{
-  return m_sizeHint;
-}
-
 void SizeHintEvent::setSizeHint(const Size& sz)
 {
   m_sizeHint = sz;
diff --git a/src/ui/size_hint_event.h b/src/ui/size_hint_event.h
index 44c249cc4..ea59dba76 100644
--- a/src/ui/size_hint_event.h
+++ b/src/ui/size_hint_event.h
@@ -1,5 +1,6 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2025  Igara Studio S.A.
+// Copyright (C) 2001-2015  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -18,13 +19,12 @@ class Widget;
 class SizeHintEvent : public Event {
 public:
   SizeHintEvent(Widget* source, const gfx::Size& fitIn);
-  virtual ~SizeHintEvent();
 
-  gfx::Size fitInSize() const;
-  int fitInWidth() const;
-  int fitInHeight() const;
+  const gfx::Size& fitInSize() const { return m_fitIn; }
+  int fitInWidth() const { return m_fitIn.w; }
+  int fitInHeight() const { return m_fitIn.h; }
 
-  gfx::Size sizeHint() const;
+  const gfx::Size& sizeHint() const { return m_sizeHint; }
   void setSizeHint(const gfx::Size& sz);
   void setSizeHint(int w, int h);
 
diff --git a/src/ui/splitter.cpp b/src/ui/splitter.cpp
index 4811c3ee1..41eae9853 100644
--- a/src/ui/splitter.cpp
+++ b/src/ui/splitter.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -276,7 +276,7 @@ void Splitter::onSizeHint(SizeHintEvent& ev)
     if (!child->isVisible())
       continue;
 
-    reqSize = child->sizeHint();
+    reqSize = child->sizeHint(ev.fitInSize());
 
     if (this->align() & HORIZONTAL)
       GET_CHILD_SIZE(w, h);
diff --git a/src/ui/style.cpp b/src/ui/style.cpp
index ae8e49e82..39d0aa1f8 100644
--- a/src/ui/style.cpp
+++ b/src/ui/style.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -16,7 +16,7 @@ namespace ui {
 // static
 gfx::Border Style::UndefinedBorder()
 {
-  return gfx::Border(-1, -1, -1, -1);
+  return gfx::Border(kUndefinedSide, kUndefinedSide, kUndefinedSide, kUndefinedSide);
 }
 
 // static
@@ -33,9 +33,9 @@ gfx::Size Style::MaxSize()
 
 Style::Style(const Style* base)
   : m_insertionPoint(0)
-  , m_margin(base ? base->margin() : Style::UndefinedBorder())
-  , m_border(base ? base->border() : Style::UndefinedBorder())
-  , m_padding(base ? base->padding() : Style::UndefinedBorder())
+  , m_margin(base ? base->rawMargin() : Style::UndefinedBorder())
+  , m_border(base ? base->rawBorder() : Style::UndefinedBorder())
+  , m_padding(base ? base->rawPadding() : Style::UndefinedBorder())
   , m_minSize(base ? base->minSize() : Style::MinSize())
   , m_maxSize(base ? base->maxSize() : Style::MaxSize())
   , m_gap(base ? base->gap() : gfx::Size(0, 0))
diff --git a/src/ui/style.h b/src/ui/style.h
index aab2c4143..2de316e34 100644
--- a/src/ui/style.h
+++ b/src/ui/style.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -96,6 +96,7 @@ public:
 
   typedef std::vector<Layer> Layers;
 
+  static constexpr const int kUndefinedSide = -1;
   static gfx::Border UndefinedBorder();
 
   static gfx::Size MinSize();
@@ -104,9 +105,17 @@ public:
   Style(const Style* base);
 
   const std::string& id() const { return m_id; }
-  const gfx::Border& margin() const { return m_margin; }
-  const gfx::Border& border() const { return m_border; }
-  const gfx::Border& padding() const { return m_padding; }
+
+  // Raw margin/border/padding values which might contain
+  // kUndefinedSide values.
+  const gfx::Border& rawMargin() const { return m_margin; }
+  const gfx::Border& rawBorder() const { return m_border; }
+  const gfx::Border& rawPadding() const { return m_padding; }
+
+  gfx::Border margin() const { return normalizeBorder(m_margin); }
+  gfx::Border border() const { return normalizeBorder(m_border); }
+  gfx::Border padding() const { return normalizeBorder(m_padding); }
+
   const gfx::Size& minSize() const { return m_minSize; }
   const gfx::Size& maxSize() const { return m_maxSize; }
   const gfx::Size& gap() const { return m_gap; }
@@ -126,7 +135,27 @@ public:
   void setMnemonics(const bool enabled) { m_mnemonics = enabled; }
   void addLayer(const Layer& layer);
 
+  static inline void applyOnlyDefinedBorders(gfx::Border& border, const gfx::Border& defBorder)
+  {
+    if (defBorder.left() != kUndefinedSide)
+      border.left(defBorder.left());
+    if (defBorder.top() != kUndefinedSide)
+      border.top(defBorder.top());
+    if (defBorder.right() != kUndefinedSide)
+      border.right(defBorder.right());
+    if (defBorder.bottom() != kUndefinedSide)
+      border.bottom(defBorder.bottom());
+  }
+
 private:
+  static inline gfx::Border normalizeBorder(const gfx::Border& b)
+  {
+    return gfx::Border(b.left() == kUndefinedSide ? 0 : b.left(),
+                       b.top() == kUndefinedSide ? 0 : b.top(),
+                       b.right() == kUndefinedSide ? 0 : b.right(),
+                       b.bottom() == kUndefinedSide ? 0 : b.bottom());
+  }
+
   std::string m_id; // Just for debugging purposes
   Layers m_layers;
   int m_insertionPoint;
diff --git a/src/ui/system.cpp b/src/ui/system.cpp
index b8782d892..009f46064 100644
--- a/src/ui/system.cpp
+++ b/src/ui/system.cpp
@@ -153,7 +153,7 @@ UISystem* UISystem::instance()
   return g_instance;
 }
 
-UISystem::UISystem() : m_clipboardDelegate(nullptr)
+UISystem::UISystem() : m_clipboardDelegate(nullptr), m_translationDelegate(this)
 {
   ASSERT(!g_instance);
   g_instance = this;
diff --git a/src/ui/system.h b/src/ui/system.h
index 8175acef6..5ccb287a7 100644
--- a/src/ui/system.h
+++ b/src/ui/system.h
@@ -12,6 +12,7 @@
 #include "gfx/fwd.h"
 #include "ui/base.h"
 #include "ui/cursor_type.h"
+#include "ui/translation_delegate.h"
 
 #include <functional>
 #include <string>
@@ -23,18 +24,22 @@ class Cursor;
 class Display;
 class Widget;
 
-class UISystem {
+class UISystem : public TranslationDelegate {
 public:
   static UISystem* instance();
 
   UISystem();
   ~UISystem();
 
+  ClipboardDelegate* clipboardDelegate() const { return m_clipboardDelegate; }
+  TranslationDelegate* translationDelegate() const { return m_translationDelegate; }
+
   void setClipboardDelegate(ClipboardDelegate* delegate) { m_clipboardDelegate = delegate; }
-  ClipboardDelegate* clipboardDelegate() { return m_clipboardDelegate; }
+  void setTranslationDelegate(TranslationDelegate* delegate) { m_translationDelegate = delegate; }
 
 private:
-  ClipboardDelegate* m_clipboardDelegate;
+  ClipboardDelegate* m_clipboardDelegate = nullptr;
+  TranslationDelegate* m_translationDelegate = nullptr;
 };
 
 void set_multiple_displays(bool multi);
diff --git a/src/ui/textbox.cpp b/src/ui/textbox.cpp
index 2e4d1fdd8..e3cba776e 100644
--- a/src/ui/textbox.cpp
+++ b/src/ui/textbox.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2023  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -15,6 +15,7 @@
 #include "ui/display.h"
 #include "ui/intern.h"
 #include "ui/message.h"
+#include "ui/scale.h"
 #include "ui/size_hint_event.h"
 #include "ui/system.h"
 #include "ui/theme.h"
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 824b58d32..22526bb11 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -11,11 +11,13 @@
 
 #include "ui/theme.h"
 
+#include "base/utf8_decode.h"
 #include "gfx/point.h"
 #include "gfx/size.h"
 #include "os/surface.h"
 #include "os/system.h"
 #include "text/font.h"
+#include "text/font_metrics.h"
 #include "ui/intern.h"
 #include "ui/manager.h"
 #include "ui/paint_event.h"
@@ -99,12 +101,6 @@ getDrawSurfaceFunction(Graphics* g, os::Surface* sheet, gfx::Color color)
 
 PaintWidgetPartInfo::PaintWidgetPartInfo()
 {
-  bgColor = gfx::ColorNone;
-  styleFlags = 0;
-  text = nullptr;
-  textBlob = nullptr;
-  mnemonic = 0;
-  icon = nullptr;
 }
 
 PaintWidgetPartInfo::PaintWidgetPartInfo(const Widget* widget)
@@ -113,6 +109,7 @@ PaintWidgetPartInfo::PaintWidgetPartInfo(const Widget* widget)
   styleFlags = PaintWidgetPartInfo::getStyleFlagsForWidget(widget);
   text = &widget->text();
   textBlob = widget->textBlob();
+  baseline = widget->textBaseline();
   mnemonic = widget->mnemonic();
   icon = nullptr;
   if (const Style::Layer::IconSurfaceProvider* iconProvider =
@@ -214,7 +211,7 @@ void Theme::setDecorativeWidgetBounds(Widget* widget)
       Window* window = widget->window();
       gfx::Rect buttonBounds(widget->sizeHint());
       gfx::Rect windowBounds(window->bounds());
-      gfx::Border margin(0, 0, 0, 0);
+      gfx::Border margin;
       if (widget->style())
         margin = widget->style()->margin();
 
@@ -261,6 +258,7 @@ void Theme::paintWidgetPart(Graphics* g,
                               layer,
                               (info.text ? *info.text : std::string()),
                               info.textBlob,
+                              info.baseline,
                               info.mnemonic,
                               info.icon,
                               rc,
@@ -376,7 +374,8 @@ void Theme::paintLayer(Graphics* g,
                        const Style* style,
                        const Style::Layer& layer,
                        const std::string& text,
-                       const text::TextBlobRef& textBlob,
+                       text::TextBlobRef textBlob,
+                       const float baseline,
                        const int mnemonic,
                        os::Surface* providedIcon,
                        gfx::Rect& rc,
@@ -414,38 +413,45 @@ void Theme::paintLayer(Graphics* g,
 
             switch (layer.align()) {
               // Horizontal line
-              case MIDDLE:
+              case MIDDLE: {
+                const float y = guiscaled_center(rc.y, rc.h, layer.spriteBounds().h);
                 for (int x = rc.x; x < rc.x2(); x += layer.spriteBounds().w) {
                   draw(layer.spriteBounds().x,
                        layer.spriteBounds().y,
                        x,
-                       rc.y + rc.h / 2 - layer.spriteBounds().h / 2,
-                       layer.spriteBounds().w,
-                       layer.spriteBounds().h);
-                }
-                break;
-
-              // Vertical line
-              case CENTER:
-                for (int y = rc.y; y < rc.y2(); y += layer.spriteBounds().h) {
-                  draw(layer.spriteBounds().x,
-                       layer.spriteBounds().y,
-                       rc.x + rc.w / 2 - layer.spriteBounds().w / 2,
                        y,
                        layer.spriteBounds().w,
                        layer.spriteBounds().h);
                 }
                 break;
+              }
+
+              // Vertical line
+              case CENTER: {
+                const float x = guiscaled_center(rc.x, rc.w, layer.spriteBounds().w);
+                for (int y = rc.y; y < rc.y2(); y += layer.spriteBounds().h) {
+                  draw(layer.spriteBounds().x,
+                       layer.spriteBounds().y,
+                       x,
+                       y,
+                       layer.spriteBounds().w,
+                       layer.spriteBounds().h);
+                }
+                break;
+              }
 
               // One instance
-              case CENTER | MIDDLE:
+              case CENTER | MIDDLE: {
+                const float x = guiscaled_center(rc.x, rc.w, layer.spriteBounds().w);
+                const float y = guiscaled_center(rc.y, rc.h, layer.spriteBounds().h);
                 draw(layer.spriteBounds().x,
                      layer.spriteBounds().y,
-                     rc.x + rc.w / 2 - layer.spriteBounds().w / 2,
-                     rc.y + rc.h / 2 - layer.spriteBounds().h / 2,
+                     x,
+                     y,
                      layer.spriteBounds().w,
                      layer.spriteBounds().h);
                 break;
+              }
 
               // Pattern
               case 0:
@@ -506,39 +512,30 @@ void Theme::paintLayer(Graphics* g,
           g->drawAlignedUIText(text, layer.color(), bgColor, textBounds, layer.align());
         }
         else {
-          gfx::Size textSize = g->measureText(text);
-          gfx::Point pt;
-          gfx::Border undef = Style::UndefinedBorder();
-          gfx::Border padding = style->padding();
-          if (padding.left() == undef.left())
-            padding.left(0);
-          if (padding.right() == undef.right())
-            padding.right(0);
-          if (padding.top() == undef.top())
-            padding.top(0);
-          if (padding.bottom() == undef.bottom())
-            padding.bottom(0);
+          if (!textBlob || style->font() != nullptr)
+            textBlob = text::TextBlob::MakeWithShaper(m_fontMgr, g->font(), text);
 
-          if (layer.align() & LEFT)
-            pt.x = rc.x + padding.left();
-          else if (layer.align() & RIGHT)
-            pt.x = rc.x + rc.w - textSize.w - padding.right();
-          else {
-            pt.x = CALC_FOR_CENTER(rc.x + padding.left(), rc.w - padding.width(), textSize.w);
-          }
+          if (textBlob) {
+            const gfx::RectF blobSize = textBlob->bounds();
+            const gfx::Border padding = style->padding();
+            gfx::PointF pt;
 
-          if (layer.align() & TOP)
-            pt.y = rc.y + padding.top();
-          else if (layer.align() & BOTTOM)
-            pt.y = rc.y + rc.h - textSize.h - padding.bottom();
-          else {
-            pt.y = CALC_FOR_CENTER(rc.y + padding.top(), rc.h - padding.height(), textSize.h);
-          }
+            if (layer.align() & LEFT)
+              pt.x = rc.x + padding.left();
+            else if (layer.align() & RIGHT)
+              pt.x = rc.x + rc.w - blobSize.w - padding.right();
+            else
+              pt.x = guiscaled_center(rc.x + padding.left(), rc.w - padding.width(), blobSize.w);
 
-          pt += layer.offset();
+            if (layer.align() & TOP)
+              pt.y = rc.y + padding.top();
+            else if (layer.align() & BOTTOM)
+              pt.y = rc.y + rc.h - blobSize.h - padding.bottom();
+            else
+              pt.y = baseline - textBlob->baseline();
+
+            pt += layer.offset();
 
-          // Fast path with TextBlobs
-          if ((textBlob) && (!style->mnemonics() || mnemonic == 0) && (style->font() == nullptr)) {
             Paint paint;
             if (gfx::geta(bgColor) > 0) { // Paint background
               paint.color(bgColor);
@@ -547,9 +544,9 @@ void Theme::paintLayer(Graphics* g,
             }
             paint.color(layer.color());
             g->drawTextBlob(textBlob, gfx::PointF(pt), paint);
-          }
-          else {
-            g->drawUIText(text, layer.color(), bgColor, pt, style->mnemonics() ? mnemonic : 0);
+
+            if (style->mnemonics() && mnemonic != 0)
+              drawMnemonicUnderline(g, text, textBlob, pt, mnemonic, paint);
           }
         }
 
@@ -561,25 +558,16 @@ void Theme::paintLayer(Graphics* g,
     case Style::Layer::Type::kIcon: {
       os::Surface* icon = providedIcon ? providedIcon : layer.icon();
       if (icon) {
-        gfx::Size iconSize(icon->width(), icon->height());
+        const gfx::Size iconSize(icon->width(), icon->height());
+        const gfx::Border padding = style->padding();
         gfx::Point pt;
-        gfx::Border undef = Style::UndefinedBorder();
-        gfx::Border padding = style->padding();
-        if (padding.left() == undef.left())
-          padding.left(0);
-        if (padding.right() == undef.right())
-          padding.right(0);
-        if (padding.top() == undef.top())
-          padding.top(0);
-        if (padding.bottom() == undef.bottom())
-          padding.bottom(0);
 
         if (layer.align() & LEFT)
           pt.x = rc.x + padding.left();
         else if (layer.align() & RIGHT)
           pt.x = rc.x + rc.w - iconSize.w - padding.right();
         else {
-          pt.x = CALC_FOR_CENTER(rc.x + padding.left(), rc.w - padding.width(), iconSize.w);
+          pt.x = guiscaled_center(rc.x + padding.left(), rc.w - padding.width(), iconSize.w);
         }
 
         if (layer.align() & TOP)
@@ -587,7 +575,7 @@ void Theme::paintLayer(Graphics* g,
         else if (layer.align() & BOTTOM)
           pt.y = rc.y + rc.h - iconSize.h - padding.bottom();
         else {
-          pt.y = CALC_FOR_CENTER(rc.y + padding.top(), rc.h - padding.height(), iconSize.h);
+          pt.y = guiscaled_center(rc.y + padding.top(), rc.h - padding.height(), iconSize.h);
         }
 
         pt += layer.offset();
@@ -666,11 +654,11 @@ void Theme::measureLayer(const Widget* widget,
         const text::FontRef& styleFont = style->font();
         gfx::Size textSize;
         if (styleFont && styleFont != widget->font()) {
-          textSize = gfx::Size(styleFont->textLength(widget->text()), styleFont->height());
+          textSize = gfx::Size(styleFont->textLength(widget->text()), styleFont->lineHeight());
         }
         else {
           // We can use Widget::textSize() because we're going to use
-          // the widget font and, probably, the cached TextBlob.
+          // the widget font and, probably, the cached TextBlob size.
           textSize = widget->textSize();
         }
 
@@ -807,25 +795,8 @@ void Theme::calcWidgetMetrics(const Widget* widget,
       measureLayer(widget, style, layer, borderHint, textHint, textAlign, iconHint, iconAlign);
     });
 
-  gfx::Border undef = Style::UndefinedBorder();
-
-  if (style->border().left() != undef.left())
-    borderHint.left(style->border().left());
-  if (style->border().top() != undef.top())
-    borderHint.top(style->border().top());
-  if (style->border().right() != undef.right())
-    borderHint.right(style->border().right());
-  if (style->border().bottom() != undef.bottom())
-    borderHint.bottom(style->border().bottom());
-
-  if (style->padding().left() != undef.left())
-    paddingHint.left(style->padding().left());
-  if (style->padding().top() != undef.top())
-    paddingHint.top(style->padding().top());
-  if (style->padding().right() != undef.right())
-    paddingHint.right(style->padding().right());
-  if (style->padding().bottom() != undef.bottom())
-    paddingHint.bottom(style->padding().bottom());
+  Style::applyOnlyDefinedBorders(borderHint, style->rawBorder());
+  Style::applyOnlyDefinedBorders(paddingHint, style->rawPadding());
 
   sizeHint = gfx::Size(borderHint.width() + paddingHint.width(),
                        borderHint.height() + paddingHint.height());
@@ -1049,4 +1020,61 @@ void Theme::drawTextBox(Graphics* g,
     *h += widget->border().height();
 }
 
+// static
+void Theme::drawMnemonicUnderline(Graphics* g,
+                                  const std::string& text,
+                                  text::TextBlobRef textBlob,
+                                  const gfx::PointF& pt,
+                                  const int mnemonic,
+                                  const Paint& paint)
+{
+  base::utf8_decode decode(text);
+  int pos = decode.pos() - text.begin();
+  int mnemonicUtf8Pos = -1;
+  while (int chr = decode.next()) {
+    if (std::tolower(chr) == std::tolower(mnemonic)) {
+      mnemonicUtf8Pos = pos;
+      break;
+    }
+    pos = decode.pos() - text.begin();
+  }
+
+  if (mnemonicUtf8Pos >= 0) {
+    decode = base::utf8_decode(text);
+    decode.next(); // Go to first char
+    size_t glyphUtf8Begin = 0;
+
+    float baseline = textBlob->baseline();
+    textBlob->visitRuns([g, baseline, mnemonicUtf8Pos, pt, &paint, &decode, &glyphUtf8Begin, &text](
+                          text::TextBlob::RunInfo& info) {
+      for (int i = 0; i < info.glyphCount; ++i, decode.next()) {
+        // TODO This doesn't work because the TextBlob::RunInfo::clusters is nullptr at this
+        //      point, it's only valid when the RunHandler::commitRunBuffer()
+        if (info.clusters)
+          glyphUtf8Begin = info.getGlyphUtf8Range(i).begin;
+
+        if (mnemonicUtf8Pos == glyphUtf8Begin) {
+          text::FontMetrics metrics;
+          info.font->metrics(&metrics);
+
+          gfx::RectF mnemonicBounds = info.getGlyphBounds(i);
+          float thickness = metrics.underlineThickness * guiscale();
+          if (thickness < 1.0f)
+            thickness = 1.0f;
+
+          mnemonicBounds = gfx::RectF(pt.x + mnemonicBounds.x,
+                                      pt.y + baseline + metrics.underlinePosition * guiscale(),
+                                      mnemonicBounds.w,
+                                      thickness);
+
+          g->drawRect(mnemonicBounds, paint);
+          break;
+        }
+
+        glyphUtf8Begin = decode.pos() - text.begin();
+      }
+    });
+  }
+}
+
 } // namespace ui
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 125aebf4a..7ab9382bb 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2020-2024  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -17,7 +17,7 @@
 #include "text/fwd.h"
 #include "ui/base.h"
 #include "ui/cursor_type.h"
-#include "ui/scale.h"
+#include "ui/paint.h"
 #include "ui/style.h"
 
 namespace gfx {
@@ -41,18 +41,14 @@ class Theme;
 void set_theme(Theme* theme, const int uiscale);
 Theme* get_theme();
 
-inline int CALC_FOR_CENTER(int p, int s1, int s2)
-{
-  return (p / guiscale() + (s1 / guiscale()) / 2 - (s2 / guiscale()) / 2) * guiscale();
-}
-
 struct PaintWidgetPartInfo {
-  gfx::Color bgColor;
-  int styleFlags; // ui::Style::Layer flags
-  const std::string* text;
+  gfx::Color bgColor = gfx::ColorNone;
+  int styleFlags = 0; // ui::Style::Layer flags
+  const std::string* text = nullptr;
   text::TextBlobRef textBlob;
-  int mnemonic;
-  os::Surface* icon;
+  float baseline = 0.0f;
+  int mnemonic = 0;
+  os::Surface* icon = nullptr;
 
   PaintWidgetPartInfo();
   PaintWidgetPartInfo(const Widget* widget);
@@ -148,6 +144,13 @@ public:
                           gfx::Color bg,
                           gfx::Color fg);
 
+  static void drawMnemonicUnderline(Graphics* g,
+                                    const std::string& text,
+                                    text::TextBlobRef textBlob,
+                                    const gfx::PointF& pt,
+                                    const int mnemonic,
+                                    const Paint& paint);
+
   static ui::Style* EmptyStyle() { return &m_emptyStyle; }
 
 protected:
@@ -161,7 +164,8 @@ private:
                   const Style* style,
                   const Style::Layer& layer,
                   const std::string& text,
-                  const text::TextBlobRef& textBlob,
+                  text::TextBlobRef textBlob,
+                  const float baseline,
                   const int mnemonic,
                   os::Surface* icon,
                   gfx::Rect& rc,
diff --git a/src/ui/tooltips.cpp b/src/ui/tooltips.cpp
index 294e3a116..dcb3fe758 100644
--- a/src/ui/tooltips.cpp
+++ b/src/ui/tooltips.cpp
@@ -218,16 +218,16 @@ bool TipWindow::pointAt(int arrowAlign, const gfx::Rect& target, const ui::Displ
     if (get_multiple_displays()) {
       const gfx::Rect waBounds = nativeParentWindow->screen()->workarea();
       gfx::Point pt = nativeParentWindow->pointToScreen(gfx::Point(x, y));
-      pt.x = std::clamp(pt.x, waBounds.x, waBounds.x2() - w);
-      pt.y = std::clamp(pt.y, waBounds.y, waBounds.y2() - h);
+      pt.x = std::clamp(pt.x, waBounds.x, std::max(waBounds.x, waBounds.x2() - w));
+      pt.y = std::clamp(pt.y, waBounds.y, std::max(waBounds.y, waBounds.y2() - h));
       pt = nativeParentWindow->pointFromScreen(pt);
       x = pt.x;
       y = pt.y;
     }
     else {
       const gfx::Rect displayBounds = display->bounds();
-      x = std::clamp(x, displayBounds.x, displayBounds.x2() - w);
-      y = std::clamp(y, displayBounds.y, displayBounds.y2() - h);
+      x = std::clamp(x, displayBounds.x, std::max(displayBounds.x, displayBounds.x2() - w));
+      y = std::clamp(y, displayBounds.y, std::max(displayBounds.y, displayBounds.y2() - h));
     }
 
     if (m_target.intersects(gfx::Rect(x, y, w, h))) {
diff --git a/src/ui/translation_delegate.h b/src/ui/translation_delegate.h
new file mode 100644
index 000000000..8fc783170
--- /dev/null
+++ b/src/ui/translation_delegate.h
@@ -0,0 +1,29 @@
+// Aseprite UI Library
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef UI_TRANSLATION_DELEGATE_H_INCLUDED
+#define UI_TRANSLATION_DELEGATE_H_INCLUDED
+#pragma once
+
+#include <string>
+
+namespace ui {
+
+// Translates strings displayed in the ui-lib widgets.
+class TranslationDelegate {
+public:
+  virtual ~TranslationDelegate() {}
+
+  // ui::Entry popup
+  virtual std::string copy() { return "&Copy"; }
+  virtual std::string cut() { return "Cu&t"; }
+  virtual std::string paste() { return "&Paste"; }
+  virtual std::string selectAll() { return "Select &All"; }
+};
+
+} // namespace ui
+
+#endif
diff --git a/src/ui/ui.h b/src/ui/ui.h
index ecdd5f0b2..3ac602e27 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -9,7 +9,6 @@
 #define UI_UI_H_INCLUDED
 #pragma once
 
-#include "ui/accelerator.h"
 #include "ui/alert.h"
 #include "ui/app_state.h"
 #include "ui/base.h"
@@ -57,6 +56,7 @@
 #include "ui/scroll_bar.h"
 #include "ui/scroll_helper.h"
 #include "ui/separator.h"
+#include "ui/shortcut.h"
 #include "ui/size_hint_event.h"
 #include "ui/slider.h"
 #include "ui/splitter.h"
@@ -66,6 +66,7 @@
 #include "ui/theme.h"
 #include "ui/timer.h"
 #include "ui/tooltips.h"
+#include "ui/translation_delegate.h"
 #include "ui/view.h"
 #include "ui/viewport.h"
 #include "ui/widget.h"
diff --git a/src/ui/view.cpp b/src/ui/view.cpp
index c70e8400f..2b53710b2 100644
--- a/src/ui/view.cpp
+++ b/src/ui/view.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -186,7 +186,7 @@ void View::updateView(const bool restoreScrollPos)
   // Restore the mouse capture if it changed, which means that a
   // scroll bar (when it was temporarily removed) lost the capture.
   if (man && man->getCapture() != mouseCapture && mouseCapture->isVisible())
-    man->setCapture(mouseCapture);
+    man->setCapture(mouseCapture, true); // Force the capture
 }
 
 Viewport* View::viewport()
diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp
index 4cc1474f9..c5275b0e8 100644
--- a/src/ui/widget.cpp
+++ b/src/ui/widget.cpp
@@ -1,11 +1,12 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
 
 // #define REPORT_SIGNALS
+// #define PAINT_BASELINE 1
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -21,6 +22,7 @@
 #include "os/system.h"
 #include "os/window.h"
 #include "text/font.h"
+#include "text/font_metrics.h"
 #include "text/font_mgr.h"
 #include "ui/app_state.h"
 #include "ui/drag_event.h"
@@ -33,12 +35,18 @@
 #include "ui/paint_event.h"
 #include "ui/resize_event.h"
 #include "ui/save_layout_event.h"
+#include "ui/scale.h"
 #include "ui/size_hint_event.h"
 #include "ui/system.h"
 #include "ui/theme.h"
 #include "ui/view.h"
 #include "ui/window.h"
 
+#if LAF_SKIA && PAINT_BASELINE
+  #include "include/core/SkPathEffect.h"
+  #include "include/effects/SkDashPathEffect.h"
+#endif
+
 #include <algorithm>
 #include <cctype>
 #include <cstdarg>
@@ -951,14 +959,18 @@ text::TextBlobRef Widget::textBlob() const
 int Widget::textWidth() const
 {
   if (auto blob = textBlob())
-    return blob->bounds().w;
+    return std::ceil(blob->bounds().w);
   return 0;
 }
 
 int Widget::textHeight() const
 {
-  auto blob = textBlob();
-  return std::max<int>(font()->height(), (blob ? blob->bounds().h : 0));
+  if (auto blob = textBlob())
+    return blob->textHeight();
+
+  text::FontMetrics metrics;
+  font()->metrics(&metrics);
+  return metrics.descent - metrics.ascent;
 }
 
 void Widget::getTextIconInfo(gfx::Rect* box,
@@ -1013,7 +1025,7 @@ void Widget::getTextIconInfo(gfx::Rect* box,
   if (align() & RIGHT)
     box_x = bounds.x2() - box_w - border().right();
   else if (align() & CENTER) {
-    box_x = CALC_FOR_CENTER(bounds.x + border().top(), bounds.w - border().width(), box_w);
+    box_x = guiscaled_center(bounds.x + border().top(), bounds.w - border().width(), box_w);
   }
   else
     box_x = bounds.x + border().left();
@@ -1021,7 +1033,7 @@ void Widget::getTextIconInfo(gfx::Rect* box,
   if (align() & BOTTOM)
     box_y = bounds.y2() - box_h - border().bottom();
   else if (align() & MIDDLE) {
-    box_y = CALC_FOR_CENTER(bounds.y + border().left(), bounds.h - border().height(), box_h);
+    box_y = guiscaled_center(bounds.y + border().left(), bounds.h - border().height(), box_h);
   }
   else
     box_y = bounds.y + border().top();
@@ -1034,8 +1046,8 @@ void Widget::getTextIconInfo(gfx::Rect* box,
       icon_x = box_x + box_w - icon_w;
     }
     else if (icon_align & CENTER) {
-      text_x = CALC_FOR_CENTER(box_x, box_w, text_w);
-      icon_x = CALC_FOR_CENTER(box_x, box_w, icon_w);
+      text_x = guiscaled_center(box_x, box_w, text_w);
+      icon_x = guiscaled_center(box_x, box_w, icon_w);
     }
     else {
       text_x = box_x + box_w - text_w;
@@ -1048,8 +1060,8 @@ void Widget::getTextIconInfo(gfx::Rect* box,
       icon_y = box_y + box_h - icon_h;
     }
     else if (icon_align & MIDDLE) {
-      text_y = CALC_FOR_CENTER(box_y, box_h, text_h);
-      icon_y = CALC_FOR_CENTER(box_y, box_h, icon_h);
+      text_y = guiscaled_center(box_y, box_h, text_h);
+      icon_y = guiscaled_center(box_y, box_h, icon_h);
     }
     else {
       text_y = box_y + box_h - text_h;
@@ -1068,6 +1080,11 @@ void Widget::getTextIconInfo(gfx::Rect* box,
   SETRECT(icon);
 }
 
+float Widget::textBaseline() const
+{
+  return onGetTextBaseline();
+}
+
 void Widget::setMinSize(const gfx::Size& sz)
 {
   ASSERT(sz.w <= m_maxSize.w);
@@ -1162,6 +1179,16 @@ void Widget::flushRedraw()
   }
 }
 
+void Widget::flushMessages() const
+{
+  Manager* manager = this->manager();
+  ASSERT(manager);
+  if (!manager)
+    return;
+
+  manager->flushMessages();
+}
+
 void Widget::paint(Graphics* graphics, const gfx::Region& drawRegion, const bool isBg)
 {
   if (drawRegion.isEmpty())
@@ -1258,6 +1285,22 @@ bool Widget::paintEvent(Graphics* graphics, const bool isBg)
   PaintEvent ev(this, graphics);
   ev.setTransparentBg(isBg);
   onPaint(ev); // Fire onPaint event
+
+#if LAF_SKIA && PAINT_BASELINE
+  if (hasText()) {
+    // Paint baseline
+    float baseline = textBaseline();
+    Paint paint;
+    paint.color(gfx::rgba(0, 0, 0, 128));
+    paint.blendMode(os::BlendMode::SrcOver);
+    const SkScalar intervals[] = { 2.0f, 2.0f };
+    paint.skPaint().setPathEffect(SkDashPathEffect::Make(intervals, 2, 0.0f));
+    graphics->drawLine(gfx::PointF(clientBounds().x, baseline),
+                       gfx::PointF(clientBounds().x2(), baseline),
+                       paint);
+  }
+#endif
+
   return ev.isPainted();
 }
 
@@ -1434,15 +1477,15 @@ Size Widget::sizeHint(const Size& fitIn)
 {
   if (m_sizeHint)
     return *m_sizeHint;
-  else {
-    SizeHintEvent ev(this, fitIn);
+
+  SizeHintEvent ev(this, fitIn);
+  if (m_theme)
     onSizeHint(ev);
 
-    Size sz(ev.sizeHint());
-    sz.w = std::clamp(sz.w, m_minSize.w, m_maxSize.w);
-    sz.h = std::clamp(sz.h, m_minSize.h, m_maxSize.h);
-    return sz;
-  }
+  Size sz(ev.sizeHint());
+  sz.w = std::clamp(sz.w, m_minSize.w, m_maxSize.w);
+  sz.h = std::clamp(sz.h, m_minSize.h, m_maxSize.h);
+  return sz;
 }
 
 /**
@@ -1507,22 +1550,15 @@ void Widget::releaseMouse()
   }
 }
 
-bool Widget::offerCapture(ui::MouseMessage* mouseMsg, int widget_type)
+bool Widget::offerCapture(ui::MouseMessage* mouseMsg, const WidgetType widgetType)
 {
   if (hasCapture()) {
     const gfx::Point screenPos = mouseMsg->display()->nativeWindow()->pointToScreen(
       mouseMsg->position());
-    auto man = manager();
-    Widget* pick = (man ? man->pickFromScreenPos(screenPos) : nullptr);
-    if (pick && pick != this && pick->type() == widget_type) {
-      releaseMouse();
-
-      MouseMessage* mouseMsg2 = new MouseMessage(kMouseDownMessage,
-                                                 *mouseMsg,
-                                                 mouseMsg->positionForDisplay(pick->display()));
-      mouseMsg2->setDisplay(pick->display());
-      mouseMsg2->setRecipient(pick);
-      man->enqueueMessage(mouseMsg2);
+    Manager* mgr = manager();
+    Widget* pick = (mgr ? mgr->pickFromScreenPos(screenPos) : nullptr);
+    if (pick && pick != this && pick->type() == widgetType) {
+      mgr->transferAsMouseDownMessage(this, pick, mouseMsg);
       return true;
     }
   }
@@ -1637,6 +1673,58 @@ bool Widget::onProcessMessage(Message* msg)
         return true;
       }
       break;
+
+    case kDragEnterMessage: {
+      if (hasFlags(ALLOW_DROP)) {
+        auto* dragEnterMsg = static_cast<DragEnterMessage*>(msg);
+        dragEnterMsg->widget(this);
+        DragEvent event(this, this, dragEnterMsg->event());
+        onDragEnter(event);
+        return true;
+      }
+      break;
+    }
+
+    case kDragLeaveMessage: {
+      auto* dragLeaveMsg = static_cast<DragLeaveMessage*>(msg);
+      DragEvent event(this, this, dragLeaveMsg->event());
+      onDragLeave(event);
+      break;
+    }
+
+    case kDragMessage: {
+      if (hasFlags(ALLOW_DROP)) {
+        auto* dragMsg = static_cast<DragMessage*>(msg);
+        if (dragMsg->widget() && dragMsg->widget() != this) {
+          DragLeaveMessage msg(dragMsg->event());
+          dragMsg->widget()->sendMessage(&msg);
+          dragMsg->widget(nullptr);
+        }
+
+        if (dragMsg->widget() != this) {
+          dragMsg->widget(this);
+          DragEnterMessage msg(dragMsg->event());
+          sendMessage(&msg);
+        }
+
+        DragEvent event(this, this, dragMsg->event());
+        onDrag(event);
+        return true;
+      }
+      break;
+    }
+
+    case kDropMessage: {
+      if (hasFlags(ALLOW_DROP)) {
+        auto* dropMsg = static_cast<DropMessage*>(msg);
+        DragEvent event(this, this, dropMsg->event());
+        onDrop(event);
+        if (event.handled())
+          return true;
+      }
+      break;
+    }
+
     case kCallbackMessage: {
       CallbackMessage* callback = static_cast<CallbackMessage*>(msg);
       callback->call();
@@ -1809,6 +1897,20 @@ text::ShaperFeatures Widget::onGetTextShaperFeatures() const
   return text::ShaperFeatures();
 }
 
+float Widget::onGetTextBaseline() const
+{
+  // Here we use TextBlob::textHeight() which is calculated as
+  // descent+ascent to measure the text height, without the
+  // metrics.leading part (which is the used to separate text lines in
+  // a paragraph, but here'd make widgets too big).
+  text::TextBlobRef blob = textBlob();
+  if (!blob)
+    return 0.0f;
+
+  const gfx::Rect rc = clientChildrenBounds();
+  return guiscaled_center(rc.y, rc.h, blob->textHeight()) + blob->baseline();
+}
+
 void Widget::onDragEnter(DragEvent& e)
 {
 #ifdef _DEBUG
diff --git a/src/ui/widget.h b/src/ui/widget.h
index c40335bd6..44799dfb1 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -288,6 +288,10 @@ public:
                        int icon_w = 0,
                        int icon_h = 0);
 
+  // Y-axis location where the text baseline should be located in the
+  // middle of the widget.
+  float textBaseline() const;
+
   // ===============================================================
   // REFRESH ISSUES
   // ===============================================================
@@ -309,6 +313,10 @@ public:
   // Generates paint messages for the current update region.
   void flushRedraw();
 
+  // Wakes up the system's events queue to process the currently enqueued UI
+  // messages.
+  void flushMessages() const;
+
   GraphicsPtr getGraphics(const gfx::Rect& clip);
 
   // ===============================================================
@@ -336,6 +344,11 @@ public:
 
   void requestFocus();
   void releaseFocus();
+
+  // Captures the mouse to continue receiving its messages until we
+  // release the capture. Useful for widgets with painting-like
+  // capabilities, where we want to keep track of the mouse until the
+  // user releases the mouse button, or drag-and-drop behaviors.
   void captureMouse();
   void releaseMouse();
 
@@ -371,9 +384,9 @@ public:
   // the widget bounds.
   gfx::Point mousePosInClientBounds() const { return toClient(mousePosInDisplay()); }
 
-  // Offer the capture to widgets of the given type. Returns true if
+  // Offers the capture to widgets of the given type. Returns true if
   // the capture was passed to other widget.
-  bool offerCapture(MouseMessage* mouseMsg, int widget_type);
+  bool offerCapture(MouseMessage* mouseMsg, WidgetType widgetType);
 
   // Returns lower-case letter that represet the mnemonic of the widget
   // (the underscored character, i.e. the letter after & symbol).
@@ -430,6 +443,7 @@ protected:
   virtual double onGetTextDouble() const;
   virtual text::TextBlobRef onMakeTextBlob() const;
   virtual text::ShaperFeatures onGetTextShaperFeatures() const;
+  virtual float onGetTextBaseline() const;
 
   virtual void onDragEnter(DragEvent& e);
   virtual void onDragLeave(DragEvent& e);
@@ -471,8 +485,6 @@ private:
 
   gfx::Border m_border; // Border separation with the parent
   int m_childSpacing;   // Separation between children
-
-  friend Manager;
 };
 
 WidgetType register_widget_type();
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 8bf62f0aa..38f6fc9f5 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -654,7 +654,7 @@ void Window::onSizeHint(SizeHintEvent& ev)
 
     for (auto child : children()) {
       if (!child->isDecorative()) {
-        reqSize = child->sizeHint();
+        reqSize = child->sizeHint(ev.fitInSize());
 
         maxSize.w = std::max(maxSize.w, reqSize.w);
         maxSize.h = std::max(maxSize.h, reqSize.h);
diff --git a/src/undo b/src/undo
index 62c5a85ed..2209ac5d3 160000
--- a/src/undo
+++ b/src/undo
@@ -1 +1 @@
-Subproject commit 62c5a85edaceb4777ded56f822aa4d6f0a8de16f
+Subproject commit 2209ac5d36e59d7c85e48df7cb32cb0cd3abf38b
diff --git a/tests/cli/sheet.sh b/tests/cli/sheet.sh
index 257bab51e..6c4c37517 100644
--- a/tests/cli/sheet.sh
+++ b/tests/cli/sheet.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (C) 2019-2022 Igara Studio S.A.
+# Copyright (C) 2019-2025 Igara Studio S.A.
 
 # $1 = first sprite sheet json file
 # $2 = second sprite sheet json file
@@ -416,3 +416,38 @@ t = tags["tags3-reverse"]  assert(t.from == 4 and t.to == 7)
 t = tags["tags3-pingpong"] assert(t.from == 8 and t.to == 11)
 EOF
 $ASEPRITE -b -script "$d/compare.lua" || exit 1
+
+# https://github.com/aseprite/aseprite/issues/5053
+# --export-tileset in different pixel formats
+d=$t/export-tileset
+$ASEPRITE -b -export-tileset "sprites/2x2tilemap2x2tile.aseprite" "sprites/2x3tilemap-indexed.aseprite" "sprites/3x2tilemap-grayscale.aseprite" \
+          -data "$d/tilesets.json" \
+          -format json-array \
+          -sheet "$d/tilesets.png" || exit 1
+cat >$d/compare.lua <<EOF
+local file = app.params["file"]
+local spriteSheet = Sprite{ fromFile=file }
+local sheetImage = spriteSheet.layers[1].cels[1].image
+local filenames = { "sprites/2x2tilemap2x2tile.aseprite", "sprites/2x3tilemap-indexed.aseprite", "sprites/3x2tilemap-grayscale.aseprite" }
+local origins = { Point(0, 0), Point(0, 2), Point(0, 5) }
+for k=1, #filenames do
+  local spr = Sprite{ fromFile=filenames[k] }
+  if spr.colorMode ~= spriteSheet.colorMode then
+    app.sprite = spr
+    app.command.ChangePixelFormat { format="rgb" }
+  end
+  local ts = spr.layers[1].tileset
+  local origin = origins[k]
+  for i=0, #ts-1 do
+    local tileImage = ts:getTile(i)
+    local offset = Point(origin.x + i*tileImage.width, origin.y)
+    for y=0, tileImage.height-1 do
+      for x=0, tileImage.width-1 do
+        assert(tileImage:getPixel(x, y) == sheetImage:getPixel(offset.x + x, offset.y + y))
+      end
+    end
+  end
+end
+EOF
+$ASEPRITE -b -script-param file=$d/tilesets.png \
+          -script "$d/compare.lua" || exit 1
diff --git a/tests/scripts/events.lua b/tests/scripts/events.lua
index ff10fe3d0..a0e2b7aa6 100644
--- a/tests/scripts/events.lua
+++ b/tests/scripts/events.lua
@@ -184,3 +184,79 @@ do
   s:close()
   app.events:off(onSiteChange)
 end
+
+-- Test Layer events
+-- BlendMode
+do
+  local sprite = Sprite(32, 32)
+  local eventCount = 0
+  function onBlendMode() eventCount = eventCount + 1 end
+
+  sprite.events:on('layerblendmode', onBlendMode)
+  sprite.layers[1].blendMode = BlendMode.MULTIPLY
+  expect_eq(1, eventCount)
+  sprite.layers[1].blendMode = BlendMode.SUBTRACT
+  expect_eq(2, eventCount)
+
+  sprite.events:off(onBlendMode)
+
+  sprite.layers[1].blendMode = BlendMode.DIVIDE
+  expect_eq(2, eventCount)
+end
+
+-- Name
+do
+  local sprite = Sprite(32, 32)
+  local eventCount = 0
+  function onLayerName() eventCount = eventCount + 1 end
+
+  sprite.events:on('layername', onLayerName)
+  sprite.layers[1].name = "Name 1"
+  expect_eq(1, eventCount)
+  sprite.layers[1].name = "Name 2"
+  expect_eq(2, eventCount)
+
+  sprite.events:off(onLayerName)
+
+  sprite.layers[1].name = "Name 3"
+  expect_eq(2, eventCount)
+end
+
+-- Opacity
+do
+  local sprite = Sprite(32, 32)
+  local eventCount = 0
+  function onLayerOpacity() eventCount = eventCount + 1 end
+
+  sprite.events:on('layeropacity', onLayerOpacity)
+  sprite.layers[1].opacity = 55
+  expect_eq(1, eventCount)
+  sprite.layers[1].opacity = 200
+  expect_eq(2, eventCount)
+
+  sprite.events:off(onLayerOpacity)
+
+  sprite.layers[1].opacity = 0
+  expect_eq(2, eventCount)
+end
+
+-- Visibility
+do
+  local sprite = Sprite(32, 32)
+  local eventCount = 0
+  function onLayerVisibility() eventCount = eventCount + 1 end
+
+  sprite.events:on('layervisibility', onLayerVisibility)
+  sprite.layers[1].isVisible = false
+  expect_eq(1, eventCount)
+  sprite.layers[1].isVisible = true
+  expect_eq(2, eventCount)
+  -- Events can trigger even when the value doesn't technically change:
+  sprite.layers[1].isVisible = true
+  expect_eq(3, eventCount)
+
+  sprite.events:off(onLayerVisibility)
+
+  sprite.layers[1].isVisible = false
+  expect_eq(3, eventCount)
+end
diff --git a/tests/scripts/image.lua b/tests/scripts/image.lua
index 9b59df523..6be4ebc5d 100644
--- a/tests/scripts/image.lua
+++ b/tests/scripts/image.lua
@@ -1,4 +1,4 @@
--- Copyright (C) 2019-2024  Igara Studio S.A.
+-- Copyright (C) 2019-2025  Igara Studio S.A.
 -- Copyright (C) 2018  David Capello
 --
 -- This file is released under the terms of the MIT license.
@@ -64,6 +64,108 @@ do
                     1, 2 })
 end
 
+-- Clear command with an image which is linked to a sprite
+-- Clear command on RGBA images
+do
+  local spr = Sprite(4, 4, ColorMode.RGB)
+  local image = Image(2, 2, ColorMode.RGB)
+  local mask = app.pixelColor.rgba(0, 0, 0, 0)
+  local imageCols = { app.pixelColor.rgba(255, 0, 0), app.pixelColor.rgba(0, 255, 0),
+                      mask                          , app.pixelColor.rgba(0, 0  , 255) }
+  array_to_pixels(imageCols, image)
+  expect_img(image, imageCols)
+  spr:newCel(app.layer, 1, image, Point(2, 2))
+  image:clear()
+  expect_img(image, { mask, mask,
+                      mask, mask })
+
+  array_to_pixels(imageCols, image)
+  spr.layers[1]:cel(1).image = image
+  spr.layers[1]:cel(1).position = Point(2, 2)
+  image:clear(Rectangle(0, 0, 2, 1))
+  expect_img(image, { mask        , mask,
+                      imageCols[3], imageCols[4] })
+  app.undo()
+  -- Re-catch the cel image (TODO: 'image' variable should retain the link of the cel image)
+  image = spr.layers[1]:cel(1).image
+  expect_img(image, imageCols)
+
+  local yellow = app.pixelColor.rgba(128, 128, 0)
+  image:clear(Rectangle(0, 0, 2, 1), yellow)
+  expect_img(image, { yellow       , yellow,
+                      imageCols[3] , imageCols[4] })
+  app.undo()
+  expect_img(image, imageCols)
+end
+
+-- Clear command on Grayscale images
+do
+  local spr = Sprite(4, 4, ColorMode.GRAY)
+  local image = Image(2, 2, ColorMode.GRAY)
+  local mask = app.pixelColor.graya(0, 0)
+  local imageCols = { app.pixelColor.graya(255), app.pixelColor.graya(127),
+                      mask                     , app.pixelColor.graya(63) }
+  array_to_pixels(imageCols, image)
+  expect_img(image, imageCols)
+  spr:newCel(app.layer, 1, image, Point(2, 2))
+  image:clear()
+  expect_img(image, { mask, mask,
+                      mask, mask })
+
+  array_to_pixels(imageCols, image)
+  spr.layers[1]:cel(1).image = image
+  spr.layers[1]:cel(1).position = Point(2, 2)
+  image:clear(Rectangle(0, 0, 2, 1))
+  expect_img(image, { mask        , mask,
+                      imageCols[3], imageCols[4] })
+  app.undo()
+  -- Re-catch the cel image (TODO: 'image' variable should retain the link of the cel image)
+  image = spr.layers[1]:cel(1).image
+  expect_img(image, imageCols)
+
+  local white200 =  app.pixelColor.graya(200)
+  image:clear(Rectangle(0, 0, 2, 1),white200)
+  expect_img(image, { white200     , white200,
+                      imageCols[3] , imageCols[4] })
+  app.undo()
+  expect_img(image, imageCols)
+end
+
+-- Clear command on Indexed images
+do
+  local spr = Sprite(4, 4, ColorMode.INDEXED)
+  local image = Image(2, 2, ColorMode.INDEXED)
+  spr.palettes[1]:setColor(1, Color(255, 0  , 0))
+  spr.palettes[1]:setColor(2, Color(0  , 255, 0))
+  spr.palettes[1]:setColor(3, Color(0  , 0  , 255))
+
+  local imageCols = { 1, 2,
+                      0, 3 }
+  array_to_pixels(imageCols, image)
+  expect_img(image, imageCols)
+  spr:newCel(app.layer, 1, image, Point(2, 2))
+  image:clear()
+  expect_img(image, { 0, 0,
+                      0, 0 })
+
+  array_to_pixels(imageCols, image)
+  spr.layers[1]:cel(1).image = image
+  spr.layers[1]:cel(1).position = Point(2, 2)
+  image:clear(Rectangle(0, 0, 2, 1))
+  expect_img(image, { 0           , 0,
+                      imageCols[3], imageCols[4] })
+  app.undo()
+  -- Re-catch the cel image (TODO: 'image' variable should retain the link of the cel image)
+  image = spr.layers[1]:cel(1).image
+  expect_img(image, imageCols)
+
+  image:clear(Rectangle(0, 0, 2, 1), 4)
+  expect_img(image, { 4            , 4,
+                      imageCols[3] , imageCols[4] })
+  app.undo()
+  expect_img(image, imageCols)
+end
+
 -- Clone
 do
   local c = Image(a)
@@ -352,6 +454,33 @@ do
 
 end
 
+-- Tests using Image:drawImage() with BlendMode::SRC + ColorMode.RGBA
+do
+  local __ = Color(0, 0, 0, 0).rgbaPixel
+  local oo = Color(255, 255, 255, 0).rgbaPixel
+  local xx = Color(127, 127, 127, 127).rgbaPixel
+  local rr = Color(255, 0, 0).rgbaPixel
+  local BG = Color(127, 127, 127).rgbaPixel
+
+  local a_rgb = Image(3, 2, ColorMode.RGBA)
+  array_to_pixels({ __, rr, xx,
+                    oo, rr, __ }, a_rgb)
+  local b_rgb = Image(4, 4, ColorMode.RGBA)
+  b_rgb:clear(BG)
+  b_rgb:drawImage(a_rgb, Point(0, 1), 255, BlendMode.SRC)
+  expect_img(b_rgb, { BG, BG, BG, BG,
+                      __, rr, xx, BG,
+                      oo, rr, __, BG,
+                      BG, BG, BG, BG })
+
+  b_rgb:clear(BG)
+  b_rgb:drawImage(a_rgb, Point(-1, 2), 255, BlendMode.SRC)
+  expect_img(b_rgb, { BG, BG, BG, BG,
+                      BG, BG, BG, BG,
+                      rr, xx, BG, BG,
+                      rr, __, BG, BG })
+end
+
 -- Tests using Image:drawImage() with opacity and blend modes
 do
   local spr = Sprite(3, 3, ColorMode.RGB)
diff --git a/tests/scripts/layer.lua b/tests/scripts/layer.lua
index 6eb6ec083..24aaffe0c 100644
--- a/tests/scripts/layer.lua
+++ b/tests/scripts/layer.lua
@@ -20,3 +20,44 @@ do
   l.data = "Data"
   assert(l.data == "Data")
 end
+
+-- Test layer uuid with useLayerUuids enabled
+do
+  local s = Sprite(32, 32)
+  local l = s.layers[1]
+  assert(s.useLayerUuids == false)
+
+  local uuid = l.uuid
+  assert(uuid ~= nil)
+
+  s.useLayerUuids = true
+
+  assert(s.useLayerUuids == true)
+  s.filename = "_test_layer_uuid.aseprite"
+  app.command.SaveFile()
+  app.command.CloseFile()
+
+  app.command.OpenFile { filename = "_test_layer_uuid.aseprite" }
+  assert(app.sprite.useLayerUuids == true)
+  assert(app.sprite.layers[1].uuid == uuid)
+end
+
+-- Test layer uuid with useLayerUuids disabled
+do
+  local s = Sprite(32, 32)
+  local l = s.layers[1]
+  assert(s.useLayerUuids == false)
+
+  local uuid = l.uuid
+  assert(uuid ~= nil)
+
+  s.filename = "_test_layer_uuid_2.aseprite"
+  app.command.SaveFile()
+  app.command.CloseFile()
+
+  app.command.OpenFile { filename = "_test_layer_uuid_2.aseprite" }
+  assert(app.sprite.useLayerUuids == false)
+  -- UUIDs are not equal because it was not saved due to useLayerUuids being
+  -- disabled at the time of saving the file.
+  assert(app.sprite.layers[1].uuid ~= uuid)
+end
diff --git a/tests/scripts/os.lua b/tests/scripts/os.lua
index f18060237..0c2dd9a30 100644
--- a/tests/scripts/os.lua
+++ b/tests/scripts/os.lua
@@ -12,3 +12,13 @@ print("Start ", start_clock)
 local end_clock = os.clock()
 print("End ", end_clock, " Elapsed ", end_clock - start_clock)
 assert(start_clock < end_clock)
+
+-- os.rename & remove
+assert(app.fs.makeDirectory("_os_tmp"))
+assert(os.rename("_os_tmp", "_os_tmp_renamed"))
+assert(not os.rename("_os_tmp", "_os_tmp_shouldfail"))
+assert(not os.remove("_os_tmp_shouldfail"))
+assert(not os.rename("_os_tmp_shouldfail", "_test1.png")) -- Should fail, already exists
+assert(os.remove("_os_tmp_renamed"))
+assert(not app.fs.isDirectory("_os_tmp"))
+assert(not app.fs.isDirectory("_os_tmp_renamed"))
diff --git a/tests/scripts/sprite.lua b/tests/scripts/sprite.lua
index ac964eada..a7a61efcc 100644
--- a/tests/scripts/sprite.lua
+++ b/tests/scripts/sprite.lua
@@ -228,3 +228,69 @@ do
   c = app.open(fn)
   assert(c.tileManagementPlugin == nil)
 end
+
+-- Undo History
+
+function test_undo_history()
+  local sprite = Sprite(1, 1)
+
+  assert(sprite.undoHistory.undoSteps == 0)
+  assert(sprite.undoHistory.redoSteps == 0)
+
+  sprite:resize(10, 10)
+
+  assert(sprite.undoHistory.undoSteps == 1)
+  assert(sprite.undoHistory.redoSteps == 0)
+
+  sprite:resize(10, 15)
+
+  assert(sprite.undoHistory.undoSteps == 2)
+  assert(sprite.undoHistory.redoSteps == 0)
+
+  sprite:resize(10, 30)
+
+  assert(sprite.undoHistory.undoSteps == 3)
+  assert(sprite.undoHistory.redoSteps == 0)
+
+  app.undo()
+  assert(sprite.undoHistory.undoSteps == 2)
+  assert(sprite.undoHistory.redoSteps == 1)
+
+  app.undo()
+  assert(sprite.undoHistory.undoSteps == 1)
+  assert(sprite.undoHistory.redoSteps == 2)
+
+  app.redo()
+  assert(sprite.undoHistory.undoSteps == 2)
+  assert(sprite.undoHistory.redoSteps == 1)
+
+  app.undo()
+  app.undo()
+
+  assert(sprite.undoHistory.undoSteps == 0)
+  assert(sprite.undoHistory.redoSteps == 3)
+
+  sprite:resize(10, 30)
+
+  if (app.preferences.undo.allow_nonlinear_history) then
+    assert(sprite.undoHistory.undoSteps == 4)
+    assert(sprite.undoHistory.redoSteps == 0)
+  else
+    assert(sprite.undoHistory.undoSteps == 1)
+    assert(sprite.undoHistory.redoSteps == 0)
+  end
+end
+
+do
+  local prevSetting = app.preferences.undo.allow_nonlinear_history
+  app.preferences.undo.allow_nonlinear_history = true
+  test_undo_history()
+  app.preferences.undo.allow_nonlinear_history = prevSetting
+end
+
+do
+  local prevSetting = app.preferences.undo.allow_nonlinear_history
+  app.preferences.undo.allow_nonlinear_history = false
+  test_undo_history()
+  app.preferences.undo.allow_nonlinear_history = prevSetting
+end
diff --git a/tests/scripts/userdata_json.lua b/tests/scripts/userdata_json.lua
new file mode 100644
index 000000000..c16b73e00
--- /dev/null
+++ b/tests/scripts/userdata_json.lua
@@ -0,0 +1,92 @@
+-- Copyright (C) 2024  Igara Studio S.A.
+-- Released under the MIT license. See LICENSE.txt.
+
+dofile('./test_utils.lua')
+
+-- Helper to export sprite to JSON and parse it
+local function export_json(sprite, filename)
+  local out_json = "_test_userdata_json.json"
+  local out_png  = "_test_userdata_json.png"
+  local out_ase  = "_test_userdata_json.aseprite"
+
+  print("Exporting to:")
+  print("  out_json: " .. out_json)
+  print("  out_png:  " .. out_png)
+  print("  out_ase:  " .. out_ase)
+
+  sprite:saveAs(out_ase)
+  app.command.ExportSpriteSheet{
+    ui=false,
+    type=SpriteSheetType.PACKED,
+    data=SpriteSheetDataFormat.JSON_HASH,
+    dataFilename=out_json,
+    textureFilename=out_png
+  }
+  sprite:close()
+
+  print("Trying to open: " .. out_json)
+  local f = io.open(out_json, "r")
+  if not f then
+    print("FAILED to open: " .. out_json)
+  end
+  local content = f and f:read("*a") or ""
+  if f then f:close() end
+  return json.decode(content)
+end
+
+do
+  -- Create a sprite and set various user/extension properties
+  local spr = Sprite(16, 16)
+  spr.properties.user_defined_data = true
+  spr.properties("my_plugin").extension_defined_data = "sample data"
+
+  spr:newLayer()
+  spr.layers[2].properties.user_defined_data = true
+  spr.layers[2].properties("my_plugin").extension_defined_data = "sample data"
+
+  spr:newTag(0, 0)
+  spr.tags[1].properties.user_defined_data = "sample data"
+  spr.tags[1].properties("my_plugin").extension_defined_data = 42
+
+  spr:newCel(spr.layers[2], 1)
+  spr.layers[2].cels[1].properties.user_defined_data = 42
+  spr.layers[2].cels[1].properties("my_plugin").extension_defined_data = "sample data"
+
+  spr:newSlice(0, 0, 8, 8)
+  spr.slices[1].properties.user_defined_data = "sample data"
+  spr.slices[1].properties("my_plugin").extension_defined_data = false
+
+  local meta = export_json(spr, "_test_userdata_json.aseprite").meta
+
+  -- Sprite properties
+  if meta.properties then
+    assert(meta.properties.user_defined_data == true)
+    assert(meta.properties["my_plugin"].foo == "sample data")
+  end
+
+  -- Layer properties
+  local layer = meta.layers[2]
+  assert(layer ~= nil)
+  assert(layer.properties.user_defined_data == true)
+  assert(layer.properties["my_plugin"].extension_defined_data == "sample data")
+
+  -- Tag properties
+  local tag = meta.frameTags[1]
+  assert(tag ~= nil)
+  assert(tag.properties.user_defined_data == "sample data")
+  assert(tag.properties["my_plugin"].extension_defined_data == 42)
+
+  -- Cel properties
+  local cel = meta.layers[2].cels and meta.layers[2].cels[1]
+  assert(cel ~= nil)
+  assert(cel.properties.user_defined_data == 42)
+  assert(cel.properties["my_plugin"].extension_defined_data == "sample data")
+
+  -- Slice properties
+  local slice = meta.slices[1]
+  assert(slice ~= nil)
+  assert(slice.properties.user_defined_data == "sample data")
+  assert(slice.properties["my_plugin"].extension_defined_data == false)
+end
+
+print("userdata_json.lua: All user data JSON export tests passed!")
diff --git a/tests/sprites/2x3tilemap-indexed.aseprite b/tests/sprites/2x3tilemap-indexed.aseprite
new file mode 100644
index 000000000..714b0abe3
Binary files /dev/null and b/tests/sprites/2x3tilemap-indexed.aseprite differ
diff --git a/tests/sprites/3x2tilemap-grayscale.aseprite b/tests/sprites/3x2tilemap-grayscale.aseprite
new file mode 100644
index 000000000..3a4293388
Binary files /dev/null and b/tests/sprites/3x2tilemap-grayscale.aseprite differ
diff --git a/tests/sprites/README.md b/tests/sprites/README.md
index 6f8aecdab..a28d00c78 100644
--- a/tests/sprites/README.md
+++ b/tests/sprites/README.md
@@ -36,3 +36,7 @@
   different position/size).
 * `2x2tilemap2x2tile.aseprite`: RGB, 6x6, 2x2 tilemap layer, 5 tiles tileset,
   2x2 tile size, 1 frame.
+* `2x3tilemap-indexed.aseprite`: Indexed, 4x5, 1 tilemap layer,
+  5 tiles tileset, 2x3 tile size, 3 frames
+* `3x2tilemap-grayscale.aseprite`: Grayscale, 6x6, 2 layers (one of them
+  is a tilemap), 4 cels, 4 tiles tileset, 3x2 tile size, 4 frames
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 56c345ce7..70c8e3d52 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Aseprite
-# Copyright (C) 2021-2024  Igara Studio S.A.
+# Copyright (C) 2021-2025  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 include_directories(.)
@@ -12,7 +12,9 @@ if(NOT USE_SHARED_ZLIB)
   set(SKIP_INSTALL_ALL on)
   # Don't build zlib tests
   set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "Enable Zlib Examples")
+  set(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/zlib" CACHE INTERNAL "")
   add_subdirectory(zlib)
+  add_library(ZLIB::ZLIB ALIAS zlibstatic)
 endif()
 
 if(NOT USE_SHARED_LIBPNG)
@@ -145,6 +147,7 @@ set(ENABLE_TAR OFF CACHE BOOL "Enable tar building")
 set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building")
 set(ENABLE_LIBB2 OFF CACHE BOOL "Enable the use of the system LIBB2 library if found")
 set(ENABLE_ICONV OFF CACHE BOOL "Enable iconv support")
+set(WINDOWS_VERSION "WS08" CACHE STRING "Set Windows Vista as the target version for compiling libarchive (Windows only)" FORCE)
 add_subdirectory(libarchive)
 target_include_directories(archive_static INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
diff --git a/third_party/TinyEXIF b/third_party/TinyEXIF
index 2283d8094..21d6cf762 160000
--- a/third_party/TinyEXIF
+++ b/third_party/TinyEXIF
@@ -1 +1 @@
-Subproject commit 2283d8094e42e6b6cef00d1d31ecadfe0d9e1f29
+Subproject commit 21d6cf762724260f8e5bcee4abdee5411ae47813
diff --git a/third_party/cmark b/third_party/cmark
index 186592f7f..9e2a6540f 160000
--- a/third_party/cmark
+++ b/third_party/cmark
@@ -1 +1 @@
-Subproject commit 186592f7ff021cd20c5e758239934a3b7848d51f
+Subproject commit 9e2a6540f1a83720bab8b914dbf446fcea2238e0
diff --git a/third_party/giflib b/third_party/giflib
index d213f633e..94a7edbf5 160000
--- a/third_party/giflib
+++ b/third_party/giflib
@@ -1 +1 @@
-Subproject commit d213f633ea7a38cc84cb60eada04d56ba8fa8779
+Subproject commit 94a7edbf52f8a0c0e2ee4ee210784c2d72012ac1
diff --git a/third_party/harfbuzz b/third_party/harfbuzz
index 3412c32b3..d14c2d176 160000
--- a/third_party/harfbuzz
+++ b/third_party/harfbuzz
@@ -1 +1 @@
-Subproject commit 3412c32b35db911832c0b396894203899f8f5157
+Subproject commit d14c2d1764f800d31b51893fb3d1e05d77a9280b
diff --git a/third_party/json11 b/third_party/json11
index f1ff45a7c..a4e1714f5 160000
--- a/third_party/json11
+++ b/third_party/json11
@@ -1 +1 @@
-Subproject commit f1ff45a7cd3781ab2d6bfaa8552a74172b5e6a73
+Subproject commit a4e1714f5592dbe9a9f11539e6f8742477f1d6b6
diff --git a/third_party/libarchive b/third_party/libarchive
index fb3d9be28..7bde8b825 160000
--- a/third_party/libarchive
+++ b/third_party/libarchive
@@ -1 +1 @@
-Subproject commit fb3d9be28cfd4551de949bb5b8c44b1d6e2aec9b
+Subproject commit 7bde8b8259921f2dcbb31a664ceb298b819d29dc
diff --git a/third_party/libpng b/third_party/libpng
index f135775ad..34005e3d3 160000
--- a/third_party/libpng
+++ b/third_party/libpng
@@ -1 +1 @@
-Subproject commit f135775ad4e5d4408d2e12ffcc71bb36e6b48551
+Subproject commit 34005e3d3d373c0c36898cc55eae48a79c8238a1