Merge branch 'tahoma2d:master' into Updates_To_Build_Win

2021-05-13 21:13:25 -04:00 · 2021-05-13 21:13:25 -04:00 · e5df12a181
parent 0672b36eb5 a6b6269c7c
commit e5df12a181
810 changed files with 81751 additions and 21977 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -8,7 +8,6 @@ assignees: ''
 ---

 <!-- Please search for existing issues to avoid creating duplicates. -->
-<!-- And please test using the latest nightly build to make sure your issue has not already been fixed: https://github.com/turtletooth/tahoma2d/releases/tag/nightly/ -->

 **Describe the bug**
 A clear and concise description of what the bug is.
@ -19,8 +18,12 @@ List steps to reproduce the behavior.
 2.
 3.

-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Screenshots, short videos or logs**
+If applicable, add screenshots or links to short videos to help explain your problem or provide logs or dmp files if it's a crash.
+
+<!--Crash logs or dmp files may be found under the following:-->
+<!-- Windows crash dmp: C:\Users\yourusername\AppData\Local\Tahoma2D\Tahoma2D\cache\crashrpt\xxxx\crashdump.dmp -->
+<!-- macOS crash logs: Console App -> User Reports.  Look for Tahoma2D crash report -->

 **Device Information:**
 - OS: [e.g. Windows]
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@ -7,24 +7,96 @@ jobs:
    runs-on: ubuntu-16.04
    strategy:
      matrix:
-        compiler: [ clang ]
+        compiler: [ gcc, clang ]
        include:
+          - compiler: gcc
+            cc: gcc
+            cxx: g++
          - compiler: clang
            cc: clang
            cxx: clang++
    steps:
      - uses: actions/checkout@v2
      - name: Install Dependencies
-        run: bash ./ci-scripts/linux/tahoma-install.sh
+        run: |
+          ci-scripts/linux/tahoma-install.sh
+          sudo apt-get install ccache
+      - uses: actions/cache@v2
+        with:
+          path: |
+            /home/runner/.ccache
+            /home/runner/work/tahoma2d/taoma2d/thirdparty/openh264
+            /home/runner/work/tahoma2d/taoma2d/thirdparty/ffmpeg
+            /home/runner/work/tahoma2d/taoma2d/thirdparty/opencv
+          key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.compiler }}-
+            ${{ runner.os }}-
      - name: Build ffmpeg
-        run: bash ./ci-scripts/linux/tahoma-buildffmpeg.sh
+        run: |
+          export CC="ccache ${{ matrix.cc }}"
+          export CXX="ccache ${{ matrix.cxx }}"
+          ci-scripts/linux/tahoma-buildffmpeg.sh
      - name: Build OpenCV
-        run: bash ./ci-scripts/linux/tahoma-buildopencv.sh
+        run: |
+          export CC="ccache ${{ matrix.cc }}"
+          export CXX="ccache ${{ matrix.cxx }}"
+          ci-scripts/linux/tahoma-buildopencv.sh
+      - name: Build libmypaint
+        run: |
+          export CC="ccache ${{ matrix.cc }}"
+          export CXX="ccache ${{ matrix.cxx }}"
+          ci-scripts/linux/tahoma-buildlibmypaint.sh
      - name: Build Tahoma2D
-        run: bash ./ci-scripts/linux/tahoma-build.sh
+        run: |
+          export CC="ccache ${{ matrix.cc }}"
+          export CXX="ccache ${{ matrix.cxx }}"
+          ci-scripts/linux/tahoma-build.sh
+      - name: Get 3rd Party Apps
+        run: |
+          ci-scripts/linux/tahoma-get3rdpartyapps.sh
      - name: Create Package
-        run: bash ./ci-scripts/linux/tahoma-buildpkg.sh
+        run: |
+          ci-scripts/linux/tahoma-buildpkg.sh
+          mv toonz/build/Tahoma2D-linux.tar.gz toonz/build/Tahoma2D-linux-${{ matrix.compiler }}.tar.gz
      - uses: actions/upload-artifact@v1
        with:
-          name: Tahoma2D-linux.tar.gz
-          path: toonz/build/Tahoma2D-linux.tar.gz
+          name: Tahoma2D-linux-${{ matrix.compiler }}.tar.gz
+          path: toonz/build/Tahoma2D-linux-${{ matrix.compiler }}.tar.gz
+      - name: Get Nightly Release Date
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        run: |
+          echo "NIGHTLYDATE=$(date '+%Y-%m-%d')" >> $GITHUB_ENV
+          echo "NIGHTLYDATETIME=$(date '+%Y-%m-%d %H:%M:%S %Z')" >> $GITHUB_ENV
+      - name: Update Latest Nightly Release
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifactErrorsFailBuild: false
+          artifacts: toonz/build/Tahoma2D-linux-${{ matrix.compiler }}.tar.gz
+          artifactContentType: "raw"
+          body: ${{ github.event.head_commit.message }}
+          name: Lastest Nightly ${{ env.NIGHTLYDATE }}
+          prerelease: true
+          replacesArtifacts: true
+          tag: nightly
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Nightlies Release
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifactErrorsFailBuild: false
+          artifacts: toonz/build/Tahoma2D-linux-${{ matrix.compiler }}.tar.gz
+          artifactContentType: "raw"
+          body: ${{ github.event.head_commit.message }}
+          name: ${{ env.NIGHTLYDATETIME }}
+          omitBodyDuringUpdate: true
+          omitNameDuringUpdate: true
+          owner: tahoma2d	  
+          prerelease: true
+          replacesArtifacts: true
+          repo: tahoma2d_nightlies
+          tag: nightly-${{ github.sha }}
+          token: ${{ secrets.TAHOMA2D_TOKEN }}
--- a/.github/workflows/macOS_build.yml
+++ b/.github/workflows/macOS_build.yml
@ -8,16 +8,89 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Install Dependencies
-        run: bash ./ci-scripts/osx/tahoma-install.sh
+        run: |
+          ci-scripts/osx/tahoma-install.sh
+          brew install ccache
+          mkdir /Users/runner/.ccache
+      - uses: actions/cache@v2
+        with:
+          path: |
+            /Users/runner/.ccache
+            /Users/runner/work/tahoma2d/taoma2d/thirdparty/aom
+            /Users/runner/work/tahoma2d/taoma2d/thirdparty/ffmpeg
+            /Users/runner/work/tahoma2d/taoma2d/thirdparty/opencv
+          key: ${{ runner.os }}-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-
+      - name: Get CanonSDK
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          wget --header="Authorization: token ${{ secrets.TAHOMA2D_TOKEN }}" --header="Accept:application/octet-stream" -O EDSDK_v131231_Macintosh.zip https://api.github.com/repos/tahoma2d/CanonSDK/releases/assets/25267390
+          unzip EDSDK_v131231_Macintosh.zip -d EDSDK_v131231_Macintosh
+          unzip EDSDK_v131231_Macintosh/Macintosh.dmg.zip -d EDSDK_v131231_Macintosh
+          7z x EDSDK_v131231_Macintosh/Macintosh.dmg -oEDSDK_v131231_Macintosh
+          mv EDSDK_v131231_Macintosh/Macintosh/EDSDK/* thirdparty/canon
+          cd thirdparty/canon/framework/EDSDK.framework/Versions
+          rm Current
+          ln -s A Current
+          cd ..
+          rm Resources EDSDK
+          ln -s Versions/Current/Resources Resources
+          ln -s Versions/Current/EDSDK EDSDK
+      - name: Get 3rd Party Apps
+        run: |
+          ci-scripts/osx/tahoma-get3rdpartyapps.sh
      - name: Build ffmpeg
-        run: bash ./ci-scripts/osx/tahoma-buildffmpeg.sh
+        run: |
+          export PATH="/usr/local/opt/ccache/libexec:$PATH"
+          ci-scripts/osx/tahoma-buildffmpeg.sh
      - name: Build OpenCV
-        run: bash ./ci-scripts/osx/tahoma-buildopencv.sh
+        run: |
+          export PATH="/usr/local/opt/ccache/libexec:$PATH"
+          ci-scripts/osx/tahoma-buildopencv.sh
      - name: Build Tahoma2D
-        run: bash ./ci-scripts/osx/tahoma-build.sh
+        run: |
+          export PATH="/usr/local/opt/ccache/libexec:$PATH"
+          ci-scripts/osx/tahoma-build.sh
      - name: Create Package
        run: bash ./ci-scripts/osx/tahoma-buildpkg.sh
      - uses: actions/upload-artifact@v1
        with:
          name: Tahoma2D-osx.dmg
          path: toonz/build/Tahoma2D-osx.dmg
+      - name: Get Nightly Release Date
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        run: |
+          echo "NIGHTLYDATE=$(date '+%Y-%m-%d')" >> $GITHUB_ENV
+          echo "NIGHTLYDATETIME=$(date '+%Y-%m-%d %H:%M:%S %Z')" >> $GITHUB_ENV
+      - name: Update Latest Nightly Release
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifactErrorsFailBuild: false
+          artifacts: toonz/build/Tahoma2D-osx.dmg
+          artifactContentType: "raw"
+          body: ${{ github.event.head_commit.message }}
+          name: Lastest Nightly ${{ env.NIGHTLYDATE }}
+          prerelease: true
+          replacesArtifacts: true
+          tag: nightly
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Nightlies Release
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifactErrorsFailBuild: false
+          artifacts: toonz/build/Tahoma2D-osx.dmg
+          artifactContentType: "raw"
+          body: ${{ github.event.head_commit.message }}
+          name: ${{ env.NIGHTLYDATETIME }}
+          omitBodyDuringUpdate: true
+          omitNameDuringUpdate: true
+          owner: tahoma2d	  
+          prerelease: true
+          replacesArtifacts: true
+          repo: tahoma2d_nightlies
+          tag: nightly-${{ github.sha }}
+          token: ${{ secrets.TAHOMA2D_TOKEN }}
--- a/.github/workflows/windows_build.yml
+++ b/.github/workflows/windows_build.yml
@ -0,0 +1,79 @@
+name: Tahoma2D Windows Build
+
+on: [push, pull_request]
+
+jobs:
+  Windows:
+    runs-on: windows-2016
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          lfs: true
+      - name: Install Dependencies
+        run: |
+          ci-scripts\windows\tahoma-install.bat
+      - name: Get CanonSDK
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          curl -H "Authorization: token ${{ secrets.TAHOMA2D_TOKEN }}" -H "Accept:application/octet-stream" -fsSL -o EDSDK_v131231_Windows.zip https://api.github.com/repos/tahoma2d/CanonSDK/releases/assets/25267396
+          7z x EDSDK_v131231_Windows.zip -oEDSDK_v131231_Windows
+          move EDSDK_v131231_Windows\EDSDK\Header thirdparty\canon
+          move EDSDK_v131231_Windows\EDSDK_64\Dll thirdparty\canon
+          move EDSDK_v131231_Windows\EDSDK_64\Library thirdparty\canon
+      - name: Get 3rd Party Apps
+        run: |
+          ci-scripts\windows\tahoma-get3rdpartyapps.bat
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+      - name: Build Tahoma2D
+        run: |
+          ci-scripts\windows\tahoma-build.bat
+      - name: Create Package
+        run: |
+          ci-scripts\windows\tahoma-buildpkg.bat
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Tahoma2D-win.zip
+          path: toonz\build\Tahoma2D-win.zip
+      - uses: actions/upload-artifact@v1
+        with:
+          name: debug-symbols.zip
+          path: toonz\build\debug-symbols.zip
+      - name: Get Nightly Release Date
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        run: |
+          chcp 65001 #set code page to utf-8
+          echo ("NIGHTLYDATE=" + (Get-Date -format "yyyy-MM-dd")) >> $env:GITHUB_ENV
+          echo ("NIGHTLYDATETIME=" + (Get-Date -format "yyyy-MM-dd HH:mm:ss UTC")) >> $env:GITHUB_ENV
+      - name: Update Latest Nightly Release
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifactErrorsFailBuild: false
+          artifacts: toonz\build\Tahoma2D-win.zip,toonz\build\debug-symbols.zip
+          artifactContentType: "raw"
+          body: ${{ github.event.head_commit.message }}
+          name: Lastest Nightly ${{ env.NIGHTLYDATE }}
+          prerelease: true
+          replacesArtifacts: true
+          tag: nightly
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Nightlies Release
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifactErrorsFailBuild: false
+          artifacts: toonz\build\Tahoma2D-win.zip,toonz\build\debug-symbols.zip
+          artifactContentType: "raw"
+          body: ${{ github.event.head_commit.message }}
+          name: ${{ env.NIGHTLYDATETIME }}
+          omitBodyDuringUpdate: true
+          omitNameDuringUpdate: true
+          owner: tahoma2d	  
+          prerelease: true
+          replacesArtifacts: true
+          repo: tahoma2d_nightlies
+          tag: nightly-${{ github.sha }}
+          token: ${{ secrets.TAHOMA2D_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@ -13,6 +13,7 @@ Thumbs.db

 # bundled thirdparty libraries
 /thirdparty/boost
+/thirdparty/libjpeg-turbo64
 /thirdparty/lzo
 /thirdparty/tiff-4.0.3
 /thirdparty/LibJPEG/jpeg-9
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -10,11 +10,11 @@ I will first review the request, then I'll accept it, add comments for rework, o

 ### Workflow

-0. `fork` Tahoma2D to your GitHub account from `turtletooth/tahoma2d`.
-  - (use the `fork` button at the https://github.com/turtletooth/tahoma2d)
+0. `fork` Tahoma2D to your GitHub account from `tahoma2d/tahoma2d`.
+  - (use the `fork` button at the https://github.com/tahoma2d/tahoma2d)
 0. `clone` the repository.
  - `git clone git@github.com:your-github-account/tahoma2d.git`
-  - `git remote add upstream https://github.com/turtletooth/tahoma2d.git`, additionally.
+  - `git remote add upstream https://github.com/tahoma2d/tahoma2d.git`, additionally.
 0. modify the codes.
  - `git checkout -b your-branch-name`
    - `your-branch-name` is a name of your modifications, for example,
@ -32,7 +32,7 @@ I will first review the request, then I'll accept it, add comments for rework, o

 ## Bugs

-If you find bugs, please report details about them using [issues](https://github.com/turtletooth/tahoma2d/issues).
+If you find bugs, please report details about them using [issues](https://github.com/tahoma2d/tahoma2d/issues).
 Please include information needed to reproduce the bug, including the operating system 
 and information directly relating to the issue. Links to screen captures of what is 
 observed on screen or video of specific steps to produce the problem are very helpful.  
--- a/README.md
+++ b/README.md
@ -1,7 +1,6 @@
 # Tahoma2D

-[![](https://ci.appveyor.com/api/projects/status/mnc3mepksux9kvap/branch/master?svg=true)](https://ci.appveyor.com/project/turtletooth/tahoma2d)
-[![](https://travis-ci.com/turtletooth/tahoma2d.svg?branch=master)](https://travis-ci.com/turtletooth/tahoma2d)
+[![](https://ci.appveyor.com/api/projects/status/mnc3mepksux9kvap/branch/master?svg=true)](https://ci.appveyor.com/project/tahoma2d/tahoma2d)

 ## What is Tahoma2D?

@ -16,7 +15,7 @@ Please refer to the Tahoma2D site at <https://tahoma2d.org/download>.

 ## Installation

-Please download the latest release at <https://github.com/turtletooth/tahoma2d/releases>.
+Please download the latest release at <https://github.com/tahoma2d/tahoma2d/releases>.

 ## How to Build Locally

@ -31,7 +30,7 @@ Can't develop but still want to help? Help us test individual Pull Requests befo
 ## Community

 - To share tips or to troubleshoot, join the [Google Tahoma2D Users forum](hhttps://groups.google.com/g/tahoma2d)
- If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/turtletooth/tahoma2d/issues) and post there.
+- If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/tahoma2d/tahoma2d/issues) and post there.

 ## Licensing

--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,4 +1,4 @@
-version: 1.1.0{build}
+version: 1.2.0{build}
 pull_requests:
  do_not_increment_build_number: true
 skip_tags: true
@ -10,7 +10,7 @@ clone_depth: 1
 # C:\Qt\5.9 is mapped to C:\Qt\5.9.n for backward compatibility
 install:
 - cmd: >-
-    choco install opencv
+    choco install opencv --version=4.5.1
    
    cd thirdparty

@ -54,12 +54,34 @@ after_build:

    copy /Y ..\..\thirdparty\libjpeg-turbo64\dist\turbojpeg.dll %CONFIGURATION%\Tahoma2D

-    copy /Y "C:\Tools\opencv\build\x64\vc14\bin\opencv_world412.dll" %CONFIGURATION%\Tahoma2D
+    copy /Y "C:\Tools\opencv\build\x64\vc14\bin\opencv_world451.dll" %CONFIGURATION%\Tahoma2D

    mkdir "%CONFIGURATION%\Tahoma2D\tahomastuff"

    xcopy /Y /E ..\..\stuff "%CONFIGURATION%\Tahoma2D\tahomastuff"
    
+    curl -fsSL -o ffmpeg-4.3.1-win64-static-lgpl.zip https://github.com/tahoma2d/FFmpeg/releases/download/v4.3.1/ffmpeg-4.3.1-win64-static-lgpl.zip
+    
+    7z x ffmpeg-4.3.1-win64-static-lgpl.zip
+    
+    mkdir %CONFIGURATION%\Tahoma2D\ffmpeg
+
+    copy /Y ffmpeg-4.3.1-win64-static-lgpl\bin\ffmpeg.exe %CONFIGURATION%\Tahoma2D\ffmpeg
+    
+    copy /Y ffmpeg-4.3.1-win64-static-lgpl\bin\ffprobe.exe %CONFIGURATION%\Tahoma2D\ffmpeg
+
+    curl -fsSL -o rhubarb-lip-sync-tahoma2d-win.zip https://github.com/tahoma2d/rhubarb-lip-sync/releases/download/v1.10.2/rhubarb-lip-sync-tahoma2d-win.zip
+    
+    7z x rhubarb-lip-sync-tahoma2d-win.zip
+    
+    mkdir %CONFIGURATION%\Tahoma2D\rhubarb
+    
+    copy /Y rhubarb-lip-sync-tahoma2d-win\rhubarb.exe %CONFIGURATION%\Tahoma2D\rhubarb
+
+    mkdir %CONFIGURATION%\Tahoma2D\rhubarb\res
+    
+    xcopy /Y /E rhubarb-lip-sync-tahoma2d-win\res "%CONFIGURATION%\Tahoma2D\rhubarb\res"
+
 artifacts:
 - path: toonz\$(PLATFORM)\$(CONFIGURATION)
  name: Tahoma2D
--- a/ci-scripts/linux/tahoma-buildffmpeg.sh
+++ b/ci-scripts/linux/tahoma-buildffmpeg.sh
@ -1,3 +1,4 @@
+#!/bin/bash
 cd thirdparty

 echo ">>> Cloning openH264"
@ -15,7 +16,7 @@ sudo make install
 cd ..

 echo ">>> Cloning ffmpeg"
-git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
+git clone https://github.com/tahoma2d/ffmpeg ffmpeg

 cd ffmpeg
 echo "*" >| .gitignore
@ -24,6 +25,8 @@ echo ">>> Configuring to build ffmpeg (shared)"
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig

 ./configure  --prefix=/usr/local \
+      --cc="$CC" \
+      --cxx="$CXX" \
      --toolchain=hardened \
      --pkg-config-flags="--static" \
      --extra-cflags="-I/usr/local/include" \
@ -62,52 +65,3 @@ echo ">>> Installing ffmpeg (shared)"
 sudo make install

 sudo ldconfig
-
-echo ">>> Configuring to build ffmpeg (static)"
-
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-
-./configure  --prefix=/usr/local \
-      --pkg-config-flags="--static" \
-      --extra-cflags="-I/usr/local/include -static" \
-      --extra-ldflags="-L/usr/local/lib -static" \
-      --extra-ldexeflags="-static" \
-      --enable-static \
-      --enable-cross-compile \
-      --enable-pic \
-      --disable-shared \
-      --enable-libopenh264 \
-      --enable-pthreads \
-      --enable-version3 \
-      --enable-avresample \
-      --enable-libmp3lame \
-      --enable-libopus \
-      --enable-libsnappy \
-      --enable-libtheora \
-      --enable-libvorbis \
-      --enable-libvpx \
-      --enable-libwebp \
-      --enable-lzma \
-      --enable-libfreetype \
-      --enable-libopencore-amrnb \
-      --enable-libopencore-amrwb \
-      --enable-libspeex \
-      --disable-ffplay \
-      --disable-htmlpages \
-      --disable-manpages \
-      --disable-podpages \
-      --disable-txtpages \
-      --disable-libjack \
-      --disable-indev=jack
-
-echo ">>> Building ffmpeg (static)"
-make
-
-echo ">>> Installing to tahoma2d/thirdparty/ffmpeg/bin"
-if [ ! -d bin ]
-then
-   mkdir bin
-fi
-
-cp ffmpeg ffprobe bin/
-
--- a/ci-scripts/linux/tahoma-buildlibmypaint.sh
+++ b/ci-scripts/linux/tahoma-buildlibmypaint.sh
@ -0,0 +1,24 @@
+#!/bin/bash
+cd thirdparty/libmypaint
+
+echo ">>> Cloning libmypaint"
+git clone https://github.com/tahoma2d/libmypaint src
+
+cd src
+echo "*" >| .gitignore
+
+export CFLAGS='-Ofast -ftree-vectorize -fopt-info-vec-optimized -march=native -mtune=native -funsafe-math-optimizations -funsafe-loop-optimizations'
+
+echo ">>> Generating libmypaint environment"
+./autogen.sh
+
+echo ">>> Configuring libmypaint build"
+sudo ./configure
+
+echo ">>> Building libmypaint"
+sudo make
+
+echo ">>> Installing libmypaint"
+sudo make install
+
+sudo ldconfig
--- a/ci-scripts/linux/tahoma-buildopencv.sh
+++ b/ci-scripts/linux/tahoma-buildopencv.sh
@ -1,7 +1,8 @@
+#!/bin/bash
 cd thirdparty

 echo ">>> Cloning opencv"
-git clone https://github.com/opencv/opencv.git
+git clone https://github.com/tahoma2d/opencv

 cd opencv
 echo "*" >| .gitignore
--- a/ci-scripts/linux/tahoma-buildpkg.sh
+++ b/ci-scripts/linux/tahoma-buildpkg.sh
@ -35,14 +35,26 @@ mv appdir/usr/share/tahoma2d/stuff Tahoma2D/tahomastuff
 chmod -R 777 Tahoma2D/tahomastuff
 rmdir appdir/usr/share/tahoma2d

-if [ -d ../../thirdparty/ffmpeg/bin ]
+if [ -d ../../thirdparty/apps/ffmpeg/bin ]
 then
   echo ">>> Copying FFmpeg to Tahoma2D/ffmpeg"
   if [ -d Tahoma2D/ffmpeg ]
   then
      rm -rf Tahoma2D/ffmpeg
   fi
-   cp -R ../../thirdparty/ffmpeg/bin Tahoma2D/ffmpeg
+   mkdir -p Tahoma2D/ffmpeg
+   cp -R ../../thirdparty/apps/ffmpeg/bin/ffmpeg ../../thirdparty/apps/ffmpeg/bin/ffprobe Tahoma2D/ffmpeg
+fi
+
+if [ -d ../../thirdparty/apps/rhubarb ]
+then
+   echo ">>> Copying Rhubarb Lip Sync to Tahoma2D/rhubarb"
+   if [ -d Tahoma2D/rhubarb ]
+   then
+      rm -rf Tahoma2D/rhubarb
+   fi
+   mkdir -p Tahoma2D/rhubarb
+   cp -R ../../thirdparty/apps/rhubarb/rhubarb ../../thirdparty/apps/rhubarb/res Tahoma2D/rhubarb
 fi

 echo ">>> Creating Tahoma2D/Tahoma2D.AppImage"
--- a/ci-scripts/linux/tahoma-get3rdpartyapps.sh
+++ b/ci-scripts/linux/tahoma-get3rdpartyapps.sh
@ -0,0 +1,28 @@
+#!/bin/bash
+cd thirdparty
+
+if [ ! -d apps ]
+then
+   mkdir apps
+fi
+cd apps
+echo "*" >| .gitignore
+
+echo ">>> Getting FFmpeg"
+if [ -d ffmpeg ]
+then
+   rm -rf ffmpeg
+fi
+wget https://github.com/tahoma2d/FFmpeg/releases/download/v4.3.1/ffmpeg-4.3.1-linux-static-lgpl.zip
+unzip ffmpeg-4.3.1-linux-static-lgpl.zip 
+mv ffmpeg-4.3.1-linux-static-lgpl ffmpeg
+
+
+echo ">>> Getting Rhubarb Lip Sync"
+if [ -d rhubarb ]
+then
+   rm -rf rhubarb ]
+fi
+wget https://github.com/tahoma2d/rhubarb-lip-sync/releases/download/v1.10.2/rhubarb-lip-sync-tahoma2d-linux.zip
+unzip rhubarb-lip-sync-tahoma2d-linux.zip -d rhubarb
+
--- a/ci-scripts/linux/tahoma-install.sh
+++ b/ci-scripts/linux/tahoma-install.sh
@ -1,9 +1,10 @@
+#!/bin/bash
 sudo add-apt-repository --yes ppa:beineri/opt-qt597-xenial
-sudo add-apt-repository --yes ppa:achadwick/mypaint-testing
 sudo apt-get update
-sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libglib2.0-dev qt59serialport
+sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libboost-all-dev liblzma-dev libjson-c-dev libjpeg-turbo8-dev libglib2.0-dev qt59serialport
 sudo apt-get install -y nasm yasm libgnutls-dev libass-dev libbluray-dev libmp3lame-dev libopus-dev libsnappy-dev libtheora-dev libvorbis-dev libvpx-dev libwebp-dev libxml2-dev libfontconfig1-dev libfreetype6-dev libopencore-amrnb-dev libopencore-amrwb-dev libopenjpeg-dev libspeex-dev libsoxr-dev libopenjp2-7-dev
 sudo apt-get install -y python3-pip
+sudo apt install -y build-essential libgirepository1.0-dev autotools-dev intltool gettext libtool

 pip3 install --upgrade pip
 pip3 install numpy
--- a/ci-scripts/osx/tahoma-build.sh
+++ b/ci-scripts/osx/tahoma-build.sh
@ -11,7 +11,15 @@ then
 fi
 cd build

-QTVERSION=`ls /usr/local/Cellar/qt`
+if [ -d /usr/local/Cellar/qt@5 ]
+then
+   QTVERSION=`ls /usr/local/Cellar/qt@5`
+   USEQTLIB="/usr/local/opt/qt@5/lib/"
+else
+   QTVERSION=`ls /usr/local/Cellar/qt`
+   USEQTLIB="/usr/local/opt/qt/lib/"
+fi
+
 echo "QT Version detected: $QTVERSION"

 if [ -d ../../thirdparty/canon/Header ]
@ -22,7 +30,7 @@ fi
 export MACOSX_DEPLOYMENT_TARGET=10.13
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/jpeg-turbo/lib/pkgconfig"
 cmake ../sources  $CANON_FLAG \
-      -DQT_PATH=/usr/local/opt/qt/lib/ \
+      -DQT_PATH=$USEQTLIB \
      -DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
      -DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/

--- a/ci-scripts/osx/tahoma-buildffmpeg.sh
+++ b/ci-scripts/osx/tahoma-buildffmpeg.sh
@ -1,7 +1,32 @@
+#!/bin/bash
 cd thirdparty

+echo ">>> Cloning aom"
+mkdir aom
+cd aom
+echo "*" >| .gitignore
+
+git clone https://aomedia.googlesource.com/aom
+
+if [ ! -d build ]
+then
+   mkdir build
+fi
+cd build
+
+echo ">>> CMaking aom"
+cmake ../aom
+
+echo ">>> Making aom"
+make
+
+echo ">>> Installing aom"
+sudo make install
+
+cd ../..
+
 echo ">>> Cloning ffmpeg"
-git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
+git clone https://github.com/tahoma2d/ffmpeg

 cd ffmpeg
 echo "*" >| .gitignore
@ -48,36 +73,3 @@ make -j7 # runs 7 jobs in parallel
 echo ">>> Installing ffmpeg (shared)"
 sudo make install

-echo ">>> Configuring to build ffmpeg (static)"
-make clean
-
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-export SDKROOT=`xcrun --show-sdk-path`
-./configure  --prefix=/usr/local \
-      --pkg-config-flags="--static" \
-      --enable-static \
-      --disable-shared \
-      --enable-pic \
-      --disable-shared \
-      --enable-pthreads \
-      --enable-version3 \
-      --enable-videotoolbox \
-      --enable-avresample \
-      --enable-libaom \
-      --enable-libxml2 \
-      --enable-libvpx \
-      --disable-ffplay \
-      --disable-sdl2 \
-      --disable-libjack \
-      --disable-indev=jack
-
-echo ">>> Building ffmpeg (static)"
-make -j7 # runs 7 jobs in parallel
-
-echo ">>> Installing to tahoma2d/thirdparty/ffmpeg/bin"
-if [ ! -d bin ]
-then
-   mkdir bin
-fi
-
-cp ffmpeg ffprobe bin/
--- a/ci-scripts/osx/tahoma-buildopencv.sh
+++ b/ci-scripts/osx/tahoma-buildopencv.sh
@ -1,7 +1,8 @@
+#!/bin/bash
 cd thirdparty

 echo ">>> Cloning opencv"
-git clone https://github.com/opencv/opencv.git
+git clone https://github.com/tahoma2d/opencv

 cd opencv
 echo "*" >| .gitignore
@ -12,7 +13,7 @@ then
 fi
 cd build

-echo ">>> Cmaking openv"
+echo ">>> Cmaking opencv"
 cmake -DCMAKE_BUILD_TYPE=Release \
      -DBUILD_JASPER=OFF \
      -DBUILD_JPEG=OFF \
--- a/ci-scripts/osx/tahoma-buildpkg.sh
+++ b/ci-scripts/osx/tahoma-buildpkg.sh
@ -1,5 +1,10 @@
 #!/bin/bash
-export QTDIR=/usr/local/opt/qt
+if [ -d /usr/local/Cellar/qt@5 ]
+then
+   export QTDIR=/usr/local/opt/qt@5
+else
+   export QTDIR=/usr/local/opt/qt
+fi
 export TOONZDIR=toonz/build/toonz

 # If found, use Xcode Release build
@ -17,7 +22,7 @@ fi
 cp -R stuff $TOONZDIR/Tahoma2D.app/tahomastuff
 chmod -R 777 $TOONZDIR/Tahoma2D.app/tahomastuff

-if [ -d thirdparty/ffmpeg/bin ]
+if [ -d thirdparty/apps/ffmpeg/bin ]
 then
   echo ">>> Copying FFmpeg to $TOONZDIR/Tahoma2D.app/ffmpeg"
   if [ -d $TOONZDIR/Tahoma2D.app/ffmpeg ]
@ -25,7 +30,20 @@ then
      # In case of prior builds, replace ffmpeg folder
      rm -rf $TOONZDIR/Tahoma2D.app/ffmpeg
   fi
-   cp -R thirdparty/ffmpeg/bin $TOONZDIR/Tahoma2D.app/ffmpeg
+   mkdir $TOONZDIR/Tahoma2D.app/ffmpeg
+   cp -R thirdparty/apps/ffmpeg/bin/ffmpeg thirdparty/apps/ffmpeg/bin/ffprobe $TOONZDIR/Tahoma2D.app/ffmpeg
+fi
+
+if [ -d thirdparty/apps/rhubarb ]
+then
+   echo ">>> Copying Rhubarb Lip Sync to $TOONZDIR/Tahoma2D.app/rhubarb"
+   if [ -d $TOONZDIR/Tahoma2D.app/rhubarb ]
+   then
+      # In case of prior builds, replace rhubarb folder
+      rm -rf $TOONZDIR/Tahoma2D.app/rhubarb
+   fi
+   mkdir $TOONZDIR/Tahoma2D.app/rhubarb
+   cp -R thirdparty/apps/rhubarb/rhubarb thirdparty/apps/rhubarb/res $TOONZDIR/Tahoma2D.app/rhubarb
 fi

 if [ -d thirdparty/canon/Framework ]
@ -72,3 +90,4 @@ echo ">>> Creating Tahoma2D-osx.dmg"
 $QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -dmg -verbose=0

 mv $TOONZDIR/Tahoma2D.dmg $TOONZDIR/../Tahoma2D-osx.dmg
+
--- a/ci-scripts/osx/tahoma-get3rdpartyapps.sh
+++ b/ci-scripts/osx/tahoma-get3rdpartyapps.sh
@ -0,0 +1,28 @@
+#!/bin/bash
+cd thirdparty
+
+if [ ! -d apps ]
+then
+   mkdir apps
+fi
+cd apps
+echo "*" >| .gitignore
+
+echo ">>> Getting FFmpeg"
+if [ -d ffmpeg ]
+then
+   rm -rf ffmpeg
+fi
+wget https://github.com/tahoma2d/FFmpeg/releases/download/v4.3.1/ffmpeg-4.3.1-macos64-static-lgpl.zip
+unzip ffmpeg-4.3.1-macos64-static-lgpl.zip 
+mv ffmpeg-4.3.1-macos64-static-lgpl ffmpeg
+
+
+echo ">>> Getting Rhubarb Lip Sync"
+if [ -d rhubarb ]
+then
+   rm -rf rhubarb
+fi
+wget https://github.com/tahoma2d/rhubarb-lip-sync/releases/download/v1.10.2/rhubarb-lip-sync-tahoma2d-osx.zip
+unzip rhubarb-lip-sync-tahoma2d-osx.zip -d rhubarb
+
--- a/ci-scripts/osx/tahoma-install.sh
+++ b/ci-scripts/osx/tahoma-install.sh
@ -2,14 +2,4 @@
 brew update
 # Remove symlink to bin/2to3 in order for latest python to install
 rm -f '/usr/local/bin/2to3'
-brew install boost qt clang-format glew lz4 lzo libmypaint jpeg-turbo nasm yasm aom dav1d fontconfig freetype gnutls lame libass libbluray libsoxr libvorbis libvpx opencore-amr openh264 openjpeg opus rav1e sdl2 snappy speex tesseract theora webp xvid xz
-# delete older qt versions and make sure to have only the latest
-brew cleanup qt
-# temp workaround to brew installed glew cmake info overriding glew lib detection
-# which causes compiling issues later
-if [ -L /usr/local/lib/cmake/glew ]
-then
-   echo "Symbolic link '/usr/local/lib/cmake/glew' detected. Removing to avoid glew lib detection issue!"
-   ls -l /usr/local/lib/cmake/glew
-   rm /usr/local/lib/cmake/glew
-fi
+brew install boost qt@5 clang-format glew lz4 lzo libmypaint jpeg-turbo nasm yasm dav1d fontconfig freetype gnutls lame libass libbluray libsoxr libvorbis libvpx opencore-amr openh264 openjpeg opus rav1e sdl2 snappy speex tesseract theora webp xvid xz
--- a/ci-scripts/osx/travis-install.sh
+++ b/ci-scripts/osx/travis-install.sh
@ -6,13 +6,3 @@ brew install clang-format
 # from Homebrew 1.6.0 the old formula for obtaining Qt5.9.2 becomes invalid.
 # so we start to use the latest version of Qt. (#1910)
 brew install qt
-# delete older qt versions and make sure to have only the latest
-brew cleanup qt
-# temp workaround to brew installed glew cmake info overriding glew lib detection
-# which causes compiling issues later
-if [ -L /usr/local/lib/cmake/glew ]
-then
-   echo "Symbolic link '/usr/local/lib/cmake/glew' detected. Removing to avoid glew lib detection issue!"
-   ls -l /usr/local/lib/cmake/glew
-   rm /usr/local/lib/cmake/glew
-fi
--- a/ci-scripts/windows/tahoma-build.bat
+++ b/ci-scripts/windows/tahoma-build.bat
@ -0,0 +1,37 @@
+cd thirdparty
+
+copy /Y LibJPEG\jpeg-9\jconfig.vc LibJPEG\jpeg-9\jconfig.h
+copy /Y tiff-4.0.3\libtiff\tif_config.vc.h tiff-4.0.3\libtiff\tif_config.h
+copy /Y tiff-4.0.3\libtiff\tiffconf.vc.h tiff-4.0.3\libtiff\tiffconf.h
+copy /Y libpng-1.6.21\scripts\pnglibconf.h.prebuilt libpng-1.6.21\pnglibconf.h
+
+cd ../toonz
+
+IF NOT EXIST build mkdir build
+cd build
+
+REM Setup for local builds
+set MSVCVERSION="Visual Studio 14 2015"
+set BOOST_ROOT=C:\boost\boost_1_61_0
+set OPENCV_DIR=C:\opencv\451\build
+set QT_PATH=C:\Qt\5.9.7\msvc2015_64
+
+REM These are effective when running from Actions
+IF EXIST C:\local\boost_1_74_0 set BOOST_ROOT=C:\local\boost_1_74_0
+IF EXIST C:\tools\opencv set OPENCV_DIR=C:\tools\opencv\build
+IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.9\msvc2017_64 (
+	set MSVCVERSION="Visual Studio 15 2017"
+	set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.9\msvc2017_64
+)
+
+set WITH_CANON=N
+IF EXIST ..\..\thirdparty\canon\Header set WITH_CANON=Y
+
+set WITH_CRASHRPT=N
+IF EXIST ..\..\thirdparty\crashrpt\include set WITH_CRASHRPT=Y
+
+cmake ..\sources -G %MSVCVERSION%  -Ax64 -DQT_PATH=%QT_PATH% -DBOOST_ROOT=%BOOST_ROOT% -DOpenCV_DIR=%OPENCV_DIR% -DWITH_CANON=%WITH_CANON% -DWITH_CRASHRPT=%WITH_CRASHRPT%
+
+msbuild /property:Configuration=RelWithDebInfo /m /verbosity:minimal ALL_BUILD.vcxproj
+
+cd ../..
--- a/ci-scripts/windows/tahoma-buildpkg.bat
+++ b/ci-scripts/windows/tahoma-buildpkg.bat
@ -0,0 +1,87 @@
+cd toonz\build
+
+echo ">>> Creating Tahoma2D directory"
+
+IF EXIST Tahoma2D rmdir /S /Q Tahoma2D
+
+mkdir Tahoma2D
+
+echo ">>> Copy and configure Tahoma2D installation"
+
+copy /y RelWithDebInfo\*.* Tahoma2D
+
+REM Remove PDB and ILK files
+del Tahoma2D\*.pdb
+del Tahoma2D\*.ilk
+
+copy /Y ..\..\thirdparty\freeglut\bin\x64\freeglut.dll Tahoma2D
+copy /Y ..\..\thirdparty\glew\glew-1.9.0\bin\64bit\glew32.dll Tahoma2D
+copy /Y ..\..\thirdparty\libmypaint\dist\64\libiconv-2.dll Tahoma2D
+copy /Y ..\..\thirdparty\libmypaint\dist\64\libintl-8.dll Tahoma2D
+copy /Y ..\..\thirdparty\libmypaint\dist\64\libjson-c-2.dll Tahoma2D
+copy /Y ..\..\thirdparty\libmypaint\dist\64\libmypaint-1-4-0.dll Tahoma2D
+copy /Y ..\..\thirdparty\libjpeg-turbo64\dist\turbojpeg.dll Tahoma2D
+
+IF EXIST C:\tools\opencv (
+   copy /Y "C:\tools\opencv\build\x64\vc14\bin\opencv_world451.dll" Tahoma2D
+) ELSE (
+   copy /Y "C:\opencv\451\build\x64\vc14\bin\opencv_world451.dll" Tahoma2D
+)
+
+IF EXIST ..\..\thirdparty\canon\Header (
+   copy /Y ..\..\thirdparty\canon\Dll\EDSDK.dll Tahoma2D
+)
+
+IF EXIST ..\..\thirdparty\crashrpt\include (
+   copy /Y ..\..\thirdparty\apps\crashrpt\CrashRpt1500.dll Tahoma2D
+   copy /Y ..\..\thirdparty\apps\crashrpt\CrashSender1500.exe Tahoma2D
+   copy /Y ..\..\thirdparty\apps\crashrpt\crashrpt_lang.ini Tahoma2D
+)
+
+echo ">>> Copying stuff to Tahoma2D\tahomastuff"
+
+mkdir Tahoma2D\tahomastuff
+xcopy /Y /E ..\..\stuff Tahoma2D\tahomastuff
+
+IF EXIST ..\..\thirdparty\apps\ffmpeg\bin (
+   echo ">>> Copying FFmpeg to Tahoma2D\ffmpeg"
+   IF EXIST Tahoma2D\ffmpeg rmdir /S /Q Tahoma2D\ffmpeg
+   mkdir Tahoma2D\ffmpeg
+   copy /Y ..\..\thirdparty\apps\ffmpeg\bin\ffmpeg.exe Tahoma2D\ffmpeg
+   copy /Y ..\..\thirdparty\apps\ffmpeg\bin\ffprobe.exe Tahoma2D\ffmpeg
+)
+
+IF EXIST ..\..\thirdparty\apps\rhubarb (
+   echo ">>> Copying Rhubarb Lip Sync to Tahoma2D\rhubarb"
+   IF EXIST Tahoma2D\rhubarb rmdir /S /Q Tahoma2D\rhubarb
+   mkdir Tahoma2D\rhubarb
+   copy /Y ..\..\thirdparty\apps\rhubarb\rhubarb.exe Tahoma2D\rhubarb
+   xcopy /Y /E /I ..\..\thirdparty\apps\rhubarb\res "Tahoma2D\rhubarb\res"
+)
+
+echo ">>> Configuring Tahoma2D.exe for deployment"
+
+REM Setup for local builds
+set QT_PATH=C:\Qt\5.9.7\msvc2015_64
+
+REM These are effective when running from Actions/Appveyor
+IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.9\msvc2017_64 set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.9\msvc2017_64
+
+%QT_PATH%\bin\windeployqt.exe Tahoma2D\Tahoma2D.exe
+
+echo ">>> Creating Tahoma2D Windows package"
+
+IF EXIST Tahoma2D-win.zip del Tahoma2D-win.zip
+7z a Tahoma2D-win.zip Tahoma2D
+
+IF EXIST ..\..\..\tahoma2d_symbols (
+   echo ">>> Saving debugging symbols"
+   mkdir ..\..\..\tahoma2d_symbols\%date:~10,4%-%date:~4,2%-%date:~7,2%
+   copy /y RelWithDebInfo\*.* ..\..\..\tahoma2d_symbols\%date:~10,4%-%date:~4,2%-%date:~7,2%
+) else (
+   echo ">>> Creating debugging symbols package"
+   IF EXIST debug-symbols.zip del debug-symbols.zip
+   7z a debug-symbols.zip RelWithDebInfo\*.*
+)
+
+cd ../..
--- a/ci-scripts/windows/tahoma-get3rdpartyapps.bat
+++ b/ci-scripts/windows/tahoma-get3rdpartyapps.bat
@ -0,0 +1,33 @@
+cd thirdparty
+
+IF NOT EXIST apps mkdir apps
+
+cd apps
+echo * > .gitignore
+
+echo ">>> Getting CrashRpt"
+
+IF EXIST crashrpt rmdir /S /Q crashrpt
+curl -fsSL -o crashrpt-tahoma2d-win.zip https://github.com/tahoma2d/crashrpt2/releases/download/v1.5.0.0/crashrpt-tahoma2d-win.zip
+7z x crashrpt-tahoma2d-win.zip
+rename crashrpt-tahoma2d-win crashrpt
+IF EXIST ..\crashrpt\include rmdir /S /Q ..\crashrpt\include
+IF EXIST ..\crashrpt\CrashRpt1500.lib del ..\crashrpt\CrashRpt1500.lib
+move crashrpt\include ..\crashrpt
+move crashrpt\CrashRpt1500.lib ..\crashrpt
+
+echo ">>> Getting FFmpeg"
+
+IF EXIST ffmpeg rmdir /S /Q ffmpeg
+curl -fsSL -o ffmpeg-4.3.1-win64-static-lgpl.zip https://github.com/tahoma2d/FFmpeg/releases/download/v4.3.1/ffmpeg-4.3.1-win64-static-lgpl.zip
+7z x ffmpeg-4.3.1-win64-static-lgpl.zip
+rename ffmpeg-4.3.1-win64-static-lgpl ffmpeg
+
+echo ">>> Getting Rhubarb Lip Sync"
+
+IF EXIST rhubarb rmdir /S /Q rhubarb
+curl -fsSL -o rhubarb-lip-sync-tahoma2d-win.zip https://github.com/tahoma2d/rhubarb-lip-sync/releases/download/v1.10.2/rhubarb-lip-sync-tahoma2d-win.zip
+7z x rhubarb-lip-sync-tahoma2d-win.zip
+rename rhubarb-lip-sync-tahoma2d-win rhubarb
+
+cd ../..
--- a/ci-scripts/windows/tahoma-install.bat
+++ b/ci-scripts/windows/tahoma-install.bat
@ -0,0 +1,9 @@
+choco install opencv --version=4.5.1
+choco install boost-msvc-14.1
+
+REM Install Qt 5.9
+curl -fsSL -o Qt5.9.7_msvc2017_64.zip https://github.com/tahoma2d/qt5/releases/download/v5.9.7/Qt5.9.7_msvc2017_64.zip
+7z x Qt5.9.7_msvc2017_64.zip
+rename Qt5.9.7_msvc2017_64 5.9
+mkdir thirdparty\qt
+move 5.9 thirdparty\qt
--- a/doc/how_to_build_linux.md
+++ b/doc/how_to_build_linux.md
@ -101,7 +101,7 @@ $ cd ..
 ### Cloning the GIT Tree

 ```
-$ git clone https://github.com/turtletooth/tahoma2d
+$ git clone https://github.com/tahoma2d/tahoma2d
 ```

 ### Copying the 'stuff' Directory
--- a/doc/how_to_build_macosx.md
+++ b/doc/how_to_build_macosx.md
@ -62,7 +62,7 @@ $ rm /usr/local/lib/cmake/glew
 These steps will put the Tahoma2D repository under /Users/yourlogin/Documents.
 ```
 $ cd ~/Documents   #or where you want to store the repository#
-$ git clone https://github.com/turtletooth/tahoma2d
+$ git clone https://github.com/tahoma2d/tahoma2d
 $ cd tahoma2d
 $ git lfs pull
 $ cd thirdparty/boost
--- a/stuff/config/current.txt
+++ b/stuff/config/current.txt
@ -1316,9 +1316,16 @@

  <item>"STD_iwa_GlareFx" 			"Glare Iwa" 	</item>
  <item>"STD_iwa_GlareFx.renderMode"	"Render Mode"		</item>
+  <item>"STD_iwa_GlareFx.irisMode"	"Iris Shape"		</item>
+  <item>"STD_iwa_GlareFx.irisScale"	"Iris Scale"		</item>
+  <item>"STD_iwa_GlareFx.irisGearEdgeCount"	"Edges"		</item>
+  <item>"STD_iwa_GlareFx.irisRandomSeed"	"Random Seed"		</item>
+  <item>"STD_iwa_GlareFx.irisSymmetry"	"Symmetry"		</item>
+  <item>"STD_iwa_GlareFx.irisAppearance"	"Appearance"		</item>
  <item>"STD_iwa_GlareFx.intensity"	"Intensity"		</item>
  <item>"STD_iwa_GlareFx.size"	"Filter Size"		</item>
  <item>"STD_iwa_GlareFx.rotation"	"Filter Rotation"		</item>
+  <item>"STD_iwa_GlareFx.aberration"	"Chromatic Aberration"		</item>
  <item>"STD_iwa_GlareFx.noise_factor"	"Noise Factor"		</item>
  <item>"STD_iwa_GlareFx.noise_size"	"Noise Size"		</item>
  <item>"STD_iwa_GlareFx.noise_octave"	"Noise Octave"		</item>
--- a/stuff/config/loc/Español/toonz.qm
+++ b/stuff/config/loc/Español/toonz.qm
--- a/stuff/config/loc/Español/toonzqt.qm
+++ b/stuff/config/loc/Español/toonzqt.qm
--- a/stuff/config/loc/Français/toonz.qm
+++ b/stuff/config/loc/Français/toonz.qm
--- a/stuff/config/loc/Français/toonzqt.qm
+++ b/stuff/config/loc/Français/toonzqt.qm
--- a/stuff/config/loc/Italiano/toonz.qm
+++ b/stuff/config/loc/Italiano/toonz.qm
--- a/stuff/config/loc/Italiano/toonzqt.qm
+++ b/stuff/config/loc/Italiano/toonzqt.qm
--- a/stuff/config/loc/Čeština/toonz.qm
+++ b/stuff/config/loc/Čeština/toonz.qm
--- a/stuff/config/loc/Čeština/toonzqt.qm
+++ b/stuff/config/loc/Čeština/toonzqt.qm
--- a/stuff/config/loc/Русский/image.qm
+++ b/stuff/config/loc/Русский/image.qm
--- a/stuff/config/loc/Русский/tnztools.qm
+++ b/stuff/config/loc/Русский/tnztools.qm
--- a/stuff/config/loc/Русский/toonz.qm
+++ b/stuff/config/loc/Русский/toonz.qm
--- a/stuff/config/loc/Русский/toonzlib.qm
+++ b/stuff/config/loc/Русский/toonzlib.qm
--- a/stuff/config/loc/Русский/toonzqt.qm
+++ b/stuff/config/loc/Русский/toonzqt.qm
--- a/stuff/config/loc/中文/toonz.qm
+++ b/stuff/config/loc/中文/toonz.qm
--- a/stuff/config/loc/中文/toonzqt.qm
+++ b/stuff/config/loc/中文/toonzqt.qm
--- a/stuff/config/loc/日本語/toonz.qm
+++ b/stuff/config/loc/日本語/toonz.qm
--- a/stuff/config/loc/日本語/toonzqt.qm
+++ b/stuff/config/loc/日本語/toonzqt.qm
--- a/stuff/config/loc/한국어/toonz.qm
+++ b/stuff/config/loc/한국어/toonz.qm
--- a/stuff/config/loc/한국어/toonzqt.qm
+++ b/stuff/config/loc/한국어/toonzqt.qm
--- a/stuff/config/qss/Dark/Dark.qss
+++ b/stuff/config/qss/Dark/Dark.qss
@ -7,8 +7,7 @@ QToolButton,
 #CameraSettingsRadioButton::indicator,
 #ForceSquaredPixelButton,
 #EditToolLockButton::indicator,
-#flipCustomize,
-#SceneCast QToolBar QToolButton {
+#flipCustomize {
  background-color: transparent;
  border: 1 solid transparent;
  border-radius: 2;
@ -22,8 +21,7 @@ QToolButton:hover,
 #colorSliderAddButton:hover,
 #colorSliderSubButton:hover,
 #EditToolLockButton::indicator:hover,
-#flipCustomize:hover,
-#SceneCast QToolBar QToolButton:hover {
+#flipCustomize:hover {
  background-color: #595959;
  border-color: #595959;
  color: #f3f3f3;
@ -36,8 +34,7 @@ QToolButton:pressed,
 #colorSliderAddButton:pressed,
 #colorSliderSubButton:pressed,
 #EditToolLockButton::indicator:pressed,
-#flipCustomize:pressed,
-#SceneCast QToolBar QToolButton:pressed {
+#flipCustomize:pressed {
  background-color: #141414;
  border-color: #0f0f0f;
  color: #f3f3f3;
@ -48,8 +45,7 @@ QToolButton:checked,
 #CameraSettingsRadioButton::indicator:checked,
 #ForceSquaredPixelButton:checked,
 #EditToolLockButton::indicator:checked,
-#flipCustomize:checked,
-#SceneCast QToolBar QToolButton:checked {
+#flipCustomize:checked {
  background-color: #5385a6;
  border-color: #5385a6;
  color: #ffffff;
@ -60,8 +56,7 @@ QToolButton:checked:hover,
 #CameraSettingsRadioButton::indicator:checked:hover,
 #ForceSquaredPixelButton:checked:hover,
 #EditToolLockButton::indicator:checked:hover,
-#flipCustomize:checked:hover,
-#SceneCast QToolBar QToolButton:checked:hover {
+#flipCustomize:checked:hover {
  background-color: #6c98b6;
  border-color: #6c98b6;
 }
@ -71,8 +66,7 @@ QToolButton:disabled,
 #CameraSettingsRadioButton::indicator:disabled,
 #ForceSquaredPixelButton:disabled,
 #EditToolLockButton::indicator:disabled,
-#flipCustomize:disabled,
-#SceneCast QToolBar QToolButton:disabled {
+#flipCustomize:disabled {
  color: rgba(230, 230, 230, 0.4);
 }
 .button-tool:disabled:checked,
@ -81,8 +75,7 @@ QToolButton:disabled:checked,
 #CameraSettingsRadioButton::indicator:disabled:checked,
 #ForceSquaredPixelButton:disabled:checked,
 #EditToolLockButton::indicator:disabled:checked,
-#flipCustomize:disabled:checked,
-#SceneCast QToolBar QToolButton:disabled:checked {
+#flipCustomize:disabled:checked {
  background-color: rgba(83, 133, 166, 0.4);
  border-color: rgba(83, 133, 166, 0.4);
 }
@ -310,7 +303,7 @@ QMenuBar::item:pressed {
 ----------------------------------------------------------------------------- */
 QMenu {
  background-color: #262626;
-  border: 1 solid #4c4c4c;
+  border: 1 solid #3f3f3f;
  color: #e6e6e6;
  padding: 2 0;
 }
@ -338,14 +331,14 @@ QMenu::item:disabled:selected {
  /* fix for disabled indicator */
 }
 QMenu::separator {
-  border-top: 1 solid #4c4c4c;
+  border-top: 1 solid #3f3f3f;
  height: 0;
  margin: 2 0;
 }
 QMenu::icon {
  border-radius: 2;
  position: absolute;
-  left: 5;
+  left: 7;
  padding: 0;
  margin: 0;
  qproperty-icon: url('../Medium/imgs/white/none');
@ -355,7 +348,7 @@ QMenu::icon:checked {
  border: 1 solid #5385a6;
 }
 QMenu::indicator {
-  margin-left: 7;
+  margin-left: 8;
 }
 /* -----------------------------------------------------------------------------
   Titlebars
@ -714,24 +707,30 @@ QTreeView::item:selected,
  background-color: #5385a6;
  color: #ffffff;
 }
+.treeview::branch,
+QTreeWidget::branch,
+QTreeView::branch,
+#FunctionEditorTree::branch {
+  /* A blank URL may not hide the Qt branch style in Linux, so we add
+       a transparent PNG which does. */
+}
 .treeview::branch:adjoins-item,
 QTreeWidget::branch:adjoins-item,
 QTreeView::branch:adjoins-item,
 #FunctionEditorTree::branch:adjoins-item {
-  /* blank URL hides default Qt branch icons where it is not wanted */
-  border-image: url('');
+  border-image: url('../Medium/imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-siblings,
 QTreeWidget::branch:has-siblings,
 QTreeView::branch:has-siblings,
 #FunctionEditorTree::branch:has-siblings {
-  border-image: url('');
+  border-image: url('../Medium/imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-siblings:adjoins-item,
 QTreeWidget::branch:has-siblings:adjoins-item,
 QTreeView::branch:has-siblings:adjoins-item,
 #FunctionEditorTree::branch:has-siblings:adjoins-item {
-  border-image: url('');
+  border-image: url('../Medium/imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-children:closed,
 QTreeWidget::branch:has-children:closed,
@ -890,7 +889,7 @@ QComboBox:editable {
  /* for editable ComboBox */
  color: #e6e6e6;
  background-color: #1c1c1c;
-  border-color: #565656;
+  border-color: #4a4a4a;
  padding: 1 0 1 3;
  selection-background-color: #5385a6;
  selection-color: #ffffff;
@ -945,7 +944,7 @@ QComboBox::drop-down:disabled:editable {
 .ComboBox QAbstractItemView,
 QComboBox QAbstractItemView {
  background-color: #262626;
-  border: 1 solid #4c4c4c;
+  border: 1 solid #3f3f3f;
  selection-background-color: #5385a6;
  selection-color: #ffffff;
 }
@ -960,7 +959,7 @@ QTextEdit,
 #tasksRemoveBox,
 #tasksAddBox {
  background-color: #1c1c1c;
-  border: 1 solid #565656;
+  border: 1 solid #4a4a4a;
  border-radius: 2;
  color: #e6e6e6;
  selection-background-color: #5385a6;
@ -986,7 +985,7 @@ QTextEdit:disabled,
 #tasksRemoveBox:disabled,
 #tasksAddBox:disabled {
  background-color: #262626;
-  border-color: #434343;
+  border-color: #3d3d3d;
  color: rgba(230, 230, 230, 0.4);
 }
 QTextEdit[readOnly="true"] {
@ -1015,12 +1014,11 @@ QCheckBox:disabled {
 }
 .CheckBox::indicator,
 QMenu::indicator:non-exclusive,
-QMenu::indicator:non-exclusive,
 QCheckBox::indicator,
 .GroupBox::indicator,
 QGroupBox::indicator {
  background-color: #1c1c1c;
-  border: 1 solid #565656;
+  border: 1 solid #4a4a4a;
  border-radius: 2;
  height: 9;
  /* fix for QGroupBox */
@ -1030,15 +1028,12 @@ QGroupBox::indicator {
 }
 .CheckBox::indicator:hover,
 QMenu::indicator:non-exclusive:hover,
-QMenu::indicator:non-exclusive:hover,
 .CheckBox::indicator:checked:hover,
 .CheckBox::indicator:indeterminate:hover,
 QCheckBox::indicator:hover,
 .GroupBox::indicator:hover,
 QMenu::indicator:non-exclusive:checked:hover,
 QMenu::indicator:non-exclusive:indeterminate:hover,
-QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:indeterminate:hover,
 QCheckBox::indicator:checked:hover,
 QCheckBox::indicator:indeterminate:hover,
 .GroupBox::indicator:checked:hover,
@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {
 }
 .CheckBox::indicator:checked,
 QMenu::indicator:non-exclusive:checked,
-QMenu::indicator:non-exclusive:checked,
 QCheckBox::indicator:checked,
 .GroupBox::indicator:checked,
 QGroupBox::indicator:checked {
@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {
 }
 .CheckBox::indicator:checked:hover,
 QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:checked:hover,
 QCheckBox::indicator:checked:hover,
 .GroupBox::indicator:checked:hover,
 QGroupBox::indicator:checked:hover {
@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {
 }
 .CheckBox::indicator:checked:disabled,
 QMenu::indicator:non-exclusive:checked:disabled,
-QMenu::indicator:non-exclusive:checked:disabled,
 QCheckBox::indicator:checked:disabled,
 .GroupBox::indicator:checked:disabled,
 QGroupBox::indicator:checked:disabled {
@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {
 }
 .CheckBox::indicator:indeterminate,
 QMenu::indicator:non-exclusive:indeterminate,
-QMenu::indicator:non-exclusive:indeterminate,
 QCheckBox::indicator:indeterminate,
 .GroupBox::indicator:indeterminate,
 QGroupBox::indicator:indeterminate {
@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {
 }
 .CheckBox::indicator:indeterminate:disabled,
 QMenu::indicator:non-exclusive:indeterminate:disabled,
-QMenu::indicator:non-exclusive:indeterminate:disabled,
 QCheckBox::indicator:indeterminate:disabled,
 .GroupBox::indicator:indeterminate:disabled,
 QGroupBox::indicator:indeterminate:disabled {
@ -1100,12 +1090,11 @@ QGroupBox::indicator:indeterminate:disabled {
 }
 .CheckBox::indicator:disabled,
 QMenu::indicator:non-exclusive:disabled,
-QMenu::indicator:non-exclusive:disabled,
 QCheckBox::indicator:disabled,
 .GroupBox::indicator:disabled,
 QGroupBox::indicator:disabled {
  background-color: #262626;
-  border-color: #434343;
+  border-color: #3d3d3d;
 }
 /* -----------------------------------------------------------------------------
   RadioButton
@ -1130,7 +1119,6 @@ QRadioButton:disabled {
 }
 .RadioButton::indicator,
 QMenu::indicator:exclusive,
-QMenu::indicator:exclusive,
 QRadioButton::indicator,
 #CameraSettingsRadioButton_Small::indicator {
  width: 13;
@ -1141,28 +1129,24 @@ QRadioButton::indicator,
 }
 .RadioButton::indicator:unchecked,
 QMenu::indicator:exclusive:unchecked,
-QMenu::indicator:exclusive:unchecked,
 QRadioButton::indicator:unchecked,
 #CameraSettingsRadioButton_Small::indicator:unchecked {
  image: url('../Medium/imgs/white/radiobutton-dark_unchecked.svg');
 }
 .RadioButton::indicator:unchecked:hover,
 QMenu::indicator:exclusive:unchecked:hover,
-QMenu::indicator:exclusive:unchecked:hover,
 QRadioButton::indicator:unchecked:hover,
 #CameraSettingsRadioButton_Small::indicator:unchecked:hover {
  image: url('../Medium/imgs/white/radiobutton-dark_unchecked_hover.svg');
 }
 .RadioButton::indicator:checked,
 QMenu::indicator:exclusive:checked,
-QMenu::indicator:exclusive:checked,
 QRadioButton::indicator:checked,
 #CameraSettingsRadioButton_Small::indicator:checked {
  image: url('../Medium/imgs/white/radiobutton_checked.svg');
 }
 .RadioButton::indicator:checked:disabled,
 QMenu::indicator:exclusive:checked:disabled,
-QMenu::indicator:exclusive:checked:disabled,
 QRadioButton::indicator:checked:disabled,
 #CameraSettingsRadioButton_Small::indicator:checked:disabled {
  background-color: transparent;
@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,
 }
 .RadioButton::indicator:disabled,
 QMenu::indicator:exclusive:disabled,
-QMenu::indicator:exclusive:disabled,
 QRadioButton::indicator:disabled,
 #CameraSettingsRadioButton_Small::indicator:disabled {
  image: url('../Medium/imgs/white/radiobutton-dark_unchecked_disabled.svg');
@ -1280,9 +1263,9 @@ QProgressBar::chunk {
 /* Right Pane
 ----------------------------------------------------------------------------- */
 DvItemViewerPanel {
-  background-color: #282828;
+  background-color: #303030;
  qproperty-TextColor: #e6e6e6;
-  qproperty-AlternateBackground: #303030;
+  qproperty-AlternateBackground: #383838;
  qproperty-SelectedTextColor: #ffffff;
  qproperty-FolderTextColor: #9fdaff;
  qproperty-SelectedItemBackground: #5385a6;
@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {
  qproperty-ColTextColor: #e6e6e6;
  qproperty-ColBorderColor: #111111;
 }
-#FileBrowser,
-#SceneCast {
+#FileBrowser {
  background-color: #303030;
 }
-#FileBrowser QLabel,
-#SceneCast QLabel {
+#FileBrowser QLabel {
  background-color: transparent;
 }
-#FileBrowser QToolBar,
-#SceneCast QToolBar {
+#FileBrowser QToolBar {
  background-color: #303030;
 }
-#FileBrowser #castFrame,
-#SceneCast #castFrame {
+#FileBrowser #castFrame {
  border-top: 1 solid #111111;
  border-right: 1 solid #111111;
  border-bottom: 1 solid #111111;
@ -1496,9 +1475,6 @@ QStatusBar #StatusBarLabel {
 /* -----------------------------------------------------------------------------
   Style Editor
 ----------------------------------------------------------------------------- */
-#StyleEditor #TabBarContainer {
-  margin-left: -5px;
-}
 #StyleEditor #bottomWidget {
  border-top: 1 solid #111111;
  padding: 3 2 8 3;
@ -1679,6 +1655,17 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
  width: 16;
  margin-right: -1;
 }
+#ShortcutViewer {
+  font-size: 17px;
+}
+#ShortcutViewer QLineEdit {
+  color: black;
+  border-color: #b8bc7f;
+  background-color: white;
+}
+#ShortcutViewer QLineEdit:focus {
+  background-color: #abceff;
+}
 /* -----------------------------------------------------------------------------
   New Project / Configure Project Window
 ----------------------------------------------------------------------------- */
@ -1711,7 +1698,7 @@ SchematicViewer {
  qproperty-FullcolorColumnColor: #527097;
  qproperty-FxColumnColor: #8a674b;
  qproperty-PaletteColumnColor: #42756e;
-  qproperty-MeshColumnColor: #5e4d72;
+  qproperty-MeshColumnColor: #594d75;
  qproperty-ReferenceColumnColor: #3d3d3d;
  qproperty-TableColor: #62628c;
  qproperty-ActiveCameraColor: #4073a3;
@ -1763,7 +1750,7 @@ SchematicViewer {
  margin-bottom: 2;
 }
 #SchematicSceneViewer {
-  background-color: #232323;
+  background-color: #262626;
  border-bottom: 1 solid #111111;
 }
 /* -----------------------------------------------------------------------------
@ -2253,9 +2240,9 @@ XsheetViewer {
  qproperty-PaletteColumnColor: #42756e;
  qproperty-PaletteColumnBorderColor: #30544f;
  qproperty-SelectedPaletteColumnColor: #508b8c;
-  qproperty-MeshColumnColor: #5e4d72;
-  qproperty-MeshColumnBorderColor: #453854;
-  qproperty-SelectedMeshColumnColor: #6a6690;
+  qproperty-MeshColumnColor: #594d75;
+  qproperty-MeshColumnBorderColor: #423956;
+  qproperty-SelectedMeshColumnColor: #656692;
  qproperty-SoundTextColumnColor: #a7a7a7;
  qproperty-SoundTextColumnBorderColor: #8e8e8e;
  qproperty-SelectedSoundTextColumnColor: #adb9c0;
@ -2365,9 +2352,13 @@ SpreadsheetViewer {
  qproperty-KeyFrameColor: #995d1d;
  qproperty-KeyFrameBorderColor: #db9041;
  qproperty-SelectedKeyFrameColor: #a2835b;
+  qproperty-IgnoredKeyFrameColor: #ac2a39;
+  qproperty-SelectedIgnoredKeyFrameColor: #b25872;
  qproperty-InBetweenColor: #666250;
  qproperty-InBetweenBorderColor: #b0aa91;
  qproperty-SelectedInBetweenColor: #717970;
+  qproperty-IgnoredInBetweenColor: #8a695e;
+  qproperty-SelectedIgnoredInBetweenColor: #93807d;
  qproperty-SelectedEmptyColor: rgba(90, 100, 106, 0.5);
  qproperty-SelectedSceneRangeEmptyColor: rgba(90, 100, 106, 0.5);
  qproperty-TextColor: #e6e6e6;
--- a/stuff/config/qss/Darker/Darker.qss
+++ b/stuff/config/qss/Darker/Darker.qss
@ -7,8 +7,7 @@ QToolButton,
 #CameraSettingsRadioButton::indicator,
 #ForceSquaredPixelButton,
 #EditToolLockButton::indicator,
-#flipCustomize,
-#SceneCast QToolBar QToolButton {
+#flipCustomize {
  background-color: transparent;
  border: 1 solid transparent;
  border-radius: 2;
@ -22,8 +21,7 @@ QToolButton:hover,
 #colorSliderAddButton:hover,
 #colorSliderSubButton:hover,
 #EditToolLockButton::indicator:hover,
-#flipCustomize:hover,
-#SceneCast QToolBar QToolButton:hover {
+#flipCustomize:hover {
  background-color: #494949;
  border-color: #494949;
  color: #f3f3f3;
@ -36,8 +34,7 @@ QToolButton:pressed,
 #colorSliderAddButton:pressed,
 #colorSliderSubButton:pressed,
 #EditToolLockButton::indicator:pressed,
-#flipCustomize:pressed,
-#SceneCast QToolBar QToolButton:pressed {
+#flipCustomize:pressed {
  background-color: #040404;
  border-color: #000000;
  color: #f3f3f3;
@ -48,8 +45,7 @@ QToolButton:checked,
 #CameraSettingsRadioButton::indicator:checked,
 #ForceSquaredPixelButton:checked,
 #EditToolLockButton::indicator:checked,
-#flipCustomize:checked,
-#SceneCast QToolBar QToolButton:checked {
+#flipCustomize:checked {
  background-color: #5385a6;
  border-color: #5385a6;
  color: #ffffff;
@ -60,8 +56,7 @@ QToolButton:checked:hover,
 #CameraSettingsRadioButton::indicator:checked:hover,
 #ForceSquaredPixelButton:checked:hover,
 #EditToolLockButton::indicator:checked:hover,
-#flipCustomize:checked:hover,
-#SceneCast QToolBar QToolButton:checked:hover {
+#flipCustomize:checked:hover {
  background-color: #6c98b6;
  border-color: #6c98b6;
 }
@ -71,8 +66,7 @@ QToolButton:disabled,
 #CameraSettingsRadioButton::indicator:disabled,
 #ForceSquaredPixelButton:disabled,
 #EditToolLockButton::indicator:disabled,
-#flipCustomize:disabled,
-#SceneCast QToolBar QToolButton:disabled {
+#flipCustomize:disabled {
  color: rgba(230, 230, 230, 0.4);
 }
 .button-tool:disabled:checked,
@ -81,8 +75,7 @@ QToolButton:disabled:checked,
 #CameraSettingsRadioButton::indicator:disabled:checked,
 #ForceSquaredPixelButton:disabled:checked,
 #EditToolLockButton::indicator:disabled:checked,
-#flipCustomize:disabled:checked,
-#SceneCast QToolBar QToolButton:disabled:checked {
+#flipCustomize:disabled:checked {
  background-color: rgba(83, 133, 166, 0.4);
  border-color: rgba(83, 133, 166, 0.4);
 }
@ -345,7 +338,7 @@ QMenu::separator {
 QMenu::icon {
  border-radius: 2;
  position: absolute;
-  left: 5;
+  left: 7;
  padding: 0;
  margin: 0;
  qproperty-icon: url('../Medium/imgs/white/none');
@ -355,7 +348,7 @@ QMenu::icon:checked {
  border: 1 solid #5385a6;
 }
 QMenu::indicator {
-  margin-left: 7;
+  margin-left: 8;
 }
 /* -----------------------------------------------------------------------------
   Titlebars
@ -714,24 +707,30 @@ QTreeView::item:selected,
  background-color: #5385a6;
  color: #ffffff;
 }
+.treeview::branch,
+QTreeWidget::branch,
+QTreeView::branch,
+#FunctionEditorTree::branch {
+  /* A blank URL may not hide the Qt branch style in Linux, so we add
+       a transparent PNG which does. */
+}
 .treeview::branch:adjoins-item,
 QTreeWidget::branch:adjoins-item,
 QTreeView::branch:adjoins-item,
 #FunctionEditorTree::branch:adjoins-item {
-  /* blank URL hides default Qt branch icons where it is not wanted */
-  border-image: url('');
+  border-image: url('../Medium/imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-siblings,
 QTreeWidget::branch:has-siblings,
 QTreeView::branch:has-siblings,
 #FunctionEditorTree::branch:has-siblings {
-  border-image: url('');
+  border-image: url('../Medium/imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-siblings:adjoins-item,
 QTreeWidget::branch:has-siblings:adjoins-item,
 QTreeView::branch:has-siblings:adjoins-item,
 #FunctionEditorTree::branch:has-siblings:adjoins-item {
-  border-image: url('');
+  border-image: url('../Medium/imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-children:closed,
 QTreeWidget::branch:has-children:closed,
@ -1015,7 +1014,6 @@ QCheckBox:disabled {
 }
 .CheckBox::indicator,
 QMenu::indicator:non-exclusive,
-QMenu::indicator:non-exclusive,
 QCheckBox::indicator,
 .GroupBox::indicator,
 QGroupBox::indicator {
@ -1030,15 +1028,12 @@ QGroupBox::indicator {
 }
 .CheckBox::indicator:hover,
 QMenu::indicator:non-exclusive:hover,
-QMenu::indicator:non-exclusive:hover,
 .CheckBox::indicator:checked:hover,
 .CheckBox::indicator:indeterminate:hover,
 QCheckBox::indicator:hover,
 .GroupBox::indicator:hover,
 QMenu::indicator:non-exclusive:checked:hover,
 QMenu::indicator:non-exclusive:indeterminate:hover,
-QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:indeterminate:hover,
 QCheckBox::indicator:checked:hover,
 QCheckBox::indicator:indeterminate:hover,
 .GroupBox::indicator:checked:hover,
@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {
 }
 .CheckBox::indicator:checked,
 QMenu::indicator:non-exclusive:checked,
-QMenu::indicator:non-exclusive:checked,
 QCheckBox::indicator:checked,
 .GroupBox::indicator:checked,
 QGroupBox::indicator:checked {
@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {
 }
 .CheckBox::indicator:checked:hover,
 QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:checked:hover,
 QCheckBox::indicator:checked:hover,
 .GroupBox::indicator:checked:hover,
 QGroupBox::indicator:checked:hover {
@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {
 }
 .CheckBox::indicator:checked:disabled,
 QMenu::indicator:non-exclusive:checked:disabled,
-QMenu::indicator:non-exclusive:checked:disabled,
 QCheckBox::indicator:checked:disabled,
 .GroupBox::indicator:checked:disabled,
 QGroupBox::indicator:checked:disabled {
@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {
 }
 .CheckBox::indicator:indeterminate,
 QMenu::indicator:non-exclusive:indeterminate,
-QMenu::indicator:non-exclusive:indeterminate,
 QCheckBox::indicator:indeterminate,
 .GroupBox::indicator:indeterminate,
 QGroupBox::indicator:indeterminate {
@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {
 }
 .CheckBox::indicator:indeterminate:disabled,
 QMenu::indicator:non-exclusive:indeterminate:disabled,
-QMenu::indicator:non-exclusive:indeterminate:disabled,
 QCheckBox::indicator:indeterminate:disabled,
 .GroupBox::indicator:indeterminate:disabled,
 QGroupBox::indicator:indeterminate:disabled {
@ -1100,7 +1090,6 @@ QGroupBox::indicator:indeterminate:disabled {
 }
 .CheckBox::indicator:disabled,
 QMenu::indicator:non-exclusive:disabled,
-QMenu::indicator:non-exclusive:disabled,
 QCheckBox::indicator:disabled,
 .GroupBox::indicator:disabled,
 QGroupBox::indicator:disabled {
@ -1130,7 +1119,6 @@ QRadioButton:disabled {
 }
 .RadioButton::indicator,
 QMenu::indicator:exclusive,
-QMenu::indicator:exclusive,
 QRadioButton::indicator,
 #CameraSettingsRadioButton_Small::indicator {
  width: 13;
@ -1141,28 +1129,24 @@ QRadioButton::indicator,
 }
 .RadioButton::indicator:unchecked,
 QMenu::indicator:exclusive:unchecked,
-QMenu::indicator:exclusive:unchecked,
 QRadioButton::indicator:unchecked,
 #CameraSettingsRadioButton_Small::indicator:unchecked {
  image: url('../Medium/imgs/white/radiobutton-dark_unchecked.svg');
 }
 .RadioButton::indicator:unchecked:hover,
 QMenu::indicator:exclusive:unchecked:hover,
-QMenu::indicator:exclusive:unchecked:hover,
 QRadioButton::indicator:unchecked:hover,
 #CameraSettingsRadioButton_Small::indicator:unchecked:hover {
  image: url('../Medium/imgs/white/radiobutton-dark_unchecked_hover.svg');
 }
 .RadioButton::indicator:checked,
 QMenu::indicator:exclusive:checked,
-QMenu::indicator:exclusive:checked,
 QRadioButton::indicator:checked,
 #CameraSettingsRadioButton_Small::indicator:checked {
  image: url('../Medium/imgs/white/radiobutton_checked.svg');
 }
 .RadioButton::indicator:checked:disabled,
 QMenu::indicator:exclusive:checked:disabled,
-QMenu::indicator:exclusive:checked:disabled,
 QRadioButton::indicator:checked:disabled,
 #CameraSettingsRadioButton_Small::indicator:checked:disabled {
  background-color: transparent;
@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,
 }
 .RadioButton::indicator:disabled,
 QMenu::indicator:exclusive:disabled,
-QMenu::indicator:exclusive:disabled,
 QRadioButton::indicator:disabled,
 #CameraSettingsRadioButton_Small::indicator:disabled {
  image: url('../Medium/imgs/white/radiobutton-dark_unchecked_disabled.svg');
@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {
  qproperty-ColTextColor: #e6e6e6;
  qproperty-ColBorderColor: #060606;
 }
-#FileBrowser,
-#SceneCast {
+#FileBrowser {
  background-color: #202020;
 }
-#FileBrowser QLabel,
-#SceneCast QLabel {
+#FileBrowser QLabel {
  background-color: transparent;
 }
-#FileBrowser QToolBar,
-#SceneCast QToolBar {
+#FileBrowser QToolBar {
  background-color: #202020;
 }
-#FileBrowser #castFrame,
-#SceneCast #castFrame {
+#FileBrowser #castFrame {
  border-top: 1 solid #060606;
  border-right: 1 solid #060606;
  border-bottom: 1 solid #060606;
@ -1496,9 +1475,6 @@ QStatusBar #StatusBarLabel {
 /* -----------------------------------------------------------------------------
   Style Editor
 ----------------------------------------------------------------------------- */
-#StyleEditor #TabBarContainer {
-  margin-left: -5px;
-}
 #StyleEditor #bottomWidget {
  border-top: 1 solid #060606;
  padding: 3 2 8 3;
@ -1679,6 +1655,17 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
  width: 16;
  margin-right: -1;
 }
+#ShortcutViewer {
+  font-size: 17px;
+}
+#ShortcutViewer QLineEdit {
+  color: black;
+  border-color: #b8bc7f;
+  background-color: white;
+}
+#ShortcutViewer QLineEdit:focus {
+  background-color: #abceff;
+}
 /* -----------------------------------------------------------------------------
   New Project / Configure Project Window
 ----------------------------------------------------------------------------- */
@ -1711,7 +1698,7 @@ SchematicViewer {
  qproperty-FullcolorColumnColor: #527097;
  qproperty-FxColumnColor: #8a674b;
  qproperty-PaletteColumnColor: #42756e;
-  qproperty-MeshColumnColor: #5e4d72;
+  qproperty-MeshColumnColor: #594d75;
  qproperty-ReferenceColumnColor: #2d2d2d;
  qproperty-TableColor: #62628c;
  qproperty-ActiveCameraColor: #4073a3;
@ -2253,9 +2240,9 @@ XsheetViewer {
  qproperty-PaletteColumnColor: #42756e;
  qproperty-PaletteColumnBorderColor: #30544f;
  qproperty-SelectedPaletteColumnColor: #508b8c;
-  qproperty-MeshColumnColor: #5e4d72;
-  qproperty-MeshColumnBorderColor: #453854;
-  qproperty-SelectedMeshColumnColor: #6a6690;
+  qproperty-MeshColumnColor: #594d75;
+  qproperty-MeshColumnBorderColor: #423956;
+  qproperty-SelectedMeshColumnColor: #656692;
  qproperty-SoundTextColumnColor: #a7a7a7;
  qproperty-SoundTextColumnBorderColor: #8e8e8e;
  qproperty-SelectedSoundTextColumnColor: #adb9c0;
@ -2365,9 +2352,13 @@ SpreadsheetViewer {
  qproperty-KeyFrameColor: #995d1d;
  qproperty-KeyFrameBorderColor: #db9041;
  qproperty-SelectedKeyFrameColor: #a2835b;
+  qproperty-IgnoredKeyFrameColor: #ac2a39;
+  qproperty-SelectedIgnoredKeyFrameColor: #b25872;
  qproperty-InBetweenColor: #666250;
  qproperty-InBetweenBorderColor: #b0aa91;
  qproperty-SelectedInBetweenColor: #717970;
+  qproperty-IgnoredInBetweenColor: #8a695e;
+  qproperty-SelectedIgnoredInBetweenColor: #93807d;
  qproperty-SelectedEmptyColor: rgba(83, 93, 100, 0.5);
  qproperty-SelectedSceneRangeEmptyColor: rgba(83, 93, 100, 0.5);
  qproperty-TextColor: #e6e6e6;
--- a/stuff/config/qss/Light/Light.qss
+++ b/stuff/config/qss/Light/Light.qss
@ -7,8 +7,7 @@ QToolButton,
 #CameraSettingsRadioButton::indicator,
 #ForceSquaredPixelButton,
 #EditToolLockButton::indicator,
-#flipCustomize,
-#SceneCast QToolBar QToolButton {
+#flipCustomize {
  background-color: transparent;
  border: 1 solid transparent;
  border-radius: 2;
@ -22,8 +21,7 @@ QToolButton:hover,
 #colorSliderAddButton:hover,
 #colorSliderSubButton:hover,
 #EditToolLockButton::indicator:hover,
-#flipCustomize:hover,
-#SceneCast QToolBar QToolButton:hover {
+#flipCustomize:hover {
  background-color: #b5b5b5;
  border-color: #a0a0a0;
  color: #0d0d0d;
@ -36,8 +34,7 @@ QToolButton:pressed,
 #colorSliderAddButton:pressed,
 #colorSliderSubButton:pressed,
 #EditToolLockButton::indicator:pressed,
-#flipCustomize:pressed,
-#SceneCast QToolBar QToolButton:pressed {
+#flipCustomize:pressed {
  background-color: #8f8f8f;
  border-color: #7a7a7a;
  color: #0d0d0d;
@ -48,8 +45,7 @@ QToolButton:checked,
 #CameraSettingsRadioButton::indicator:checked,
 #ForceSquaredPixelButton:checked,
 #EditToolLockButton::indicator:checked,
-#flipCustomize:checked,
-#SceneCast QToolBar QToolButton:checked {
+#flipCustomize:checked {
  background-color: #a0c1dd;
  border-color: #7aa8d0;
  color: #000;
@ -60,8 +56,7 @@ QToolButton:checked:hover,
 #CameraSettingsRadioButton::indicator:checked:hover,
 #ForceSquaredPixelButton:checked:hover,
 #EditToolLockButton::indicator:checked:hover,
-#flipCustomize:checked:hover,
-#SceneCast QToolBar QToolButton:checked:hover {
+#flipCustomize:checked:hover {
  background-color: #bed5e8;
  border-color: #7aa8d0;
 }
@ -71,8 +66,7 @@ QToolButton:disabled,
 #CameraSettingsRadioButton::indicator:disabled,
 #ForceSquaredPixelButton:disabled,
 #EditToolLockButton::indicator:disabled,
-#flipCustomize:disabled,
-#SceneCast QToolBar QToolButton:disabled {
+#flipCustomize:disabled {
  color: rgba(0, 0, 0, 0.4);
 }
 .button-tool:disabled:checked,
@ -81,8 +75,7 @@ QToolButton:disabled:checked,
 #CameraSettingsRadioButton::indicator:disabled:checked,
 #ForceSquaredPixelButton:disabled:checked,
 #EditToolLockButton::indicator:disabled:checked,
-#flipCustomize:disabled:checked,
-#SceneCast QToolBar QToolButton:disabled:checked {
+#flipCustomize:disabled:checked {
  background-color: rgba(160, 193, 221, 0.4);
  border-color: rgba(160, 193, 221, 0.4);
 }
@ -345,7 +338,7 @@ QMenu::separator {
 QMenu::icon {
  border-radius: 2;
  position: absolute;
-  left: 5;
+  left: 7;
  padding: 0;
  margin: 0;
  qproperty-icon: url('../Medium/imgs/black/none');
@ -355,7 +348,7 @@ QMenu::icon:checked {
  border: 1 solid #7aa8d0;
 }
 QMenu::indicator {
-  margin-left: 7;
+  margin-left: 8;
 }
 /* -----------------------------------------------------------------------------
   Titlebars
@ -382,10 +375,10 @@ TPanelTitleBarButton {
   Scrollbars
 ----------------------------------------------------------------------------- */
 QAbstractScrollArea::corner {
-  background-color: #cecece;
+  background-color: #dbdbdb;
 }
 QScrollBar {
-  background-color: #cecece;
+  background-color: #dbdbdb;
  border: 0;
 }
 QScrollBar:horizontal {
@ -397,26 +390,26 @@ QScrollBar:vertical {
  width: 15;
 }
 QScrollBar::handle {
-  border: 0 solid #949494;
+  border: 0 solid #b5b5b5;
  border-radius: 4;
 }
 QScrollBar::handle:horizontal:hover,
 QScrollBar::handle:vertical:hover {
-  background-color: #7a7a7a;
-  border-color: #7a7a7a;
+  background-color: #a5a5a5;
+  border-color: #a5a5a5;
 }
 QScrollBar::handle:horizontal:pressed,
 QScrollBar::handle:vertical:pressed {
-  background-color: #545454;
-  border-color: #545454;
+  background-color: #969696;
+  border-color: #969696;
 }
 QScrollBar::handle:horizontal {
-  background-color: #949494;
+  background-color: #b5b5b5;
  margin: 3 16;
  min-width: 20;
 }
 QScrollBar::handle:vertical {
-  background-color: #949494;
+  background-color: #b5b5b5;
  margin: 16 3 16 3;
  min-height: 20;
 }
@ -426,13 +419,13 @@ QScrollBar::add-line {
 }
 QScrollBar::add-line:horizontal {
  subcontrol-position: right;
-  background-color: #cecece;
+  background-color: #dbdbdb;
  margin: 0;
  width: 16;
 }
 QScrollBar::add-line:vertical {
  subcontrol-position: bottom;
-  background-color: #cecece;
+  background-color: #dbdbdb;
  margin: 0;
  height: 16;
 }
@ -442,13 +435,13 @@ QScrollBar::sub-line {
 }
 QScrollBar::sub-line:horizontal {
  subcontrol-position: left;
-  background-color: #cecece;
+  background-color: #dbdbdb;
  margin: 0;
  width: 16;
 }
 QScrollBar::sub-line:vertical {
  subcontrol-position: top;
-  background-color: #cecece;
+  background-color: #dbdbdb;
  margin: 0;
  height: 16;
 }
@ -714,24 +707,30 @@ QTreeView::item:selected,
  background-color: #a0c1dd;
  color: #000;
 }
+.treeview::branch,
+QTreeWidget::branch,
+QTreeView::branch,
+#FunctionEditorTree::branch {
+  /* A blank URL may not hide the Qt branch style in Linux, so we add
+       a transparent PNG which does. */
+}
 .treeview::branch:adjoins-item,
 QTreeWidget::branch:adjoins-item,
 QTreeView::branch:adjoins-item,
 #FunctionEditorTree::branch:adjoins-item {
-  /* blank URL hides default Qt branch icons where it is not wanted */
-  border-image: url('');
+  border-image: url('../Medium/imgs/black/transparent_16x16.png');
 }
 .treeview::branch:has-siblings,
 QTreeWidget::branch:has-siblings,
 QTreeView::branch:has-siblings,
 #FunctionEditorTree::branch:has-siblings {
-  border-image: url('');
+  border-image: url('../Medium/imgs/black/transparent_16x16.png');
 }
 .treeview::branch:has-siblings:adjoins-item,
 QTreeWidget::branch:has-siblings:adjoins-item,
 QTreeView::branch:has-siblings:adjoins-item,
 #FunctionEditorTree::branch:has-siblings:adjoins-item {
-  border-image: url('');
+  border-image: url('../Medium/imgs/black/transparent_16x16.png');
 }
 .treeview::branch:has-children:closed,
 QTreeWidget::branch:has-children:closed,
@ -1015,7 +1014,6 @@ QCheckBox:disabled {
 }
 .CheckBox::indicator,
 QMenu::indicator:non-exclusive,
-QMenu::indicator:non-exclusive,
 QCheckBox::indicator,
 .GroupBox::indicator,
 QGroupBox::indicator {
@ -1030,15 +1028,12 @@ QGroupBox::indicator {
 }
 .CheckBox::indicator:hover,
 QMenu::indicator:non-exclusive:hover,
-QMenu::indicator:non-exclusive:hover,
 .CheckBox::indicator:checked:hover,
 .CheckBox::indicator:indeterminate:hover,
 QCheckBox::indicator:hover,
 .GroupBox::indicator:hover,
 QMenu::indicator:non-exclusive:checked:hover,
 QMenu::indicator:non-exclusive:indeterminate:hover,
-QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:indeterminate:hover,
 QCheckBox::indicator:checked:hover,
 QCheckBox::indicator:indeterminate:hover,
 .GroupBox::indicator:checked:hover,
@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {
 }
 .CheckBox::indicator:checked,
 QMenu::indicator:non-exclusive:checked,
-QMenu::indicator:non-exclusive:checked,
 QCheckBox::indicator:checked,
 .GroupBox::indicator:checked,
 QGroupBox::indicator:checked {
@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {
 }
 .CheckBox::indicator:checked:hover,
 QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:checked:hover,
 QCheckBox::indicator:checked:hover,
 .GroupBox::indicator:checked:hover,
 QGroupBox::indicator:checked:hover {
@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {
 }
 .CheckBox::indicator:checked:disabled,
 QMenu::indicator:non-exclusive:checked:disabled,
-QMenu::indicator:non-exclusive:checked:disabled,
 QCheckBox::indicator:checked:disabled,
 .GroupBox::indicator:checked:disabled,
 QGroupBox::indicator:checked:disabled {
@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {
 }
 .CheckBox::indicator:indeterminate,
 QMenu::indicator:non-exclusive:indeterminate,
-QMenu::indicator:non-exclusive:indeterminate,
 QCheckBox::indicator:indeterminate,
 .GroupBox::indicator:indeterminate,
 QGroupBox::indicator:indeterminate {
@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {
 }
 .CheckBox::indicator:indeterminate:disabled,
 QMenu::indicator:non-exclusive:indeterminate:disabled,
-QMenu::indicator:non-exclusive:indeterminate:disabled,
 QCheckBox::indicator:indeterminate:disabled,
 .GroupBox::indicator:indeterminate:disabled,
 QGroupBox::indicator:indeterminate:disabled {
@ -1100,7 +1090,6 @@ QGroupBox::indicator:indeterminate:disabled {
 }
 .CheckBox::indicator:disabled,
 QMenu::indicator:non-exclusive:disabled,
-QMenu::indicator:non-exclusive:disabled,
 QCheckBox::indicator:disabled,
 .GroupBox::indicator:disabled,
 QGroupBox::indicator:disabled {
@ -1130,7 +1119,6 @@ QRadioButton:disabled {
 }
 .RadioButton::indicator,
 QMenu::indicator:exclusive,
-QMenu::indicator:exclusive,
 QRadioButton::indicator,
 #CameraSettingsRadioButton_Small::indicator {
  width: 13;
@ -1141,28 +1129,24 @@ QRadioButton::indicator,
 }
 .RadioButton::indicator:unchecked,
 QMenu::indicator:exclusive:unchecked,
-QMenu::indicator:exclusive:unchecked,
 QRadioButton::indicator:unchecked,
 #CameraSettingsRadioButton_Small::indicator:unchecked {
  image: url('../Medium/imgs/black/radiobutton_unchecked.svg');
 }
 .RadioButton::indicator:unchecked:hover,
 QMenu::indicator:exclusive:unchecked:hover,
-QMenu::indicator:exclusive:unchecked:hover,
 QRadioButton::indicator:unchecked:hover,
 #CameraSettingsRadioButton_Small::indicator:unchecked:hover {
  image: url('../Medium/imgs/black/radiobutton_unchecked_hover.svg');
 }
 .RadioButton::indicator:checked,
 QMenu::indicator:exclusive:checked,
-QMenu::indicator:exclusive:checked,
 QRadioButton::indicator:checked,
 #CameraSettingsRadioButton_Small::indicator:checked {
  image: url('../Medium/imgs/black/radiobutton_checked.svg');
 }
 .RadioButton::indicator:checked:disabled,
 QMenu::indicator:exclusive:checked:disabled,
-QMenu::indicator:exclusive:checked:disabled,
 QRadioButton::indicator:checked:disabled,
 #CameraSettingsRadioButton_Small::indicator:checked:disabled {
  background-color: transparent;
@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,
 }
 .RadioButton::indicator:disabled,
 QMenu::indicator:exclusive:disabled,
-QMenu::indicator:exclusive:disabled,
 QRadioButton::indicator:disabled,
 #CameraSettingsRadioButton_Small::indicator:disabled {
  image: url('../Medium/imgs/black/radiobutton_unchecked_disabled.svg');
@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {
  qproperty-ColTextColor: #000;
  qproperty-ColBorderColor: #a8a8a8;
 }
-#FileBrowser,
-#SceneCast {
+#FileBrowser {
  background-color: #DBDBDB;
 }
-#FileBrowser QLabel,
-#SceneCast QLabel {
+#FileBrowser QLabel {
  background-color: transparent;
 }
-#FileBrowser QToolBar,
-#SceneCast QToolBar {
+#FileBrowser QToolBar {
  background-color: #DBDBDB;
 }
-#FileBrowser #castFrame,
-#SceneCast #castFrame {
+#FileBrowser #castFrame {
  border-top: 1 solid #a8a8a8;
  border-right: 1 solid #a8a8a8;
  border-bottom: 1 solid #a8a8a8;
@ -1496,9 +1475,6 @@ QStatusBar #StatusBarLabel {
 /* -----------------------------------------------------------------------------
   Style Editor
 ----------------------------------------------------------------------------- */
-#StyleEditor #TabBarContainer {
-  margin-left: -5px;
-}
 #StyleEditor #bottomWidget {
  border-top: 1 solid #a8a8a8;
  padding: 3 2 8 3;
@ -1679,6 +1655,17 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
  width: 16;
  margin-right: -1;
 }
+#ShortcutViewer {
+  font-size: 17px;
+}
+#ShortcutViewer QLineEdit {
+  color: black;
+  border-color: #b8bc7f;
+  background-color: white;
+}
+#ShortcutViewer QLineEdit:focus {
+  background-color: #abceff;
+}
 /* -----------------------------------------------------------------------------
   New Project / Configure Project Window
 ----------------------------------------------------------------------------- */
@ -1705,7 +1692,7 @@ ProjectPopup QLabel {
 SchematicViewer {
  qproperty-TextColor: #000;
  qproperty-VerticalLineColor: rgba(0, 0, 0, 0.15);
-  qproperty-LevelColumnColor: #9ed49e;
+  qproperty-LevelColumnColor: #a1cea1;
  qproperty-VectorColumnColor: #d39ab5;
  qproperty-ChildColumnColor: #cca3cc;
  qproperty-FullcolorColumnColor: #b0cbdd;
@ -2232,9 +2219,9 @@ XsheetViewer {
  qproperty-SelectedEmptyCellColor: rgba(146, 153, 158, 0.5);
  qproperty-PegColor: #dfb081;
  qproperty-TableColor: #cbcbe4;
-  qproperty-LevelColumnColor: #9ed49e;
-  qproperty-LevelColumnBorderColor: #72b472;
-  qproperty-SelectedLevelColumnColor: #92bfa0;
+  qproperty-LevelColumnColor: #a1cea1;
+  qproperty-LevelColumnBorderColor: #77ab77;
+  qproperty-SelectedLevelColumnColor: #94bba2;
  qproperty-VectorColumnColor: #d39ab5;
  qproperty-VectorColumnBorderColor: #b36e8e;
  qproperty-SelectedVectorColumnColor: #b797b0;
@ -2365,9 +2352,13 @@ SpreadsheetViewer {
  qproperty-KeyFrameColor: #edaa64;
  qproperty-KeyFrameBorderColor: #bb6a16;
  qproperty-SelectedKeyFrameColor: #c9a278;
+  qproperty-IgnoredKeyFrameColor: #cb5765;
+  qproperty-SelectedIgnoredKeyFrameColor: #eb96ad;
  qproperty-InBetweenColor: #e2dbcc;
  qproperty-InBetweenBorderColor: #ac9f82;
  qproperty-SelectedInBetweenColor: #c2c4c0;
+  qproperty-IgnoredInBetweenColor: #c29c92;
+  qproperty-SelectedIgnoredInBetweenColor: #ab9898;
  qproperty-SelectedEmptyColor: rgba(146, 153, 158, 0.5);
  qproperty-SelectedSceneRangeEmptyColor: rgba(146, 153, 158, 0.5);
  qproperty-TextColor: #000;
--- a/stuff/config/qss/Medium/Medium.qss
+++ b/stuff/config/qss/Medium/Medium.qss
@ -7,8 +7,7 @@ QToolButton,
 #CameraSettingsRadioButton::indicator,
 #ForceSquaredPixelButton,
 #EditToolLockButton::indicator,
-#flipCustomize,
-#SceneCast QToolBar QToolButton {
+#flipCustomize {
  background-color: transparent;
  border: 1 solid transparent;
  border-radius: 2;
@ -22,8 +21,7 @@ QToolButton:hover,
 #colorSliderAddButton:hover,
 #colorSliderSubButton:hover,
 #EditToolLockButton::indicator:hover,
-#flipCustomize:hover,
-#SceneCast QToolBar QToolButton:hover {
+#flipCustomize:hover {
  background-color: #717171;
  border-color: #717171;
  color: #f3f3f3;
@ -36,8 +34,7 @@ QToolButton:pressed,
 #colorSliderAddButton:pressed,
 #colorSliderSubButton:pressed,
 #EditToolLockButton::indicator:pressed,
-#flipCustomize:pressed,
-#SceneCast QToolBar QToolButton:pressed {
+#flipCustomize:pressed {
  background-color: #2c2c2c;
  border-color: #272727;
  color: #f3f3f3;
@ -48,8 +45,7 @@ QToolButton:checked,
 #CameraSettingsRadioButton::indicator:checked,
 #ForceSquaredPixelButton:checked,
 #EditToolLockButton::indicator:checked,
-#flipCustomize:checked,
-#SceneCast QToolBar QToolButton:checked {
+#flipCustomize:checked {
  background-color: #5385a6;
  border-color: #5385a6;
  color: #ffffff;
@ -60,8 +56,7 @@ QToolButton:checked:hover,
 #CameraSettingsRadioButton::indicator:checked:hover,
 #ForceSquaredPixelButton:checked:hover,
 #EditToolLockButton::indicator:checked:hover,
-#flipCustomize:checked:hover,
-#SceneCast QToolBar QToolButton:checked:hover {
+#flipCustomize:checked:hover {
  background-color: #6c98b6;
  border-color: #6c98b6;
 }
@ -71,8 +66,7 @@ QToolButton:disabled,
 #CameraSettingsRadioButton::indicator:disabled,
 #ForceSquaredPixelButton:disabled,
 #EditToolLockButton::indicator:disabled,
-#flipCustomize:disabled,
-#SceneCast QToolBar QToolButton:disabled {
+#flipCustomize:disabled {
  color: rgba(230, 230, 230, 0.4);
 }
 .button-tool:disabled:checked,
@ -81,8 +75,7 @@ QToolButton:disabled:checked,
 #CameraSettingsRadioButton::indicator:disabled:checked,
 #ForceSquaredPixelButton:disabled:checked,
 #EditToolLockButton::indicator:disabled:checked,
-#flipCustomize:disabled:checked,
-#SceneCast QToolBar QToolButton:disabled:checked {
+#flipCustomize:disabled:checked {
  background-color: rgba(83, 133, 166, 0.4);
  border-color: rgba(83, 133, 166, 0.4);
 }
@ -345,7 +338,7 @@ QMenu::separator {
 QMenu::icon {
  border-radius: 2;
  position: absolute;
-  left: 5;
+  left: 7;
  padding: 0;
  margin: 0;
  qproperty-icon: url('imgs/white/none');
@ -355,7 +348,7 @@ QMenu::icon:checked {
  border: 1 solid #5385a6;
 }
 QMenu::indicator {
-  margin-left: 7;
+  margin-left: 8;
 }
 /* -----------------------------------------------------------------------------
   Titlebars
@ -714,24 +707,30 @@ QTreeView::item:selected,
  background-color: #5385a6;
  color: #ffffff;
 }
+.treeview::branch,
+QTreeWidget::branch,
+QTreeView::branch,
+#FunctionEditorTree::branch {
+  /* A blank URL may not hide the Qt branch style in Linux, so we add
+       a transparent PNG which does. */
+}
 .treeview::branch:adjoins-item,
 QTreeWidget::branch:adjoins-item,
 QTreeView::branch:adjoins-item,
 #FunctionEditorTree::branch:adjoins-item {
-  /* blank URL hides default Qt branch icons where it is not wanted */
-  border-image: url('');
+  border-image: url('imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-siblings,
 QTreeWidget::branch:has-siblings,
 QTreeView::branch:has-siblings,
 #FunctionEditorTree::branch:has-siblings {
-  border-image: url('');
+  border-image: url('imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-siblings:adjoins-item,
 QTreeWidget::branch:has-siblings:adjoins-item,
 QTreeView::branch:has-siblings:adjoins-item,
 #FunctionEditorTree::branch:has-siblings:adjoins-item {
-  border-image: url('');
+  border-image: url('imgs/white/transparent_16x16.png');
 }
 .treeview::branch:has-children:closed,
 QTreeWidget::branch:has-children:closed,
@ -1015,7 +1014,6 @@ QCheckBox:disabled {
 }
 .CheckBox::indicator,
 QMenu::indicator:non-exclusive,
-QMenu::indicator:non-exclusive,
 QCheckBox::indicator,
 .GroupBox::indicator,
 QGroupBox::indicator {
@ -1030,15 +1028,12 @@ QGroupBox::indicator {
 }
 .CheckBox::indicator:hover,
 QMenu::indicator:non-exclusive:hover,
-QMenu::indicator:non-exclusive:hover,
 .CheckBox::indicator:checked:hover,
 .CheckBox::indicator:indeterminate:hover,
 QCheckBox::indicator:hover,
 .GroupBox::indicator:hover,
 QMenu::indicator:non-exclusive:checked:hover,
 QMenu::indicator:non-exclusive:indeterminate:hover,
-QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:indeterminate:hover,
 QCheckBox::indicator:checked:hover,
 QCheckBox::indicator:indeterminate:hover,
 .GroupBox::indicator:checked:hover,
@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {
 }
 .CheckBox::indicator:checked,
 QMenu::indicator:non-exclusive:checked,
-QMenu::indicator:non-exclusive:checked,
 QCheckBox::indicator:checked,
 .GroupBox::indicator:checked,
 QGroupBox::indicator:checked {
@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {
 }
 .CheckBox::indicator:checked:hover,
 QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:checked:hover,
 QCheckBox::indicator:checked:hover,
 .GroupBox::indicator:checked:hover,
 QGroupBox::indicator:checked:hover {
@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {
 }
 .CheckBox::indicator:checked:disabled,
 QMenu::indicator:non-exclusive:checked:disabled,
-QMenu::indicator:non-exclusive:checked:disabled,
 QCheckBox::indicator:checked:disabled,
 .GroupBox::indicator:checked:disabled,
 QGroupBox::indicator:checked:disabled {
@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {
 }
 .CheckBox::indicator:indeterminate,
 QMenu::indicator:non-exclusive:indeterminate,
-QMenu::indicator:non-exclusive:indeterminate,
 QCheckBox::indicator:indeterminate,
 .GroupBox::indicator:indeterminate,
 QGroupBox::indicator:indeterminate {
@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {
 }
 .CheckBox::indicator:indeterminate:disabled,
 QMenu::indicator:non-exclusive:indeterminate:disabled,
-QMenu::indicator:non-exclusive:indeterminate:disabled,
 QCheckBox::indicator:indeterminate:disabled,
 .GroupBox::indicator:indeterminate:disabled,
 QGroupBox::indicator:indeterminate:disabled {
@ -1100,7 +1090,6 @@ QGroupBox::indicator:indeterminate:disabled {
 }
 .CheckBox::indicator:disabled,
 QMenu::indicator:non-exclusive:disabled,
-QMenu::indicator:non-exclusive:disabled,
 QCheckBox::indicator:disabled,
 .GroupBox::indicator:disabled,
 QGroupBox::indicator:disabled {
@ -1130,7 +1119,6 @@ QRadioButton:disabled {
 }
 .RadioButton::indicator,
 QMenu::indicator:exclusive,
-QMenu::indicator:exclusive,
 QRadioButton::indicator,
 #CameraSettingsRadioButton_Small::indicator {
  width: 13;
@ -1141,28 +1129,24 @@ QRadioButton::indicator,
 }
 .RadioButton::indicator:unchecked,
 QMenu::indicator:exclusive:unchecked,
-QMenu::indicator:exclusive:unchecked,
 QRadioButton::indicator:unchecked,
 #CameraSettingsRadioButton_Small::indicator:unchecked {
  image: url('imgs/white/radiobutton_unchecked.svg');
 }
 .RadioButton::indicator:unchecked:hover,
 QMenu::indicator:exclusive:unchecked:hover,
-QMenu::indicator:exclusive:unchecked:hover,
 QRadioButton::indicator:unchecked:hover,
 #CameraSettingsRadioButton_Small::indicator:unchecked:hover {
  image: url('imgs/white/radiobutton_unchecked_hover.svg');
 }
 .RadioButton::indicator:checked,
 QMenu::indicator:exclusive:checked,
-QMenu::indicator:exclusive:checked,
 QRadioButton::indicator:checked,
 #CameraSettingsRadioButton_Small::indicator:checked {
  image: url('imgs/white/radiobutton_checked.svg');
 }
 .RadioButton::indicator:checked:disabled,
 QMenu::indicator:exclusive:checked:disabled,
-QMenu::indicator:exclusive:checked:disabled,
 QRadioButton::indicator:checked:disabled,
 #CameraSettingsRadioButton_Small::indicator:checked:disabled {
  background-color: transparent;
@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,
 }
 .RadioButton::indicator:disabled,
 QMenu::indicator:exclusive:disabled,
-QMenu::indicator:exclusive:disabled,
 QRadioButton::indicator:disabled,
 #CameraSettingsRadioButton_Small::indicator:disabled {
  image: url('imgs/white/radiobutton_unchecked_disabled.svg');
@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {
  qproperty-ColTextColor: #e6e6e6;
  qproperty-ColBorderColor: #2c2c2c;
 }
-#FileBrowser,
-#SceneCast {
+#FileBrowser {
  background-color: #484848;
 }
-#FileBrowser QLabel,
-#SceneCast QLabel {
+#FileBrowser QLabel {
  background-color: transparent;
 }
-#FileBrowser QToolBar,
-#SceneCast QToolBar {
+#FileBrowser QToolBar {
  background-color: #484848;
 }
-#FileBrowser #castFrame,
-#SceneCast #castFrame {
+#FileBrowser #castFrame {
  border-top: 1 solid #2c2c2c;
  border-right: 1 solid #2c2c2c;
  border-bottom: 1 solid #2c2c2c;
@ -1496,9 +1475,6 @@ QStatusBar #StatusBarLabel {
 /* -----------------------------------------------------------------------------
   Style Editor
 ----------------------------------------------------------------------------- */
-#StyleEditor #TabBarContainer {
-  margin-left: -5px;
-}
 #StyleEditor #bottomWidget {
  border-top: 1 solid #2c2c2c;
  padding: 3 2 8 3;
@ -1679,6 +1655,17 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
  width: 16;
  margin-right: -1;
 }
+#ShortcutViewer {
+  font-size: 17px;
+}
+#ShortcutViewer QLineEdit {
+  color: black;
+  border-color: #b8bc7f;
+  background-color: white;
+}
+#ShortcutViewer QLineEdit:focus {
+  background-color: #abceff;
+}
 /* -----------------------------------------------------------------------------
   New Project / Configure Project Window
 ----------------------------------------------------------------------------- */
@ -1711,7 +1698,7 @@ SchematicViewer {
  qproperty-FullcolorColumnColor: #527097;
  qproperty-FxColumnColor: #8a674b;
  qproperty-PaletteColumnColor: #42756e;
-  qproperty-MeshColumnColor: #5e4d72;
+  qproperty-MeshColumnColor: #594d75;
  qproperty-ReferenceColumnColor: #555555;
  qproperty-TableColor: #62628c;
  qproperty-ActiveCameraColor: #4073a3;
@ -2253,9 +2240,9 @@ XsheetViewer {
  qproperty-PaletteColumnColor: #42756e;
  qproperty-PaletteColumnBorderColor: #30544f;
  qproperty-SelectedPaletteColumnColor: #508b8c;
-  qproperty-MeshColumnColor: #5e4d72;
-  qproperty-MeshColumnBorderColor: #453854;
-  qproperty-SelectedMeshColumnColor: #6a6690;
+  qproperty-MeshColumnColor: #594d75;
+  qproperty-MeshColumnBorderColor: #423956;
+  qproperty-SelectedMeshColumnColor: #656692;
  qproperty-SoundTextColumnColor: #a7a7a7;
  qproperty-SoundTextColumnBorderColor: #8e8e8e;
  qproperty-SelectedSoundTextColumnColor: #adb9c0;
@ -2365,9 +2352,13 @@ SpreadsheetViewer {
  qproperty-KeyFrameColor: #995d1d;
  qproperty-KeyFrameBorderColor: #db9041;
  qproperty-SelectedKeyFrameColor: #a2835b;
+  qproperty-IgnoredKeyFrameColor: #ac2a39;
+  qproperty-SelectedIgnoredKeyFrameColor: #b25872;
  qproperty-InBetweenColor: #666250;
  qproperty-InBetweenBorderColor: #b0aa91;
  qproperty-SelectedInBetweenColor: #717970;
+  qproperty-IgnoredInBetweenColor: #8a695e;
+  qproperty-SelectedIgnoredInBetweenColor: #93807d;
  qproperty-SelectedEmptyColor: rgba(103, 113, 119, 0.5);
  qproperty-SelectedSceneRangeEmptyColor: rgba(103, 113, 119, 0.5);
  qproperty-TextColor: #e6e6e6;
--- a/stuff/config/qss/Medium/imgs/black/transparent_16x16.png
+++ b/stuff/config/qss/Medium/imgs/black/transparent_16x16.png
--- a/stuff/config/qss/Medium/imgs/white/transparent_16x16.png
+++ b/stuff/config/qss/Medium/imgs/white/transparent_16x16.png
--- a/stuff/config/qss/Medium/less/Medium.less
+++ b/stuff/config/qss/Medium/less/Medium.less
@ -430,7 +430,7 @@
@xsheet-FxColumn-color:                     #8a674b;
@xsheet-ReferenceColumn-color:              lighten(@bg, 5);
@xsheet-PaletteColumn-color:                #42756e;
-@xsheet-MeshColumn-color:                   #5e4d72;
+@xsheet-MeshColumn-color:                   #594d75;
@xsheet-SoundTextColumn-color:              #a7a7a7;
@xsheet-SoundColumn-color:                  #578a8a;
@xsheet-SoundColumnHL-color:                #34FE5E;
@ -556,9 +556,13 @@
@function-KeyFrame-color:          darken(desaturate(spin(@keyframe-total-color, 0.0000), 0.7570), 8.4314);
@function-KeyFrameBorder-color:    lighten(@function-KeyFrame-color, 20);
@function-SelectedKeyFrame-color:  mix(shade(@function-KeyFrame-color, -40), @cellHighlightTintColor, 60);
+@function-IgnoredKeyFrame-color: rgb(172,42,57);
+@function-SelectedIgnoredKeyFrame-color: mix(shade(@function-IgnoredKeyFrame-color, -40), @cellHighlightTintColor, 60);
@function-Inbetween-color:         darken(desaturate(spin(@keyframe-inbetween-color, 0.4423), 4.8071), 7.2549);
@function-InbetweenBorder-color:   lighten(@keyframe-inbetween-color, 20);
@function-SelectedInbetween-color: mix(shade(@function-Inbetween-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
+@function-IgnoredInbetween-color: rgb(138,105,94);
+@function-SelectedIgnoredInbetween-color: mix(shade(@function-IgnoredInbetween-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);

 // Expression Field
@function-ExpressionFieldBG-color:     lighten(@bg, 61.9608);
--- a/stuff/config/qss/Medium/less/layouts/filebrowser.less
+++ b/stuff/config/qss/Medium/less/layouts/filebrowser.less
@ -80,7 +80,6 @@ StyledTreeView {
 ----------------------------------------------------------------------------- */

 #SceneCast {
-  &:extend(#FileBrowser all);
  & QToolBar {
    border-top: 1 solid @accent;
    &::separator {
--- a/stuff/config/qss/Medium/less/layouts/mainwindow.less
+++ b/stuff/config/qss/Medium/less/layouts/mainwindow.less
@ -167,7 +167,7 @@ QMenu {
  &::icon {
    border-radius: 2;
    position: absolute;
-    left: 5;
+    left: 7;
    padding: 0;
    margin: 0;
    qproperty-icon: url('@{img-url}/none');
@ -183,13 +183,7 @@ QMenu {
    &:exclusive {
      &:extend(.RadioButton::indicator all);
    }
-    margin-left: 7;
-    &:non-exclusive {
-      &:extend(.CheckBox::indicator all);
-    }
-    &:exclusive {
-      &:extend(.RadioButton::indicator all);
-    }
+    margin-left: 8;
  }
 }

@ -575,14 +569,17 @@ QTabBar {
  }
  
  &::branch {
+    /* A blank URL may not hide the Qt branch style in Linux, so we add
+       a transparent PNG which does. */
+    @blank_img: '@{img-url}/transparent_16x16.png';
+
    &:adjoins-item {
-      /* blank URL hides default Qt branch icons where it is not wanted */
-      border-image: url('');
+      border-image: url('@{blank_img}');
    }
    &:has-siblings {
-      border-image: url('');
+      border-image: url('@{blank_img}');
      &:adjoins-item {
-        border-image: url('');
+        border-image: url('@{blank_img}');
      }
    }
    &:has-children {
--- a/stuff/config/qss/Medium/less/layouts/palette.less
+++ b/stuff/config/qss/Medium/less/layouts/palette.less
@ -3,9 +3,6 @@
 ----------------------------------------------------------------------------- */

 #StyleEditor {
-  & #TabBarContainer {
-    margin-left: -5px;
-  }
  & #bottomWidget {
    border-top: 1 solid @accent;
    padding: 3 2 8 3;
--- a/stuff/config/qss/Medium/less/layouts/popups.less
+++ b/stuff/config/qss/Medium/less/layouts/popups.less
@ -77,6 +77,18 @@ QDialog {
  }
 }

+#ShortcutViewer {
+  font-size: 17px;
+  & QLineEdit{
+    color:black;
+    border-color: rgb(184, 188, 127);
+    background-color: white;
+    &:focus{
+      background-color: rgb(171, 206, 255);
+    } 
+  }
+}
+
 /* -----------------------------------------------------------------------------
   New Project / Configure Project Window
 ----------------------------------------------------------------------------- */
--- a/stuff/config/qss/Medium/less/layouts/xsheet.less
+++ b/stuff/config/qss/Medium/less/layouts/xsheet.less
@ -280,9 +280,13 @@ SpreadsheetViewer {
  qproperty-KeyFrameColor: @function-KeyFrame-color;
  qproperty-KeyFrameBorderColor: @function-KeyFrameBorder-color;
  qproperty-SelectedKeyFrameColor: @function-SelectedKeyFrame-color;
+  qproperty-IgnoredKeyFrameColor: @function-IgnoredKeyFrame-color;
+  qproperty-SelectedIgnoredKeyFrameColor: @function-SelectedIgnoredKeyFrame-color;
  qproperty-InBetweenColor: @function-Inbetween-color;
  qproperty-InBetweenBorderColor: @function-InbetweenBorder-color;
  qproperty-SelectedInBetweenColor: @function-SelectedInbetween-color;
+  qproperty-IgnoredInBetweenColor: @function-IgnoredInbetween-color;
+  qproperty-SelectedIgnoredInBetweenColor: @function-SelectedIgnoredInbetween-color;
  qproperty-SelectedEmptyColor: @xsheet-SelectedEmptyCell-color; // paired
  qproperty-SelectedSceneRangeEmptyColor: @function-SelectedSceneRangeEmpty-color;
  qproperty-TextColor: @xsheet-text-color; // paired
--- a/stuff/config/qss/Medium/less/themes/Dark.less
+++ b/stuff/config/qss/Medium/less/themes/Dark.less
@ -20,14 +20,14 @@
 // -----------------------------------------------------------------------------

@menu-bg-color: darken(@bg, 4);
-@menu-border-color: lighten(@menu-bg-color, 15);
+@menu-border-color: lighten(@menu-bg-color, 10);

 // -----------------------------------------------------------------------------
 // File Browser / Trees
 // -----------------------------------------------------------------------------

@tree-bg-color: darken(@bg, 4);
-@browser-itemview-bg-color: darken(@bg, 3);
+@browser-itemview-bg-color: darken(@bg, 0);
@prefs-tree-bg-color: darken(@bg, 4);

 // -----------------------------------------------------------------------------
@ -41,7 +41,7 @@
 // -----------------------------------------------------------------------------

@input-bg-color: darken(@bg, 8);
-@input-border-color: lighten(@bg, 15);
+@input-border-color: lighten(@bg, 10);

 // -----------------------------------------------------------------------------
 // CheckBox
@ -111,4 +111,11 @@

 // Function Spreadsheet Viewer
@function-ColumnHeaderBorder-color: lighten(@bg, 10);
-@function-ColumnHeaderBG-color: darken(@bg, 4);
+@function-ColumnHeaderBG-color: darken(@bg, 4);
+
+// -----------------------------------------------------------------------------
+// Schematic Viewer
+// -----------------------------------------------------------------------------
+
+// Node Viewer
+@schematic-viewer-bg-color:  darken(@bg, 4);
--- a/stuff/config/qss/Medium/less/themes/Light.less
+++ b/stuff/config/qss/Medium/less/themes/Light.less
@ -5,6 +5,8 @@
 // -----------------------------------------------------------------------------
 // This inherits from NEUTRAL theme, when updating NEUTRAL make sure to check
 // changes against LIGHT.
+//
+// NOTE: Compile Neutral.less before this.
 // -----------------------------------------------------------------------------

 // Override
@ -42,10 +44,7 @@
 // -----------------------------------------------------------------------------

 // Container
-@scrollbar-bg-color:                darken(@bg, 5);
-@scrollbar-handle-bg-color:         darken(@bg, 28);
-@scrollbar-handle-bg-color-hover:   darken(@scrollbar-handle-bg-color, 10);
-@scrollbar-handle-bg-color-pressed: darken(@scrollbar-handle-bg-color-hover, 15);
+@scrollbar-handle-bg-color:         darken(@bg, 15);

 // -----------------------------------------------------------------------------
 // Titlebars
@ -194,7 +193,7 @@
@xsheet-NotEmptyColumn-color:               @xsheet-bg-color;
@xsheet-SelectedEmptyCell-color:            fade(mix(lighten(@xsheet-EmptyCell-color, -20), @cellHighlightTintColor, 80), 50);

-@xsheet-LevelColumn-color:                  #9ed49e;
+@xsheet-LevelColumn-color:                  #a1cea1;
@xsheet-VectorColumn-color:                 #d39ab5;
@xsheet-ChildColumn-color:                  #cca3cc;
@xsheet-FullColorColumn-color:              #b0cbdd;
@ -234,7 +233,10 @@
@function-panel-bg-color: @schematic-viewer-bg-color;
@function-panel-OtherCurves-color: rgb(218, 218, 218);
@function-panel-Text-color: @text-color;
+
@function-panel-Sub-color: #fff;
@function-panel-Selected-color: #ffe033;
+@function-IgnoredKeyFrame-color: rgb(203,87,101);
+@function-IgnoredInbetween-color: rgb(194,156,146);

@function-SelectedKeyFrame-color:  mix(shade(@function-KeyFrame-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
--- a/stuff/config/qss/Medium/less/themes/Neutral.less
+++ b/stuff/config/qss/Medium/less/themes/Neutral.less
@ -51,8 +51,10 @@
 // Scrollbars
 // -----------------------------------------------------------------------------

-@scrollbar-bg-color: darken(@bg, 6);
-@scrollbar-handle-bg-color: lighten(@bg, 10);
+@scrollbar-bg-color: darken(@bg, 0);
+@scrollbar-handle-bg-color: darken(@bg, 12);
+@scrollbar-handle-bg-color-hover: darken(@scrollbar-handle-bg-color, 6);
+@scrollbar-handle-bg-color-pressed: darken(@scrollbar-handle-bg-color-hover, 6);

 // -----------------------------------------------------------------------------
 // Palette Window
--- a/stuff/config/qss/Neutral/Neutral.qss
+++ b/stuff/config/qss/Neutral/Neutral.qss
@ -7,8 +7,7 @@ QToolButton,
 #CameraSettingsRadioButton::indicator,
 #ForceSquaredPixelButton,
 #EditToolLockButton::indicator,
-#flipCustomize,
-#SceneCast QToolBar QToolButton {
+#flipCustomize {
  background-color: transparent;
  border: 1 solid transparent;
  border-radius: 2;
@ -22,8 +21,7 @@ QToolButton:hover,
 #colorSliderAddButton:hover,
 #colorSliderSubButton:hover,
 #EditToolLockButton::indicator:hover,
-#flipCustomize:hover,
-#SceneCast QToolBar QToolButton:hover {
+#flipCustomize:hover {
  background-color: #b3b3b3;
  border-color: #616161;
  color: #0d0d0d;
@ -36,8 +34,7 @@ QToolButton:pressed,
 #colorSliderAddButton:pressed,
 #colorSliderSubButton:pressed,
 #EditToolLockButton::indicator:pressed,
-#flipCustomize:pressed,
-#SceneCast QToolBar QToolButton:pressed {
+#flipCustomize:pressed {
  background-color: #676767;
  border-color: #525252;
  color: #0d0d0d;
@ -48,8 +45,7 @@ QToolButton:checked,
 #CameraSettingsRadioButton::indicator:checked,
 #ForceSquaredPixelButton:checked,
 #EditToolLockButton::indicator:checked,
-#flipCustomize:checked,
-#SceneCast QToolBar QToolButton:checked {
+#flipCustomize:checked {
  background-color: #8FA0B2;
  border-color: #445464;
  color: #000;
@ -60,8 +56,7 @@ QToolButton:checked:hover,
 #CameraSettingsRadioButton::indicator:checked:hover,
 #ForceSquaredPixelButton:checked:hover,
 #EditToolLockButton::indicator:checked:hover,
-#flipCustomize:checked:hover,
-#SceneCast QToolBar QToolButton:checked:hover {
+#flipCustomize:checked:hover {
  background-color: #a7b5c3;
  border-color: #445464;
 }
@ -71,8 +66,7 @@ QToolButton:disabled,
 #CameraSettingsRadioButton::indicator:disabled,
 #ForceSquaredPixelButton:disabled,
 #EditToolLockButton::indicator:disabled,
-#flipCustomize:disabled,
-#SceneCast QToolBar QToolButton:disabled {
+#flipCustomize:disabled {
  color: rgba(0, 0, 0, 0.4);
 }
 .button-tool:disabled:checked,
@ -81,8 +75,7 @@ QToolButton:disabled:checked,
 #CameraSettingsRadioButton::indicator:disabled:checked,
 #ForceSquaredPixelButton:disabled:checked,
 #EditToolLockButton::indicator:disabled:checked,
-#flipCustomize:disabled:checked,
-#SceneCast QToolBar QToolButton:disabled:checked {
+#flipCustomize:disabled:checked {
  background-color: rgba(143, 160, 178, 0.4);
  border-color: rgba(143, 160, 178, 0.4);
 }
@ -345,7 +338,7 @@ QMenu::separator {
 QMenu::icon {
  border-radius: 2;
  position: absolute;
-  left: 5;
+  left: 7;
  padding: 0;
  margin: 0;
  qproperty-icon: url('../Medium/imgs/black/none');
@ -355,7 +348,7 @@ QMenu::icon:checked {
  border: 1 solid #445464;
 }
 QMenu::indicator {
-  margin-left: 7;
+  margin-left: 8;
 }
 /* -----------------------------------------------------------------------------
   Titlebars
@ -382,10 +375,10 @@ TPanelTitleBarButton {
   Scrollbars
 ----------------------------------------------------------------------------- */
 QAbstractScrollArea::corner {
-  background-color: #717171;
+  background-color: #808080;
 }
 QScrollBar {
-  background-color: #717171;
+  background-color: #808080;
  border: 0;
 }
 QScrollBar:horizontal {
@ -397,26 +390,26 @@ QScrollBar:vertical {
  width: 15;
 }
 QScrollBar::handle {
-  border: 0 solid #9a9a9a;
+  border: 0 solid #616161;
  border-radius: 4;
 }
 QScrollBar::handle:horizontal:hover,
 QScrollBar::handle:vertical:hover {
-  background-color: #aeaeae;
-  border-color: #aeaeae;
+  background-color: #525252;
+  border-color: #525252;
 }
 QScrollBar::handle:horizontal:pressed,
 QScrollBar::handle:vertical:pressed {
-  background-color: #c2c2c2;
-  border-color: #c2c2c2;
+  background-color: #434343;
+  border-color: #434343;
 }
 QScrollBar::handle:horizontal {
-  background-color: #9a9a9a;
+  background-color: #616161;
  margin: 3 16;
  min-width: 20;
 }
 QScrollBar::handle:vertical {
-  background-color: #9a9a9a;
+  background-color: #616161;
  margin: 16 3 16 3;
  min-height: 20;
 }
@ -426,13 +419,13 @@ QScrollBar::add-line {
 }
 QScrollBar::add-line:horizontal {
  subcontrol-position: right;
-  background-color: #717171;
+  background-color: #808080;
  margin: 0;
  width: 16;
 }
 QScrollBar::add-line:vertical {
  subcontrol-position: bottom;
-  background-color: #717171;
+  background-color: #808080;
  margin: 0;
  height: 16;
 }
@ -442,13 +435,13 @@ QScrollBar::sub-line {
 }
 QScrollBar::sub-line:horizontal {
  subcontrol-position: left;
-  background-color: #717171;
+  background-color: #808080;
  margin: 0;
  width: 16;
 }
 QScrollBar::sub-line:vertical {
  subcontrol-position: top;
-  background-color: #717171;
+  background-color: #808080;
  margin: 0;
  height: 16;
 }
@ -714,24 +707,30 @@ QTreeView::item:selected,
  background-color: #8FA0B2;
  color: #000;
 }
+.treeview::branch,
+QTreeWidget::branch,
+QTreeView::branch,
+#FunctionEditorTree::branch {
+  /* A blank URL may not hide the Qt branch style in Linux, so we add
+       a transparent PNG which does. */
+}
 .treeview::branch:adjoins-item,
 QTreeWidget::branch:adjoins-item,
 QTreeView::branch:adjoins-item,
 #FunctionEditorTree::branch:adjoins-item {
-  /* blank URL hides default Qt branch icons where it is not wanted */
-  border-image: url('');
+  border-image: url('../Medium/imgs/black/transparent_16x16.png');
 }
 .treeview::branch:has-siblings,
 QTreeWidget::branch:has-siblings,
 QTreeView::branch:has-siblings,
 #FunctionEditorTree::branch:has-siblings {
-  border-image: url('');
+  border-image: url('../Medium/imgs/black/transparent_16x16.png');
 }
 .treeview::branch:has-siblings:adjoins-item,
 QTreeWidget::branch:has-siblings:adjoins-item,
 QTreeView::branch:has-siblings:adjoins-item,
 #FunctionEditorTree::branch:has-siblings:adjoins-item {
-  border-image: url('');
+  border-image: url('../Medium/imgs/black/transparent_16x16.png');
 }
 .treeview::branch:has-children:closed,
 QTreeWidget::branch:has-children:closed,
@ -1015,7 +1014,6 @@ QCheckBox:disabled {
 }
 .CheckBox::indicator,
 QMenu::indicator:non-exclusive,
-QMenu::indicator:non-exclusive,
 QCheckBox::indicator,
 .GroupBox::indicator,
 QGroupBox::indicator {
@ -1030,15 +1028,12 @@ QGroupBox::indicator {
 }
 .CheckBox::indicator:hover,
 QMenu::indicator:non-exclusive:hover,
-QMenu::indicator:non-exclusive:hover,
 .CheckBox::indicator:checked:hover,
 .CheckBox::indicator:indeterminate:hover,
 QCheckBox::indicator:hover,
 .GroupBox::indicator:hover,
 QMenu::indicator:non-exclusive:checked:hover,
 QMenu::indicator:non-exclusive:indeterminate:hover,
-QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:indeterminate:hover,
 QCheckBox::indicator:checked:hover,
 QCheckBox::indicator:indeterminate:hover,
 .GroupBox::indicator:checked:hover,
@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {
 }
 .CheckBox::indicator:checked,
 QMenu::indicator:non-exclusive:checked,
-QMenu::indicator:non-exclusive:checked,
 QCheckBox::indicator:checked,
 .GroupBox::indicator:checked,
 QGroupBox::indicator:checked {
@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {
 }
 .CheckBox::indicator:checked:hover,
 QMenu::indicator:non-exclusive:checked:hover,
-QMenu::indicator:non-exclusive:checked:hover,
 QCheckBox::indicator:checked:hover,
 .GroupBox::indicator:checked:hover,
 QGroupBox::indicator:checked:hover {
@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {
 }
 .CheckBox::indicator:checked:disabled,
 QMenu::indicator:non-exclusive:checked:disabled,
-QMenu::indicator:non-exclusive:checked:disabled,
 QCheckBox::indicator:checked:disabled,
 .GroupBox::indicator:checked:disabled,
 QGroupBox::indicator:checked:disabled {
@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {
 }
 .CheckBox::indicator:indeterminate,
 QMenu::indicator:non-exclusive:indeterminate,
-QMenu::indicator:non-exclusive:indeterminate,
 QCheckBox::indicator:indeterminate,
 .GroupBox::indicator:indeterminate,
 QGroupBox::indicator:indeterminate {
@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {
 }
 .CheckBox::indicator:indeterminate:disabled,
 QMenu::indicator:non-exclusive:indeterminate:disabled,
-QMenu::indicator:non-exclusive:indeterminate:disabled,
 QCheckBox::indicator:indeterminate:disabled,
 .GroupBox::indicator:indeterminate:disabled,
 QGroupBox::indicator:indeterminate:disabled {
@ -1100,7 +1090,6 @@ QGroupBox::indicator:indeterminate:disabled {
 }
 .CheckBox::indicator:disabled,
 QMenu::indicator:non-exclusive:disabled,
-QMenu::indicator:non-exclusive:disabled,
 QCheckBox::indicator:disabled,
 .GroupBox::indicator:disabled,
 QGroupBox::indicator:disabled {
@ -1130,7 +1119,6 @@ QRadioButton:disabled {
 }
 .RadioButton::indicator,
 QMenu::indicator:exclusive,
-QMenu::indicator:exclusive,
 QRadioButton::indicator,
 #CameraSettingsRadioButton_Small::indicator {
  width: 13;
@ -1141,28 +1129,24 @@ QRadioButton::indicator,
 }
 .RadioButton::indicator:unchecked,
 QMenu::indicator:exclusive:unchecked,
-QMenu::indicator:exclusive:unchecked,
 QRadioButton::indicator:unchecked,
 #CameraSettingsRadioButton_Small::indicator:unchecked {
  image: url('../Medium/imgs/black/radiobutton_unchecked.svg');
 }
 .RadioButton::indicator:unchecked:hover,
 QMenu::indicator:exclusive:unchecked:hover,
-QMenu::indicator:exclusive:unchecked:hover,
 QRadioButton::indicator:unchecked:hover,
 #CameraSettingsRadioButton_Small::indicator:unchecked:hover {
  image: url('../Medium/imgs/black/radiobutton_unchecked_hover.svg');
 }
 .RadioButton::indicator:checked,
 QMenu::indicator:exclusive:checked,
-QMenu::indicator:exclusive:checked,
 QRadioButton::indicator:checked,
 #CameraSettingsRadioButton_Small::indicator:checked {
  image: url('../Medium/imgs/black/radiobutton_checked.svg');
 }
 .RadioButton::indicator:checked:disabled,
 QMenu::indicator:exclusive:checked:disabled,
-QMenu::indicator:exclusive:checked:disabled,
 QRadioButton::indicator:checked:disabled,
 #CameraSettingsRadioButton_Small::indicator:checked:disabled {
  background-color: transparent;
@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,
 }
 .RadioButton::indicator:disabled,
 QMenu::indicator:exclusive:disabled,
-QMenu::indicator:exclusive:disabled,
 QRadioButton::indicator:disabled,
 #CameraSettingsRadioButton_Small::indicator:disabled {
  image: url('../Medium/imgs/black/radiobutton_unchecked_disabled.svg');
@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {
  qproperty-ColTextColor: #000;
  qproperty-ColBorderColor: #5a5a5a;
 }
-#FileBrowser,
-#SceneCast {
+#FileBrowser {
  background-color: #808080;
 }
-#FileBrowser QLabel,
-#SceneCast QLabel {
+#FileBrowser QLabel {
  background-color: transparent;
 }
-#FileBrowser QToolBar,
-#SceneCast QToolBar {
+#FileBrowser QToolBar {
  background-color: #808080;
 }
-#FileBrowser #castFrame,
-#SceneCast #castFrame {
+#FileBrowser #castFrame {
  border-top: 1 solid #5a5a5a;
  border-right: 1 solid #5a5a5a;
  border-bottom: 1 solid #5a5a5a;
@ -1496,9 +1475,6 @@ QStatusBar #StatusBarLabel {
 /* -----------------------------------------------------------------------------
   Style Editor
 ----------------------------------------------------------------------------- */
-#StyleEditor #TabBarContainer {
-  margin-left: -5px;
-}
 #StyleEditor #bottomWidget {
  border-top: 1 solid #5a5a5a;
  padding: 3 2 8 3;
@ -1679,6 +1655,17 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
  width: 16;
  margin-right: -1;
 }
+#ShortcutViewer {
+  font-size: 17px;
+}
+#ShortcutViewer QLineEdit {
+  color: black;
+  border-color: #b8bc7f;
+  background-color: white;
+}
+#ShortcutViewer QLineEdit:focus {
+  background-color: #abceff;
+}
 /* -----------------------------------------------------------------------------
   New Project / Configure Project Window
 ----------------------------------------------------------------------------- */
@ -2365,9 +2352,13 @@ SpreadsheetViewer {
  qproperty-KeyFrameColor: #c4833e;
  qproperty-KeyFrameBorderColor: #64421f;
  qproperty-SelectedKeyFrameColor: #deae7b;
+  qproperty-IgnoredKeyFrameColor: #ac2a39;
+  qproperty-SelectedIgnoredKeyFrameColor: #ca6377;
  qproperty-InBetweenColor: #b4b09e;
  qproperty-InBetweenBorderColor: #6e6c64;
  qproperty-SelectedInBetweenColor: #c7c7bb;
+  qproperty-IgnoredInBetweenColor: #8a695e;
+  qproperty-SelectedIgnoredInBetweenColor: #a08680;
  qproperty-SelectedEmptyColor: rgba(155, 159, 162, 0.5);
  qproperty-SelectedSceneRangeEmptyColor: rgba(155, 159, 162, 0.5);
  qproperty-TextColor: #000;
--- a/stuff/doc/LICENSE/LICENSE.txt
+++ b/stuff/doc/LICENSE/LICENSE.txt
@ -4,16 +4,16 @@ For licenses of third party libraries exploited in this software, please see the

 Tahoma2D

-All contributions by Jeremy Bullock:
-Copyright (c) 2016 - 2020, Jeremy Bullock
+All contributions by John Dancel:
+Copyright (c) 2016 - 2021, John Dancel
 All rights reserved.

 All contributions by DWANGO:
-Copyright (c) 2016 - 2020, DWANGO Co., Ltd.
+Copyright (c) 2016 - 2021, DWANGO Co., Ltd.
 All rights reserved.

 All other contributions:
-Copyright (c) 2016 - 2020, the respective contributors.
+Copyright (c) 2016 - 2021, the respective contributors.
 All rights reserved.

 Each contributor holds copyright over their respective contributions.
--- a/stuff/doc/LICENSE/LICENSE_crashrpt.txt
+++ b/stuff/doc/LICENSE/LICENSE_crashrpt.txt
@ -0,0 +1,28 @@
+CrashRpt
+
+Copyright (c) 2003, The CrashRpt Project Authors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this 
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+
+    * Neither the name of the author nor the names of its contributors 
+      may be used to endorse or promote products derived from this software without 
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt
+++ b/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt
@ -4,7 +4,7 @@ Tahoma2D does not directly use FFmpeg libraries or code.
 As of July 2020, Tahoma2D is shipping with FFmpeg 4.3 LGPL version from https://ffmpeg.zeranoe.com/builds/

 FFmpeg source code can be found at:
-https://github.com/turtletooth/FFmpeg
+https://github.com/tahoma2d/FFmpeg
 or 
 https://github.com/FFmpeg/FFmpeg

--- a/stuff/doc/LICENSE/LICENSE_opencv.txt
+++ b/stuff/doc/LICENSE/LICENSE_opencv.txt
@ -1,36 +1,202 @@
-                          License Agreement
-               For Open Source Computer Vision Library
-                       (3-clause BSD License)

-Copyright (C) 2000-2019, Intel Corporation, all rights reserved.
-Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
-Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved.
-Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved.
-Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved.
-Copyright (C) 2015-2016, Itseez Inc., all rights reserved.
-Third party copyrights are property of their respective owners.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/

-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+   1. Definitions.

-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.

-  * Neither the names of the copyright holders nor the names of the contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.

-This software is provided by the copyright holders and contributors "as is" and
-any express or implied warranties, including, but not limited to, the implied
-warranties of merchantability and fitness for a particular purpose are disclaimed.
-In no event shall copyright holders or contributors be liable for any direct,
-indirect, incidental, special, exemplary, or consequential damages
-(including, but not limited to, procurement of substitute goods or services;
-loss of use, data, or profits; or business interruption) however caused
-and on any theory of liability, whether in contract, strict liability,
-or tort (including negligence or otherwise) arising in any way out of
-the use of this software, even if advised of the possibility of such damage.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/stuff/doc/LICENSE/LICENSE_opentoonz.txt
+++ b/stuff/doc/LICENSE/LICENSE_opentoonz.txt
@ -1,11 +1,15 @@
+For licenses of third party libraries exploited in this software, please see the correspondent files in the same directory with this document.
+
+- - - - - - - - - - - - - - - -
+
 OpenToonz

 All contributions by DWANGO:
-Copyright (c) 2016 - 2018, DWANGO Co., Ltd.
+Copyright (c) 2016 - 2021, DWANGO Co., Ltd.
 All rights reserved.

 All other contributions:
-Copyright (c) 2016 - 2018, the respective contributors.
+Copyright (c) 2016 - 2021, the respective contributors.
 All rights reserved.

 Each contributor holds copyright over their respective contributions.
@ -24,4 +28,4 @@ Redistribution and use in source and binary forms, with or without modification,

 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/stuff/doc/LICENSE/LICENSE_rhubarb.txt
+++ b/stuff/doc/LICENSE/LICENSE_rhubarb.txt
@ -0,0 +1,9 @@
+Rhubarb Lip Sync is released under the MIT License (MIT).
+
+Copyright (c) 2015-2016 Daniel Wolf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/stuff/doc/LICENSE/LICENSE_rhubarb_info.txt
+++ b/stuff/doc/LICENSE/LICENSE_rhubarb_info.txt
@ -0,0 +1,7 @@
+Tahoma2D ships with Rhubarb Lip Sync, and uses Rhubarb Lip Sync through command line commands.
+Tahoma2D does not directly use Rhubarb Lip Sync libraries or code.
+
+Rhubarb Lip Sync source code can be found at:
+https://github.com/tahoma2d/rhubarb-lip-sync
+or 
+https://github.com/DanielSWolf/rhubarb-lip-sync
--- a/stuff/doc/LICENSE/LICENSE_tahoma2d.txt
+++ b/stuff/doc/LICENSE/LICENSE_tahoma2d.txt
@ -1,36 +0,0 @@
-License Agreement For Tahoma2D
-[https://github.com/turtletooth/tahoma2d]
-
- - - - - - - - - - - - - - - -
-
-Tahoma2D
-
-All contributions by Jeremy Bullock:
-Copyright (c) 2016 - 2020, Jeremy Bullock
-All rights reserved.
-
-All contributions by DWANGO:
-Copyright (c) 2016 - 2020, DWANGO Co., Ltd.
-All rights reserved.
-
-All other contributions:
-Copyright (c) 2016 - 2020, the respective contributors.
-All rights reserved.
-
-Each contributor holds copyright over their respective contributions.
-The project versioning (Git) records all such contribution source information.
-
-
-LICENSE
-
-BSD 3-Clause "New" or "Revised" License
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/stuff/fxs/presets/STD_particlesFx/Flock.fx
+++ b/stuff/fxs/presets/STD_particlesFx/Flock.fx
@ -0,0 +1,716 @@
+<dvpreset fxId="STD_particlesFx" ver="1.0">
+  <params>
+    <source_ctrl>
+      0 0 
+    </source_ctrl>
+    <bright_thres>
+      25 25 
+    </bright_thres>
+    <multi_source>
+      0 0 
+    </multi_source>
+    <center>
+      <x>
+        <default>
+          444.444 
+        </default>
+        </x>
+      <y>
+        <default>
+          0 
+        </default>
+        </y>
+      </center>
+    <length>
+      <default>
+        4.44444 
+      </default>
+      </length>
+    <height>
+      <default>
+        480 
+      </default>
+      </height>
+    <birth_rate>
+      <default>
+        1 
+      </default>
+      </birth_rate>
+    <lifetime>
+      <min>
+        <default>
+          900 
+        </default>
+        </min>
+      <max>
+        <default>
+          900 
+        </default>
+        </max>
+      </lifetime>
+    <lifetime_ctrl>
+      0 0 
+    </lifetime_ctrl>
+    <column_lifetime>
+      0 0 
+    </column_lifetime>
+    <starting_frame>
+      1 1 
+    </starting_frame>
+    <random_seed>
+      1 1 
+    </random_seed>
+    <gravity>
+      <default>
+        0 
+      </default>
+      </gravity>
+    <gravity_angle>
+      <default>
+        0 
+      </default>
+      </gravity_angle>
+    <gravity_ctrl>
+      0 0 
+    </gravity_ctrl>
+    <friction>
+      <default>
+        0 
+      </default>
+      </friction>
+    <friction_ctrl>
+      0 0 
+    </friction_ctrl>
+    <wind>
+      <default>
+        0 
+      </default>
+      </wind>
+    <wind_angle>
+      <default>
+        0 
+      </default>
+      </wind_angle>
+    <swing_mode>
+      1 
+    </swing_mode>
+    <scattering_x>
+      <min>
+        <default>
+          0 
+        </default>
+        </min>
+      <max>
+        <default>
+          0 
+        </default>
+        </max>
+      </scattering_x>
+    <scattering_y>
+      <min>
+        <default>
+          0.444444 
+        </default>
+        </min>
+      <max>
+        <default>
+          11.1111 
+        </default>
+        </max>
+      </scattering_y>
+    <scattering_x_ctrl>
+      0 0 
+    </scattering_x_ctrl>
+    <scattering_y_ctrl>
+      0 0 
+    </scattering_y_ctrl>
+    <swing>
+      <min>
+        <default>
+          15 
+        </default>
+        </min>
+      <max>
+        <default>
+          45 
+        </default>
+        </max>
+      </swing>
+    <speed>
+      <min>
+        <default>
+          20 
+        </default>
+        </min>
+      <max>
+        <default>
+          26.6667 
+        </default>
+        </max>
+      </speed>
+    <speed_ctrl>
+      0 0 
+    </speed_ctrl>
+    <speed_angle>
+      <min>
+        <default>
+          -105 
+        </default>
+        </min>
+      <max>
+        <default>
+          -60 
+        </default>
+        </max>
+      </speed_angle>
+    <speeda_ctrl>
+      0 0 
+    </speeda_ctrl>
+    <speeda_use_gradient>
+      0 0 
+    </speeda_use_gradient>
+    <speed_size>
+      0 1 
+    </speed_size>
+    <top_layer>
+      3 
+    </top_layer>
+    <mass>
+      <min>
+        <default>
+          1 
+        </default>
+        </min>
+      <max>
+        <default>
+          1 
+        </default>
+        </max>
+      </mass>
+    <scale>
+      <min>
+        <default>
+          30 
+        </default>
+        </min>
+      <max>
+        <default>
+          75 
+        </default>
+        </max>
+      </scale>
+    <scale_ctrl>
+      0 0 
+    </scale_ctrl>
+    <scale_ctrl_all>
+      0 0 
+    </scale_ctrl_all>
+    <rot>
+      <min>
+        <default>
+          0 
+        </default>
+        </min>
+      <max>
+        <default>
+          0 
+        </default>
+        </max>
+      </rot>
+    <rot_ctrl>
+      0 0 
+    </rot_ctrl>
+    <trail>
+      <min>
+        <default>
+          0 
+        </default>
+        </min>
+      <max>
+        <default>
+          0 
+        </default>
+        </max>
+      </trail>
+    <trail_step>
+      <default>
+        0 
+      </default>
+      </trail_step>
+    <spin_swing_mode>
+      0 
+    </spin_swing_mode>
+    <spin_speed>
+      <default>
+        0 
+      </default>
+      </spin_speed>
+    <spin_random>
+      <min>
+        <default>
+          0 
+        </default>
+        </min>
+      <max>
+        <default>
+          0 
+        </default>
+        </max>
+      </spin_random>
+    <spin_swing>
+      <min>
+        <default>
+          0 
+        </default>
+        </min>
+      <max>
+        <default>
+          0 
+        </default>
+        </max>
+      </spin_swing>
+    <path_aim>
+      0 0 
+    </path_aim>
+    <opacity>
+      <min>
+        <default>
+          0 
+        </default>
+        </min>
+      <max>
+        <default>
+          100 
+        </default>
+        </max>
+      </opacity>
+    <opacity_ctrl>
+      0 0 
+    </opacity_ctrl>
+    <trail_opacity>
+      <min>
+        <default>
+          0 
+        </default>
+        </min>
+      <max>
+        <default>
+          100 
+        </default>
+        </max>
+      </trail_opacity>
+    <scale_step>
+      <min>
+        <default>
+          -2 
+        </default>
+        </min>
+      <max>
+        <default>
+          3 
+        </default>
+        </max>
+      </scale_step>
+    <scale_step_ctrl>
+      0 0 
+    </scale_step_ctrl>
+    <fade_in>
+      <default>
+        0 
+      </default>
+      </fade_in>
+    <fade_out>
+      <default>
+        0 
+      </default>
+      </fade_out>
+    <animation>
+      3 
+    </animation>
+    <step>
+      1 1 
+    </step>
+    <birth_color>
+      <spectrum>
+        <s_value>
+          <default>
+            0 
+          </default>
+          <keyframes>
+            <S>
+              0 0 1 0 
+            </S>
+            </keyframes>
+          </s_value>
+        <col_value>
+          <red>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </red>
+          <green>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </green>
+          <blue>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </blue>
+          <matte>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </matte>
+          </col_value>
+        <s_value>
+          <default>
+            1 
+          </default>
+          <keyframes>
+            <S>
+              0 1 1 0 
+            </S>
+            </keyframes>
+          </s_value>
+        <col_value>
+          <red>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </red>
+          <green>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </green>
+          <blue>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </blue>
+          <matte>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </matte>
+          </col_value>
+        </spectrum>
+      </birth_color>
+    <birth_color_ctrl>
+      0 0 
+    </birth_color_ctrl>
+    <birth_color_spread>
+      <default>
+        0 
+      </default>
+      </birth_color_spread>
+    <birth_color_fade>
+      <default>
+        0 
+      </default>
+      </birth_color_fade>
+    <fadein_color>
+      <spectrum>
+        <s_value>
+          <default>
+            0 
+          </default>
+          <keyframes>
+            <S>
+              0 0 1 0 
+            </S>
+            </keyframes>
+          </s_value>
+        <col_value>
+          <red>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </red>
+          <green>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </green>
+          <blue>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </blue>
+          <matte>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </matte>
+          </col_value>
+        <s_value>
+          <default>
+            1 
+          </default>
+          <keyframes>
+            <S>
+              0 1 1 0 
+            </S>
+            </keyframes>
+          </s_value>
+        <col_value>
+          <red>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </red>
+          <green>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </green>
+          <blue>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </blue>
+          <matte>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </matte>
+          </col_value>
+        </spectrum>
+      </fadein_color>
+    <fadein_color_ctrl>
+      0 0 
+    </fadein_color_ctrl>
+    <fadein_color_spread>
+      <default>
+        0 
+      </default>
+      </fadein_color_spread>
+    <fadein_color_range>
+      <default>
+        0 
+      </default>
+      </fadein_color_range>
+    <fadein_color_fade>
+      <default>
+        0 
+      </default>
+      </fadein_color_fade>
+    <fadeout_color>
+      <spectrum>
+        <s_value>
+          <default>
+            0 
+          </default>
+          <keyframes>
+            <S>
+              0 0 1 0 
+            </S>
+            </keyframes>
+          </s_value>
+        <col_value>
+          <red>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </red>
+          <green>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </green>
+          <blue>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </blue>
+          <matte>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </matte>
+          </col_value>
+        <s_value>
+          <default>
+            1 
+          </default>
+          <keyframes>
+            <S>
+              0 1 1 0 
+            </S>
+            </keyframes>
+          </s_value>
+        <col_value>
+          <red>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </red>
+          <green>
+            <default>
+              0 
+            </default>
+            <keyframes>
+              <S>
+                0 0 1 0 
+              </S>
+              </keyframes>
+            </green>
+          <blue>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </blue>
+          <matte>
+            <default>
+              1 
+            </default>
+            <keyframes>
+              <S>
+                0 1 1 0 
+              </S>
+              </keyframes>
+            </matte>
+          </col_value>
+        </spectrum>
+      </fadeout_color>
+    <fadeout_color_ctrl>
+      0 0 
+    </fadeout_color_ctrl>
+    <fadeout_color_spread>
+      <default>
+        0 
+      </default>
+      </fadeout_color_spread>
+    <fadeout_color_range>
+      <default>
+        0 
+      </default>
+      </fadeout_color_range>
+    <fadeout_color_fade>
+      <default>
+        0 
+      </default>
+      </fadeout_color_fade>
+    <source_gradation>
+      0 0 
+    </source_gradation>
+    <pick_color_for_every_frame>
+      0 0 
+    </pick_color_for_every_frame>
+    <perspective_distribution>
+      0 1 
+    </perspective_distribution>
+    </params>
+  </dvpreset>
--- a/stuff/profiles/layouts/fxs/STD_iwa_GlareFx.xml
+++ b/stuff/profiles/layouts/fxs/STD_iwa_GlareFx.xml
@ -1,9 +1,24 @@
 <fxlayout help_command="iexplore" help_file="BokehIwa.html">
 	<page name="Glare Iwa">
 		<control>renderMode</control>
+		<control>irisMode</control>
+		<vbox modeSensitive="irisMode" mode="1,2,3,4">
+			<separator/>
+			<control>irisScale</control>
+			<control>irisSymmetry</control>
+			<control>irisAppearance</control>
+		</vbox>
+		<vbox modeSensitive="irisMode" mode="4">
+			<control>irisGearEdgeCount</control>
+			<control>irisRandomSeed</control>
+		</vbox>
+		<vbox modeSensitive="irisMode" mode="1,2,3,4">
+			<separator/>
+		</vbox>
 		<control>intensity</control>
 		<control>size</control>
 		<control>rotation</control>
+		<control>aberration</control>
 		<control>noise_factor</control>
 		<control>noise_size</control>
 		<control>noise_octave</control>
--- a/stuff/profiles/layouts/fxs/STD_iwa_MotionBlurCompFx.xml
+++ b/stuff/profiles/layouts/fxs/STD_iwa_MotionBlurCompFx.xml
@ -1,10 +1,10 @@
 <fxlayout help_file="MotionBlurIwa.html">
 	<page name="Motion Blur Iwa">
 	<vbox>
-		<hbox>
 		<control>motionObjectType</control>
+		<vbox modeSensitive="motionObjectType" mode="1,2,4">
 		<control>motionObjectIndex</control>
-		</hbox>
+		</vbox>
 		<control>shutterStart</control>
 		<control>startValue</control>
 		<control>startCurve</control>
--- a/stuff/profiles/layouts/rooms/Default/layouts.txt
+++ b/stuff/profiles/layouts/rooms/Default/layouts.txt
@ -3,4 +3,4 @@ room2.ini
 room3.ini 
 room4.ini 
 room5.ini 
- 
+room6.ini
--- a/stuff/profiles/layouts/rooms/Default/room1.ini
+++ b/stuff/profiles/layouts/rooms/Default/room1.ini
@ -9,7 +9,7 @@ pane_1\geometry=@Rect(34 764 1886 211)
 pane_1\orientation=LeftToRight
 pane_1\frameZoomFactor=100
 pane_2\name=SceneViewer
-pane_2\geometry=@Rect(297 30 1623 730)
+pane_2\geometry=@Rect(297 30 1623 704)
 pane_2\visibleParts=5
 pane_2\consoleParts=3435969580
 pane_3\name=ToolBar
@ -19,5 +19,7 @@ pane_4\geometry=@Rect(0 0 1920 26)
 pane_5\name=LevelPalette
 pane_5\geometry=@Rect(34 392 259 368)
 pane_5\viewtype=0
-hierarchy="-1 1 [ 4 [ 3 [ [ [ 0 5 ] 2 ] 1 ] ] ] "
+pane_6\name=CommandBar
+pane_6\geometry=@Rect(297 738 1623 26)
+hierarchy="-1 1 [ 4 [ 3 [ [ [ 0 5 ] [ 2 6 ] ] 1 ] ] ] "
 name=2D
--- a/stuff/profiles/layouts/rooms/Default/room6.ini
+++ b/stuff/profiles/layouts/rooms/Default/room6.ini
@ -0,0 +1,5 @@
+[room]
+hierarchy="-1 0 0 "
+name=History
+pane_0\geometry=@Rect(0 0 1920 945)
+pane_0\name=HistoryPanel
--- a/stuff/profiles/layouts/settings/mainwindow.ini
+++ b/stuff/profiles/layouts/settings/mainwindow.ini
@ -0,0 +1,2 @@
+[General]
+MainWindowGeometry="@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\xff\xff\xff\xf7\xff\xff\xff\xf7\0\0\a\x88\0\0\x4\x1a\0\0\0\x9f\0\0\0=\0\0\x6\xad\0\0\x3\xbf\0\0\0\0\x2\0\0\0\a\x80)"
--- a/stuff/profiles/layouts/shortcuts/deftahoma2d.ini
+++ b/stuff/profiles/layouts/shortcuts/deftahoma2d.ini
@ -397,7 +397,7 @@ T_Finger=
 T_FlipX=
 T_FlipY=
 T_Geometric=G
-T_Hand=
+T_Hand=Space
 T_Hook=O
 T_Iron=
 T_Magnet=
@ -407,7 +407,7 @@ T_Plastic=X
 T_PositionReset=
 T_Pump=
 T_RGBPicker=R
-T_Rotate=
+T_Rotate=Ctrl+Space
 T_RotateReset=
 T_Ruler=
 T_Selection=S
@ -418,7 +418,7 @@ T_Tape=T
 T_Tracker=
 T_Type=Y
 T_ViewReset=Alt+0
-T_Zoom=
+T_Zoom=Shift+Space
 T_ZoomFit=Alt+9
 T_Zoomin=+
 T_Zoomout=-
--- a/stuff/studiopalette/Global
+++ b/stuff/studiopalette/Global
@ -0,0 +1,62 @@
+<palette name="1611507682_28145">
+  <version>
+    71 0 
+  </version>
+  <styles>
+    <style>
+      "|-1611507682_28145-0"color_0 3 255 255 255 0 
+    </style>
+    <style>
+      "|-1611507682_28145-1"color_1 3 0 0 0 255 
+    </style>
+    <style>
+      "|-1611507682_28145-2"color_2 3 255 255 255 255 
+    </style>
+    <style>
+      _1 "|-1611507682_28145-3"color_3 3 255 0 0 255 
+    </style>
+    <style>
+      _1 "|-1611507682_28145-4"color_4 3 0 255 0 255 
+    </style>
+    <style>
+      _1 "|-1611507682_28145-5"color_5 3 0 0 255 255 
+    </style>
+    <style>
+      "|-1611507682_28145-6"color_6 3 255 128 255 255 
+    </style>
+    <style>
+      "|-1611507682_28145-7"color_7 3 128 255 192 255 
+    </style>
+    <style>
+      "|-1611507682_28145-8"color_8 3 255 255 0 255 
+    </style>
+    <style>
+      "|-1611507682_28145-9"color_9 3 128 128 255 255 
+    </style>
+    <style>
+      "|-1611507682_28145-10"color_10 3 255 128 0 255 
+    </style>
+    <style>
+      "|-1611507682_28145-11"color_11 3 0 192 255 255 
+    </style>
+    <style>
+      "|-1611507682_28145-12"color_12 3 128 255 255 255 
+    </style>
+    <style>
+      "|-1611507682_28145-13"color_13 3 255 128 128 255 
+    </style>
+    </styles>
+  <stylepages>
+    <page>
+      <name>
+        colors 
+      </name>
+      <indices>
+        0 1 2 3 4 5 6 7 8 9 10 11 12 13 
+      </indices>
+      </page>
+    </stylepages>
+  <shortcuts>
+    9 0 1 2 3 4 5 6 7 8 
+  </shortcuts>
+  </palette>
--- a/thirdparty/canon/.gitignore
+++ b/thirdparty/canon/.gitignore
@ -1,3 +1,4 @@
 Header/*
 library/*
-Framework/*
+Framework/*
+Dll/*
--- a/thirdparty/crashrpt/.gitignore
+++ b/thirdparty/crashrpt/.gitignore
@ -0,0 +1,2 @@
+include/*
+*.lib
--- a/thirdparty/crashrpt/copy_crashrpt.txt
+++ b/thirdparty/crashrpt/copy_crashrpt.txt
@ -0,0 +1,10 @@
+For Windows Builds Only!
+
+Copy the include folder from the CrashRpt source to here.
+Compile CrashRpt and copy the CrashRptXXXX.lib here also.
+
+When releasing with CrashRpt, include:
+	CrashRptXXXX.dll
+	CrashSenderXXXX.exe
+	crashrpt_lang.ini
+	dbghelp.dll (optional)
--- a/toonz/cmake/BundleInfo.plist.in
+++ b/toonz/cmake/BundleInfo.plist.in
@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Tahoma2D.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>io.github.turtletooth.Tahoma2D</string>
+	<string>io.github.tahoma2d.Tahoma2D</string>
    <key>NSCameraUsageDescription</key>
    <string>Tahoma2D needs access to the camera in order to use Camera Capture</string>
    <key>NSMicrophoneUsageDescription</key>
@ -23,11 +23,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
--- a/toonz/sources/CMakeLists.txt
+++ b/toonz/sources/CMakeLists.txt
@ -102,6 +102,7 @@ endif()
 option(WITH_SYSTEM_LZO "Use the system LZO library instead of 'thirdpary'" ${_init_SYSTEM_LZO})
 option(WITH_SYSTEM_SUPERLU "Use the system SuperLU library instead of 'thirdpary'" ${_init_SYSTEM_SUPERLU})
 option(WITH_CANON "Build with Canon DSLR support - Requires Canon SDK" OFF)
+option(WITH_CRASHRPT "Build CrashRpt support - Requires CrashRpt Library" OFF)

 # avoid using again
 option_defaults_clear()
@ -144,7 +145,7 @@ if(BUILD_ENV_MSVC)
        return()
    endif()
    set(QT_LIB_PATH ${QT_PATH})
-    set(CMAKE_PREFIX_PATH "${QT_PATH}/lib/cmake/")
+    set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${QT_PATH}/lib/cmake/")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4251")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251")
    add_definitions(
@ -158,12 +159,12 @@ elseif(BUILD_ENV_APPLE)
    endif()
    message("PLATFORM:" ${PLATFORM})
    if(PLATFORM EQUAL 64)
-        set(QT_PATH "~/Qt5.9.2/5.9.2/clang_64/lib" CACHE PATH "Qt installation directory")
-        # set(QT_PATH "/usr/local/Cellar/qt/5.15.0/lib" CACHE PATH "Qt installation directory")
+        set(QT_PATH "~/Qt5.9.2/5.9.2/clang_${PLATFORM}/lib" CACHE PATH "Qt installation directory")
        set(QT_LIB_PATH "${QT_PATH}/")
-        set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/")
-
-        message("CMAKE_PREFIX_PATH:" ${CMAKE_PREFIX_PATH})
+        set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${QT_LIB_PATH}cmake/")
+        foreach(path ${CMAKE_PREFIX_PATH})
+          message("CMAKE_PREFIX_PATH: " ${path})
+        endforeach(path)
        add_definitions(
            -DMACOSX
            -Di386
@ -277,6 +278,12 @@ if(BUILD_ENV_MSVC)
    add_definitions(
        -DGLUT_NO_LIB_PRAGMA
    )
+
+	if(WITH_CRASHRPT)
+		include_directories(
+			${SDKROOT}/crashrpt/include
+		)
+	endif()
 endif()

 if(BUILD_ENV_MSVC)
@ -370,6 +377,10 @@ if(BUILD_ENV_MSVC)
    endif()
    set(MYPAINT_LIB_INCLUDE_DIRS ${SDKROOT}/libmypaint/dist/${PLATFORM}/include/libmypaint)
    set(MYPAINT_LIB_LDFLAGS ${SDKROOT}/libmypaint/dist/${PLATFORM}/libmypaint.lib)
+
+	if(WITH_CRASHRPT)
+		set(CRASHRPT_LIB ${SDKROOT}/crashrpt/CrashRpt1500.lib)
+	endif()
 elseif(BUILD_ENV_APPLE)
    find_library(GLUT_LIB GLUT)
    find_library(GL_LIB OpenGL)
@ -395,7 +406,11 @@ elseif(BUILD_ENV_APPLE)
    if(GLEW-NOTFOUND)
        pkg_check_modules(GLEW REQUIRED glew)
    endif()
-    set(GLEW_LIB ${GLEW_LIBRARIES})
+    if (TARGET GLEW::GLEW)
+      set(GLEW_LIB GLEW::GLEW)
+    else()
+      set(GLEW_LIB ${GLEW_LIBRARIES})
+    endif()

    pkg_check_modules(LZ4_LIB REQUIRED liblz4)

@ -487,7 +502,7 @@ elseif(BUILD_ENV_UNIXLIKE)
        pkg_check_modules(FREETYPE REQUIRED freetype2)
    endif()
    # Can be 'libmypaint' or 'libmypaint-1.x'
-    pkg_search_module(MYPAINT_LIB REQUIRED libmypaint libmypaint-1.3>=1.3)
+    pkg_search_module(MYPAINT_LIB REQUIRED libmypaint)

    find_library(TURBOJPEG_LIB turbojpeg)
    message("**************** turbojpeg lib:" ${TURBOJPEG_LIB})
--- a/toonz/sources/common/expressions/texpression.cpp
+++ b/toonz/sources/common/expressions/texpression.cpp
@ -26,7 +26,8 @@ public:
      m_errorPos;  //!< Position of the error in the expression's text

  bool m_isValid,       //!< Whether the expression is valid
-      m_hasBeenParsed;  //!< Whether the expression has already been parsed
+      m_hasBeenParsed,  //!< Whether the expression has already been parsed
+      m_hasReference;

 public:
  Imp()
@ -35,7 +36,8 @@ public:
      , m_calculator(0)
      , m_errorPos(0, -1)
      , m_isValid(false)
-      , m_hasBeenParsed(true) {}
+      , m_hasBeenParsed(true)
+      , m_hasReference(false) {}
  ~Imp() { delete m_calculator; }
 };

@ -60,6 +62,7 @@ TExpression::TExpression(const TExpression &src) : m_imp(new Imp()) {
  m_imp->m_error         = src.m_imp->m_error;
  m_imp->m_errorPos      = src.m_imp->m_errorPos;
  m_imp->m_hasBeenParsed = false;
+  m_imp->m_hasReference  = src.m_imp->m_hasReference;
 }

 //--------------------------------------------------------------------------
@ -85,11 +88,12 @@ const TSyntax::Grammar *TExpression::getGrammar() const {
 //--------------------------------------------------------------------------

 void TExpression::setText(std::string text) {
-  if (m_imp->m_text != text) {
+  if (m_imp->m_text != text || m_imp->m_hasReference) {
    m_imp->m_text = text;
    delete m_imp->m_calculator;
    m_imp->m_calculator    = 0;
    m_imp->m_isValid       = false;
+    m_imp->m_hasReference  = false;
    m_imp->m_hasBeenParsed = false;
    m_imp->m_error         = "";
    m_imp->m_errorPos      = std::make_pair(0, -1);
@ -142,8 +146,9 @@ void TExpression::parse() {
  delete m_imp->m_calculator;
  m_imp->m_calculator = 0;

-  m_imp->m_errorPos = std::make_pair(0, -1);
-  m_imp->m_error    = std::string();
+  m_imp->m_errorPos     = std::make_pair(0, -1);
+  m_imp->m_error        = std::string();
+  m_imp->m_hasReference = false;

  if (!m_imp->m_grammar) {
    m_imp->m_error   = "No grammar defined";
@ -156,7 +161,8 @@ void TExpression::parse() {
    if (m_imp->m_calculator)
      m_imp->m_calculator->setOwnerParameter(m_imp->m_param);

-    m_imp->m_isValid = parser.isValid();
+    m_imp->m_isValid      = parser.isValid();
+    m_imp->m_hasReference = parser.hasReference();

    if (!m_imp->m_isValid) {
      m_imp->m_error    = parser.getError();
--- a/toonz/sources/common/expressions/tparser.cpp
+++ b/toonz/sources/common/expressions/tparser.cpp
@ -66,13 +66,15 @@ public:
  std::vector<SyntaxToken> m_syntaxTokens;
  Grammar::Position m_position;
  // Pattern *m_lastPattern;
+  bool m_hasReference;

  Imp(const Grammar *grammar)
      : m_grammar(grammar)
      , m_errorString("")
      , m_isValid(false)
      , m_calculator(0)
-      , m_position(Grammar::ExpressionStart) {}
+      , m_position(Grammar::ExpressionStart)
+      , m_hasReference(false) {}
  ~Imp() {
    clearPointerContainer(m_nodeStack);
    delete m_calculator;
@ -235,14 +237,24 @@ bool Parser::Imp::parseExpression(bool checkOnly) {
 Calculator *Parser::parse(std::string text) {
  m_imp->m_tokenizer.setBuffer(text);
  clearPointerContainer(m_imp->m_nodeStack);
-  m_imp->m_errorString = "";
-  m_imp->m_isValid     = false;
-  m_imp->m_calculator  = new Calculator();
-  bool ret             = m_imp->parseExpression(false);
+  m_imp->m_errorString  = "";
+  m_imp->m_isValid      = false;
+  m_imp->m_hasReference = false;
+  m_imp->m_calculator   = new Calculator();
+  bool ret              = m_imp->parseExpression(false);
  if (ret && !m_imp->m_nodeStack.empty()) {
    m_imp->m_calculator->setRootNode(m_imp->m_nodeStack.back());
+
+    for (auto node : m_imp->m_nodeStack) {
+      if (node->hasReference()) {
+        m_imp->m_hasReference = true;
+        break;
+      }
+    }
+
    m_imp->m_nodeStack.pop_back();
    m_imp->m_isValid = true;
+
  } else {
    delete m_imp->m_calculator;
    m_imp->m_calculator = 0;
@ -306,6 +318,10 @@ bool Parser::isValid() const { return m_imp->m_isValid; }

 //-------------------------------------------------------------------

+bool Parser::hasReference() const { return m_imp->m_hasReference; }
+
+//-------------------------------------------------------------------
+
 std::string Parser::getText() const { return m_imp->m_tokenizer.getBuffer(); }

 //-------------------------------------------------------------------
--- a/toonz/sources/common/tcore/tundo.cpp
+++ b/toonz/sources/common/tcore/tundo.cpp
@ -37,9 +37,10 @@ public:
  }
  int getUndoCount() const { return (int)m_undos.size(); }
  void setLast() {
-    for (UINT i                   = 1; i < m_undos.size(); i++)
-      m_undos[i]->m_isLastInBlock = false;
-    m_undos[0]->m_isLastInBlock   = true;
+    for (UINT i = 0; i < m_undos.size(); i++) {
+      m_undos[i]->m_isLastInBlock     = (i == 0);
+      m_undos[i]->m_isLastInRedoBlock = (i == m_undos.size() - 1);
+    }
  }

  void undo() const override {
@ -65,7 +66,8 @@ public:
  //}
  void onAdd() override {}
  void add(TUndo *undo) {
-    undo->m_isLastInBlock = true;
+    undo->m_isLastInBlock     = true;
+    undo->m_isLastInRedoBlock = true;
    m_undos.push_back(undo);
  }

@ -97,7 +99,7 @@ public:
      return m_undos.back()->getHistoryType();
  }
 };
-}
+}  // namespace

 typedef std::deque<TUndo *> UndoList;
 typedef UndoList::iterator UndoListIterator;
@ -186,9 +188,8 @@ void TUndoManager::TUndoManagerImp::doAdd(TUndo *undo) {
  int i, memorySize = 0, count = m_undoList.size();
  for (i = 0; i < count; i++) memorySize += m_undoList[i]->getSize();

-  while (
-      count > 100 ||
-      (count != 0 && memorySize + undo->getSize() > m_undoMemorySize))  // 20MB
+  while (count > 100 || (count != 0 && memorySize + undo->getSize() >
+                                           m_undoMemorySize))  // 20MB
  {
    --count;
    TUndo *undo = m_undoList.front();
@ -197,7 +198,8 @@ void TUndoManager::TUndoManagerImp::doAdd(TUndo *undo) {
    delete undo;
  }

-  undo->m_isLastInBlock = true;
+  undo->m_isLastInBlock     = true;
+  undo->m_isLastInRedoBlock = true;
  m_undoList.push_back(undo);
  m_current = m_undoList.end();
 }
--- a/toonz/sources/common/tfx/tfx.cpp
+++ b/toonz/sources/common/tfx/tfx.cpp
@ -701,6 +701,9 @@ void TFx::setNewIdentifier() { m_imp->m_id = ++m_imp->m_nextId; }
 //--------------------------------------------------

 void TFx::loadData(TIStream &is) {
+  // default version of fx is 1
+  setFxVersion(1);
+
  std::string tagName;
  VersionNumber tnzVersion = is.getVersion();
  // Prevent to load "params" tag under "super" tag on saving macro fx.
@ -818,6 +821,10 @@ void TFx::loadData(TIStream &is) {
        is >> groupName;
        groupNames.append(groupName);
      }
+    } else if (tagName == "fxVersion") {
+      int version = 1;
+      is >> version;
+      setFxVersion(version);
    } else {
      throw TException("Unknown tag!");
    }
@ -907,6 +914,7 @@ void TFx::saveData(TOStream &os) {
    for (i = 0; i < groupNameStack.size(); i++) os << groupNameStack[i];
    os.closeChild();
  }
+  if (getFxVersion() != 1) os.child("fxVersion") << getFxVersion();
 }

 //--------------------------------------------------
@ -992,6 +1000,14 @@ TFx *TFx::getLinkedFx() const {
  return m_imp->m_next->m_fx;
 }

+//--------------------------------------------------
+
+void TFx::setFxVersion(int v) { m_imp->m_attributes.setFxVersion(v); }
+
+//--------------------------------------------------
+
+int TFx::getFxVersion() const { return m_imp->m_attributes.getFxVersion(); }
+
 //===================================================
 //
 // TFxTimeRegion
--- a/toonz/sources/common/tgl/tgl.cpp
+++ b/toonz/sources/common/tgl/tgl.cpp
@ -66,7 +66,7 @@ double tglGetPixelSize2() {
  glMatrixMode(GL_MODELVIEW);
  glGetDoublev(GL_MODELVIEW_MATRIX, mat);

-  double det                      = fabs(mat[0] * mat[5] - mat[1] * mat[4]);
+  double det = fabs(mat[0] * mat[5] - mat[1] * mat[4]);
  if (det < TConsts::epsilon) det = TConsts::epsilon;
  return 1.0 / det;
 }
@ -431,7 +431,7 @@ void tglDraw(const TRectD &rect, const std::vector<TRaster32P> &textures,
  unsigned int level = 1;
  while (pixelSize2 * level * level <= 1.0) level <<= 1;

-  unsigned int texturesCount       = (int)textures.size();
+  unsigned int texturesCount = (int)textures.size();
  if (level > texturesCount) level = texturesCount;

  level = texturesCount - level;
@ -467,8 +467,8 @@ void tglDraw(const TRectD &rect, const TRaster32P &tex, bool blending) {
    texture = TRaster32P(texWidth, texHeight);
    texture->fill(TPixel32(0, 0, 0, 0));
    texture->copy(tex);
-    lwTex                  = (texLx) / (double)(texWidth);
-    lhTex                  = (texLy) / (double)(texHeight);
+    lwTex = (texLx) / (double)(texWidth);
+    lhTex = (texLy) / (double)(texHeight);
    if (lwTex > 1.0) lwTex = 1.0;
    if (lhTex > 1.0) lhTex = 1.0;
  } else
@ -587,10 +587,10 @@ void tglBuildMipmaps(std::vector<TRaster32P> &rasters,
    ly >>= 1;
    if (lx < 1) lx = 1;
    if (ly < 1) ly = 1;
-    rasters[i]     = TRaster32P(lx, ly);
-    sx             = (double)lx / (double)ras2Lx;
-    sy             = (double)ly / (double)ras2Ly;
-    rasters[i]     = TRaster32P(lx, ly);
+    rasters[i] = TRaster32P(lx, ly);
+    sx         = (double)lx / (double)ras2Lx;
+    sy         = (double)ly / (double)ras2Ly;
+    rasters[i] = TRaster32P(lx, ly);
 #ifndef SCALE_BY_GLU
    TRop::resample(rasters[i], ras2, TScale(sx, sy), resampleFilter);
 #else
--- a/toonz/sources/common/tparam/tdoublekeyframe.cpp
+++ b/toonz/sources/common/tparam/tdoublekeyframe.cpp
@ -57,7 +57,7 @@ void TDoubleKeyframe::saveData(TOStream &os) const {
  // Dirty resolution. Because the degree sign is converted to unexpected
  // string...
  if (QString::fromStdWString(L"\u00b0").toStdString() == unitName)
-    unitName = "\\u00b0";
+    unitName = "degrees";
  switch (m_type) {
  case Constant:
  case Exponential:
@ -157,6 +157,9 @@ void TDoubleKeyframe::loadData(TIStream &is) {
    break;
  }
  if (!is.matchEndTag()) throw TException(tagName + " : missing endtag");
-  if (m_unitName == "default") m_unitName = "";
-  m_isKeyframe                            = true;
+  if (m_unitName == "default")
+    m_unitName = "";
+  else if (m_unitName == "degrees")
+    m_unitName = "\u00b0";
+  m_isKeyframe = true;
 }
--- a/toonz/sources/common/tstream/tstream.cpp
+++ b/toonz/sources/common/tstream/tstream.cpp
@ -32,7 +32,7 @@ string escape(string v) {
    i = v.find_first_of("\\\"", i);
 #endif
    if (i == (int)string::npos) break;
-    string h = "\\" + v[i];
+//    string h = "\\" + v[i];
    v.insert(i, "\\");
    i = i + 2;
  }
--- a/toonz/sources/common/tsystem/tfilepath.cpp
+++ b/toonz/sources/common/tsystem/tfilepath.cpp
@ -316,7 +316,11 @@ bool TFilePath::operator==(const TFilePath &fp) const {
 #ifdef _WIN32
  return _wcsicmp(m_path.c_str(), fp.m_path.c_str()) == 0;
 #else
-  return m_path == fp.m_path;
+  // On case insensitive systems like OSX, we need to
+  // compare using all the same case to confirm it is unique
+  // We'll force this for Linux as well since the project might
+  // be shared on other platforms.
+  return toLower(m_path) == toLower(fp.m_path);
 #endif
 }

@ -705,7 +709,7 @@ TFrameId TFilePath::getFrame() const {

 bool TFilePath::isFfmpegType() const {
  QString type = QString::fromStdString(getType()).toLower();
-  if (type == "gif" || type == "mp4" || type == "webm")
+  if (type == "gif" || type == "mp4" || type == "webm" || type == "mov")
    return true;
  else
    return false;
@ -810,8 +814,12 @@ TFilePath TFilePath::withFrame(const TFrameId &frame,
  int k = str.substr(0, j).rfind(L'.');

  bool hasValidFrameNum = false;
-  if (!isFfmpegType() && checkForSeqNum(type) && isNumbers(str, k, j))
-    hasValidFrameNum = true;
+  if (!isFfmpegType() && checkForSeqNum(type)) {
+    if (isNumbers(str, k, j))
+      hasValidFrameNum = true;
+    else
+      k = (int)std::wstring::npos;
+  }
  std::string frameString;
  if (frame.isNoFrame())
    frameString = "";
--- a/toonz/sources/common/tsystem/tsystem.cpp
+++ b/toonz/sources/common/tsystem/tsystem.cpp
@ -468,13 +468,11 @@ void TSystem::readDirectory_DirItems(QStringList &dst, const TFilePath &path) {

 #ifdef _WIN32
  // equivalent to sorting with QDir::LocaleAware
-  struct strCompare {
-    bool operator()(const QString &s1, const QString &s2) const {
-      return QString::localeAwareCompare(s1, s2) < 0;
-    }
+  auto const strCompare = [](const QString &s1, const QString &s2) {
+    return QString::localeAwareCompare(s1, s2) < 0;
  };

-  std::set<QString, strCompare> entries;
+  std::set<QString, decltype(strCompare)> entries(strCompare);

  WIN32_FIND_DATA find_dir_data;
  QString dir_search_path = dir.absolutePath() + "\\*";
@ -805,6 +803,18 @@ bool TSystem::doesExistFileOrLevel(const TFilePath &fp) {
    TFilePathSet::iterator it, end = files.end();
    for (it = files.begin(); it != end; ++it) {
      if (it->getLevelNameW() == fp.getLevelNameW()) return true;
+// On case insensitive systems like Windows/OSX, we need to
+// compare using all the same case to confirm it is unique
+// We'll force this for Linux as well since the project might
+// be shared on other platforms.
+#ifdef _WIN32
+      if (_wcsicmp(it->getLevelNameW().c_str(), fp.getLevelNameW().c_str()) ==
+          0)
+        return true;
+#else
+      if (toLower(it->getLevelNameW()) == toLower(fp.getLevelNameW()))
+        return true;
+#endif
    }
  } else if (fp.getType() == "psd") {
    QString name(QString::fromStdWString(fp.getWideName()));
@ -1034,6 +1044,20 @@ bool TSystem::showDocument(const TFilePath &path) {
 #endif
 }

+QString TSystem::findFileLocation(QStringList folderList, QString fileName) {
+  if (folderList.isEmpty()) return "";
+
+  QStringList::iterator it;
+  for (it = folderList.begin(); it != folderList.end(); it++) {
+    QString path = *it + "/" + fileName;
+    TFilePath fp(path);
+    if (TSystem::doesExistFileOrLevel(fp) && !TFileStatus(fp).isDirectory())
+      return *it;
+  }
+
+  return "";
+}
+
 #else

 #include <windows.h>
--- a/toonz/sources/common/tvrender/tfont_qt.cpp
+++ b/toonz/sources/common/tvrender/tfont_qt.cpp
@ -167,6 +167,19 @@ TPoint TFont::drawChar(QImage &outImage, TPoint &unused, wchar_t charcode,
    return TPoint(0, 0);
  }

+  // Workaround for unix when the user using the space character:
+  // alphaMapForGlyph with a space character returns an invalid
+  // QImage for some reason.
+  // Bug 3604: https://github.com/opentoonz/opentoonz/issues/3604
+#ifdef Q_OS_UNIX
+  if (chars[0] == L' ') {
+      outImage = QImage(raw.averageCharWidth(), raw.ascent() + raw.descent(),
+                        QImage::Format_Grayscale8);
+      outImage.fill(255);
+      return getDistance(charcode, nextCharCode);
+  }
+#endif
+
  QImage image = raw.alphaMapForGlyph(indices[0], QRawFont::PixelAntialiasing);
  if (image.format() != QImage::Format_Indexed8 &&
      image.format() != QImage::Format_Alpha8)
--- a/toonz/sources/image/CMakeLists.txt
+++ b/toonz/sources/image/CMakeLists.txt
@ -21,6 +21,7 @@ set(HEADERS
    ffmpeg/tiio_gif.h
    ffmpeg/tiio_webm.h
    ffmpeg/tiio_mp4.h
+    ffmpeg/tiio_mov.h
    ffmpeg/tiio_ffmpeg.h
    sprite/tiio_sprite.h
    mesh/tiio_mesh.h
@ -50,6 +51,7 @@ set(SOURCES
    ffmpeg/tiio_gif.cpp
    ffmpeg/tiio_webm.cpp
    ffmpeg/tiio_mp4.cpp
+    ffmpeg/tiio_mov.cpp
    ffmpeg/tiio_ffmpeg.cpp
    sprite/tiio_sprite.cpp
    mesh/tiio_mesh.cpp
--- a/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
+++ b/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
@ -13,95 +13,88 @@
 #include "tmsgcore.h"

 Ffmpeg::Ffmpeg() {
-  m_ffmpegPath         = Preferences::instance()->getFfmpegPath();
-  m_ffmpegTimeout      = Preferences::instance()->getFfmpegTimeout() * 1000;
+  m_ffmpegPath    = Preferences::instance()->getFfmpegPath();
+  m_ffmpegTimeout = Preferences::instance()->getFfmpegTimeout();
+  if (m_ffmpegTimeout > 0)
+    m_ffmpegTimeout *= 1000;
+  else
+    m_ffmpegTimeout    = -1;
  std::string strPath  = m_ffmpegPath.toStdString();
  m_intermediateFormat = "png";
 }
 Ffmpeg::~Ffmpeg() {}

 bool Ffmpeg::checkFfmpeg() {
-  // check the user defined path in preferences first
-  QString path = Preferences::instance()->getFfmpegPath() + "/ffmpeg";
+  QString exe = "ffmpeg";
 #if defined(_WIN32)
-  path = path + ".exe";
+  exe = exe + ".exe";
 #endif
+
+  // check the user defined path in preferences first
+  QString path = Preferences::instance()->getFfmpegPath() + "/" + exe;
  if (TSystem::doesExistFileOrLevel(TFilePath(path))) return true;

-  // check the Tahoma root directory next
-  path = QDir::currentPath() + "/ffmpeg";
-#if defined(_WIN32)
-  path = path + ".exe";
-#endif
-  if (TSystem::doesExistFileOrLevel(TFilePath(path))) {
-    Preferences::instance()->setValue(ffmpegPath, QDir::currentPath());
-    return true;
-  }
+  // Let's try and autodetect the exe included with release
+  QStringList folderList;
+
+  folderList.append(".");
+  folderList.append("./ffmpeg");  // ffmpeg folder

 #ifdef MACOSX
-  path = QDir::currentPath() + "/" +
-         QString::fromStdString(TEnv::getApplicationFileName()) +
-         ".app/ffmpeg/ffmpeg";
-  if (TSystem::doesExistFileOrLevel(TFilePath(path))) {
-    Preferences::instance()->setValue(
-        ffmpegPath, QDir::currentPath() + "/" +
-                        QString::fromStdString(TEnv::getApplicationFileName()) +
-                        ".app/ffmpeg/");
-    return true;
-  }
+  // Look inside app
+  folderList.append("./" +
+                    QString::fromStdString(TEnv::getApplicationFileName()) +
+                    ".app/ffmpeg");  // ffmpeg folder
+#elif defined LINUX
+  // Need to account for symbolic links
+  folderList.append(TEnv::getWorkingDirectory().getQString() +
+                    "/ffmpeg");  // ffmpeg folder
 #endif

-#ifdef LINUX
-  QString currentPath = TEnv::getWorkingDirectory().getQString();
-  path                = currentPath + "/ffmpeg/ffmpeg";
-  if (TSystem::doesExistFileOrLevel(TFilePath(path))) {
-    Preferences::instance()->setValue(ffmpegPath, currentPath + "/ffmpeg/");
+  QString exePath = TSystem::findFileLocation(folderList, exe);
+
+  if (!exePath.isEmpty()) {
+    Preferences::instance()->setValue(ffmpegPath, exePath);
    return true;
  }
-#endif
+
  // give up
  return false;
 }

 bool Ffmpeg::checkFfprobe() {
-  // check the user defined path in preferences first
-  QString path = Preferences::instance()->getFfmpegPath() + "/ffprobe";
+  QString exe = "ffprobe";
 #if defined(_WIN32)
-  path = path + ".exe";
+  exe = exe + ".exe";
 #endif
+
+  // check the user defined path in preferences first
+  QString path = Preferences::instance()->getFfmpegPath() + "/" + exe;
  if (TSystem::doesExistFileOrLevel(TFilePath(path))) return true;

-  // check the Tahoma root directory next
-  path = QDir::currentPath() + "/ffprobe";
-#if defined(_WIN32)
-  path = path + ".exe";
-#endif
-  if (TSystem::doesExistFileOrLevel(TFilePath(path))) {
-    Preferences::instance()->setValue(ffmpegPath, QDir::currentPath());
-    return true;
-  }
+  // Let's try and autodetect the exe included with release
+  QStringList folderList;
+
+  folderList.append(".");
+  folderList.append("./ffmpeg");  // ffmpeg folder

 #ifdef MACOSX
-  path = QDir::currentPath() + "/" +
-         QString::fromStdString(TEnv::getApplicationFileName()) +
-         ".app/ffmpeg/ffprobe";
-  if (TSystem::doesExistFileOrLevel(TFilePath(path))) {
-    Preferences::instance()->setValue(
-        ffmpegPath, QDir::currentPath() + "/" +
-                        QString::fromStdString(TEnv::getApplicationFileName()) +
-                        ".app/ffmpeg/");
-    return true;
-  }
+  // Look inside app
+  folderList.append("./" +
+                    QString::fromStdString(TEnv::getApplicationFileName()) +
+                    ".app/ffmpeg");  // ffmpeg folder
+#elif defined LINUX
+  // Need to account for symbolic links
+  folderList.append(TEnv::getWorkingDirectory().getQString() +
+                    "/ffmpeg");  // ffmpeg folder
 #endif

-#ifdef LINUX
-  QString currentPath = TEnv::getWorkingDirectory().getQString();
-  path                = currentPath + "/ffmpeg/ffprobe";
-  if (TSystem::doesExistFileOrLevel(TFilePath(path))) {
-    Preferences::instance()->setValue(ffmpegPath, currentPath + "/ffmpeg/");
+  QString exePath = TSystem::findFileLocation(folderList, exe);
+
+  if (!exePath.isEmpty()) {
+    Preferences::instance()->setValue(ffmpegPath, exePath);
    return true;
  }
-#endif

  // give up
  return false;
@ -481,6 +474,11 @@ void Ffmpeg::getFramesFromMovie(int frame) {
    // frameArgs << "-accurate_seek";
    // frameArgs << "-ss";
    // frameArgs << "0" + QString::number(frameIndex / m_info->m_frameRate);
+    if (m_path.getType() == "webm") {
+      // To load in webm transparency
+      preIFrameArgs << "-vcodec";
+      preIFrameArgs << "libvpx";
+    }
    preIFrameArgs << "-i";
    preIFrameArgs << m_path.getQString();
    postIFrameArgs << "-y";
--- a/toonz/sources/image/ffmpeg/tiio_ffmpeg.h
+++ b/toonz/sources/image/ffmpeg/tiio_ffmpeg.h
@ -46,7 +46,7 @@ public:
 private:
  QString m_intermediateFormat, m_ffmpegPath, m_audioPath, m_audioFormat;
  int m_frameCount    = 0, m_lx, m_ly, m_bpp, m_bitsPerSample, m_channelCount,
-      m_ffmpegTimeout = 30000, m_frameNumberOffset = -1;
+      m_ffmpegTimeout = -1, m_frameNumberOffset = -1;
  double m_frameRate  = 24.0;
  bool m_ffmpegExists = false, m_ffprobeExists = false, m_hasSoundTrack = false;
  TFilePath m_path;
--- a/toonz/sources/image/ffmpeg/tiio_mov.cpp
+++ b/toonz/sources/image/ffmpeg/tiio_mov.cpp
@ -0,0 +1,243 @@
+
+#include "tsystem.h"
+#include "tiio_mov.h"
+#include "trasterimage.h"
+#include "timageinfo.h"
+#include "tsound.h"
+#include "toonz/stage.h"
+#include <QStringList>
+
+//===========================================================
+//
+//  TImageWriterMov
+//
+//===========================================================
+
+class TImageWriterMov : public TImageWriter {
+public:
+  int m_frameIndex;
+
+  TImageWriterMov(const TFilePath &path, int frameIndex, TLevelWriterMov *lwg)
+      : TImageWriter(path), m_frameIndex(frameIndex), m_lwg(lwg) {
+    m_lwg->addRef();
+  }
+  ~TImageWriterMov() { m_lwg->release(); }
+
+  bool is64bitOutputSupported() override { return false; }
+  void save(const TImageP &img) override { m_lwg->save(img, m_frameIndex); }
+
+private:
+  TLevelWriterMov *m_lwg;
+};
+
+//===========================================================
+//
+//  TLevelWriterMov;
+//
+//===========================================================
+
+TLevelWriterMov::TLevelWriterMov(const TFilePath &path, TPropertyGroup *winfo)
+    : TLevelWriter(path, winfo) {
+  if (!m_properties) m_properties = new Tiio::MovWriterProperties();
+  if (m_properties->getPropertyCount() == 0) {
+    m_scale      = 100;
+    m_vidQuality = 100;
+  } else {
+    std::string scale = m_properties->getProperty("Scale")->getValueAsString();
+    m_scale           = QString::fromStdString(scale).toInt();
+    std::string quality =
+        m_properties->getProperty("Quality")->getValueAsString();
+    m_vidQuality = QString::fromStdString(quality).toInt();
+  }
+  ffmpegWriter = new Ffmpeg();
+  ffmpegWriter->setPath(m_path);
+  if (TSystem::doesExistFileOrLevel(m_path)) TSystem::deleteFile(m_path);
+}
+
+//-----------------------------------------------------------
+
+TLevelWriterMov::~TLevelWriterMov() {
+  // QProcess createMov;
+  QStringList preIArgs;
+  QStringList postIArgs;
+
+  int outLx = m_lx;
+  int outLy = m_ly;
+
+  // set scaling
+  if (m_scale != 0) {
+    outLx = m_lx * m_scale / 100;
+    outLy = m_ly * m_scale / 100;
+  }
+  // ffmpeg doesn't like resolutions that aren't divisible by 2.
+  if (outLx % 2 != 0) outLx++;
+  if (outLy % 2 != 0) outLy++;
+
+  // calculate quality (bitrate)
+  int pixelCount   = m_lx * m_ly;
+  int bitRate      = pixelCount / 150;  // crude but gets decent values
+  double quality   = m_vidQuality / 100.0;
+  double tempRate  = (double)bitRate * quality;
+  int finalBitrate = (int)tempRate;
+  int crf          = 51 - (m_vidQuality * 51 / 100);
+
+  preIArgs << "-framerate";
+  preIArgs << QString::number(m_frameRate);
+
+  postIArgs << "-pix_fmt";
+  postIArgs << "yuva444p10le";
+  postIArgs << "-c:v";
+  postIArgs << "prores_ks";
+  postIArgs << "-profile";
+  postIArgs << "4444";
+  postIArgs << "-s";
+  postIArgs << QString::number(outLx) + "x" + QString::number(outLy);
+  postIArgs << "-b";
+  postIArgs << QString::number(finalBitrate) + "k";
+
+  ffmpegWriter->runFfmpeg(preIArgs, postIArgs, false, false, true);
+  ffmpegWriter->cleanUpFiles();
+}
+
+//-----------------------------------------------------------
+
+TImageWriterP TLevelWriterMov::getFrameWriter(TFrameId fid) {
+  // if (IOError != 0)
+  //	throw TImageException(m_path, buildMovExceptionString(IOError));
+  if (fid.getLetter() != 0) return TImageWriterP(0);
+  int index            = fid.getNumber();
+  TImageWriterMov *iwg = new TImageWriterMov(m_path, index, this);
+  return TImageWriterP(iwg);
+}
+
+//-----------------------------------------------------------
+void TLevelWriterMov::setFrameRate(double fps) {
+  m_frameRate = fps;
+  ffmpegWriter->setFrameRate(fps);
+}
+
+void TLevelWriterMov::saveSoundTrack(TSoundTrack *st) {
+  ffmpegWriter->saveSoundTrack(st);
+}
+
+//-----------------------------------------------------------
+
+void TLevelWriterMov::save(const TImageP &img, int frameIndex) {
+  TRasterImageP image(img);
+  m_lx = image->getRaster()->getLx();
+  m_ly = image->getRaster()->getLy();
+  ffmpegWriter->createIntermediateImage(img, frameIndex);
+}
+
+//===========================================================
+//
+//  TImageReaderMov
+//
+//===========================================================
+
+class TImageReaderMov final : public TImageReader {
+public:
+  int m_frameIndex;
+
+  TImageReaderMov(const TFilePath &path, int index, TLevelReaderMov *lra,
+                  TImageInfo *info)
+      : TImageReader(path), m_lra(lra), m_frameIndex(index), m_info(info) {
+    m_lra->addRef();
+  }
+  ~TImageReaderMov() { m_lra->release(); }
+
+  TImageP load() override { return m_lra->load(m_frameIndex); }
+  TDimension getSize() const { return m_lra->getSize(); }
+  TRect getBBox() const { return TRect(); }
+  const TImageInfo *getImageInfo() const override { return m_info; }
+
+private:
+  TLevelReaderMov *m_lra;
+  TImageInfo *m_info;
+
+  // not implemented
+  TImageReaderMov(const TImageReaderMov &);
+  TImageReaderMov &operator=(const TImageReaderMov &src);
+};
+
+//===========================================================
+//
+//  TLevelReaderMov
+//
+//===========================================================
+
+TLevelReaderMov::TLevelReaderMov(const TFilePath &path) : TLevelReader(path) {
+  ffmpegReader = new Ffmpeg();
+  ffmpegReader->setPath(m_path);
+  ffmpegReader->disablePrecompute();
+  ffmpegFileInfo tempInfo = ffmpegReader->getInfo();
+  double fps              = tempInfo.m_frameRate;
+  m_frameCount            = tempInfo.m_frameCount;
+  m_size                  = TDimension(tempInfo.m_lx, tempInfo.m_ly);
+  m_lx                    = m_size.lx;
+  m_ly                    = m_size.ly;
+
+  // set values
+  m_info                   = new TImageInfo();
+  m_info->m_frameRate      = fps;
+  m_info->m_lx             = m_lx;
+  m_info->m_ly             = m_ly;
+  m_info->m_bitsPerSample  = 8;
+  m_info->m_samplePerPixel = 4;
+  m_info->m_dpix           = Stage::standardDpi;
+  m_info->m_dpiy           = Stage::standardDpi;
+}
+//-----------------------------------------------------------
+
+TLevelReaderMov::~TLevelReaderMov() {
+  // ffmpegReader->cleanUpFiles();
+}
+
+//-----------------------------------------------------------
+
+TLevelP TLevelReaderMov::loadInfo() {
+  if (m_frameCount == -1) return TLevelP();
+  TLevelP level;
+  for (int i = 1; i <= m_frameCount; i++) level->setFrame(i, TImageP());
+  return level;
+}
+
+//-----------------------------------------------------------
+
+TImageReaderP TLevelReaderMov::getFrameReader(TFrameId fid) {
+  // if (IOError != 0)
+  //	throw TImageException(m_path, buildAVIExceptionString(IOError));
+  if (fid.getLetter() != 0) return TImageReaderP(0);
+  int index = fid.getNumber();
+
+  TImageReaderMov *irm = new TImageReaderMov(m_path, index, this, m_info);
+  return TImageReaderP(irm);
+}
+
+//------------------------------------------------------------------------------
+
+TDimension TLevelReaderMov::getSize() { return m_size; }
+
+//------------------------------------------------
+
+TImageP TLevelReaderMov::load(int frameIndex) {
+  if (!ffmpegFramesCreated) {
+    ffmpegReader->getFramesFromMovie();
+    ffmpegFramesCreated = true;
+  }
+  return ffmpegReader->getImage(frameIndex);
+}
+
+Tiio::MovWriterProperties::MovWriterProperties()
+    : m_vidQuality("Quality", 1, 100, 90), m_scale("Scale", 1, 100, 100) {
+  bind(m_vidQuality);
+  bind(m_scale);
+}
+
+void Tiio::MovWriterProperties::updateTranslation() {
+  m_vidQuality.setQStringName(tr("Quality"));
+  m_scale.setQStringName(tr("Scale"));
+}
+
+// Tiio::Reader* Tiio::makeMovReader(){ return nullptr; }
+// Tiio::Writer* Tiio::makeMovWriter(){ return nullptr; }
--- a/toonz/sources/image/ffmpeg/tiio_mov.h
+++ b/toonz/sources/image/ffmpeg/tiio_mov.h
@ -0,0 +1,93 @@
+#pragma once
+
+#ifndef TTIO_MOV_INCLUDED
+#define TTIO_MOV_INCLUDED
+
+#include "tproperty.h"
+#include "tlevel_io.h"
+#include "tiio_ffmpeg.h"
+
+#include <QCoreApplication>
+
+//===========================================================
+//
+//  TLevelWriterMov
+//
+//===========================================================
+
+class TLevelWriterMov : public TLevelWriter {
+public:
+  TLevelWriterMov(const TFilePath &path, TPropertyGroup *winfo);
+  ~TLevelWriterMov();
+  void setFrameRate(double fps) override;
+
+  TImageWriterP getFrameWriter(TFrameId fid) override;
+  void save(const TImageP &image, int frameIndex);
+
+  void saveSoundTrack(TSoundTrack *st) override;
+
+  static TLevelWriter *create(const TFilePath &path, TPropertyGroup *winfo) {
+    return new TLevelWriterMov(path, winfo);
+  }
+
+private:
+  Ffmpeg *ffmpegWriter;
+  int m_lx, m_ly;
+  int m_scale;
+  int m_vidQuality;
+  // void *m_buffer;
+};
+
+//===========================================================
+//
+//  TLevelReaderMov
+//
+//===========================================================
+
+class TLevelReaderMov final : public TLevelReader {
+public:
+  TLevelReaderMov(const TFilePath &path);
+  ~TLevelReaderMov();
+  TImageReaderP getFrameReader(TFrameId fid) override;
+
+  static TLevelReader *create(const TFilePath &f) {
+    return new TLevelReaderMov(f);
+  }
+
+  TLevelP loadInfo() override;
+  TImageP load(int frameIndex);
+  TDimension getSize();
+  // TThread::Mutex m_mutex;
+  // void *m_decompressedBuffer;
+private:
+  Ffmpeg *ffmpegReader;
+  bool ffmpegFramesCreated = false;
+  TDimension m_size;
+  int m_frameCount, m_lx, m_ly;
+};
+
+//===========================================================================
+
+namespace Tiio {
+
+//===========================================================================
+
+class MovWriterProperties : public TPropertyGroup {
+  Q_DECLARE_TR_FUNCTIONS(MovWriterProperties)
+public:
+  // TEnumProperty m_pixelSize;
+  // TBoolProperty m_matte;
+  TIntProperty m_vidQuality;
+  TIntProperty m_scale;
+  MovWriterProperties();
+  void updateTranslation() override;
+};
+
+//===========================================================================
+
+// Tiio::Reader *makeMovReader();
+// Tiio::Writer *makeMovWriter();
+
+}  // namespace
+
+#endif
--- a/Show more
+++ b/Show more