diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index acf3be1..b4ce924 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,6 @@ on:
     branches:
       - '*'
 env:
-  BOOTSTRAP_VERSION: 1
   DEBIAN_FRONTEND: noninteractive
   HOMEBREW_NO_AUTO_UPDATE: 1
 
@@ -17,156 +16,153 @@ jobs:
   macos:
     runs-on: macos-10.15
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-    - name: Set up cache
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
-        key: cache-macos
-    - name: Set up dependencies
-      run: |
-        brew install cmake jq meson
-    - name: Bootstrap macOS intel
-      shell: bash
-      run: |
-        ./PawPaw/bootstrap-carla.sh macos && ./PawPaw/.cleanup.sh macos
-    #- name: Build macOS intel
-      #shell: bash
-      #run: |
-        #./build.sh macos
-    #- uses: actions/upload-artifact@v2
-      #with:
-        #name: macOS intel package
-        #path: Carla/*.dmg
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/PawPawBuilds/builds
+            ~/PawPawBuilds/downloads
+            ~/PawPawBuilds/targets
+          key: macos
+      - name: Set up dependencies
+        run: |
+          brew install cmake jq meson
+      - name: Bootstrap macOS intel
+        shell: bash
+        run: |
+          ./PawPaw/bootstrap-carla.sh macos && ./PawPaw/.cleanup.sh macos
+      #- name: Build macOS intel
+        #shell: bash
+        #run: |
+          #./build.sh macos
+      #- uses: actions/upload-artifact@v2
+        #with:
+          #name: macOS intel package
+          #path: Carla/*.dmg
 
   # macOS native universal build
   macos_universal:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-    - name: Set up cache
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
-        key: cache-macos-universal
-    - name: Set up dependencies
-      run: |
-        brew install cmake jq meson
-    - name: Fix up Xcode
-      run: |
-        sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
-        sudo xcode-select -s "/Applications/Xcode_12.3.app"
-    - name: Bootstrap macOS universal
-      shell: bash
-      run: |
-        ./PawPaw/bootstrap-carla.sh macos-universal && ./PawPaw/.cleanup.sh macos-universal
-    #- name: Build macOS universal
-      #shell: bash
-      #run: |
-        #./build.sh macos-universal
-    #- uses: actions/upload-artifact@v2
-      #with:
-        #name: macOS universal package
-        #path: Carla/*.dmg
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/PawPawBuilds/builds
+            ~/PawPawBuilds/downloads
+            ~/PawPawBuilds/targets
+          key: macos-universal
+      - name: Set up dependencies
+        run: |
+          brew install cmake jq meson
+      - name: Fix up Xcode
+        run: |
+          sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
+          sudo xcode-select -s "/Applications/Xcode_12.3.app"
+      - name: Bootstrap macOS universal
+        shell: bash
+        run: |
+          ./PawPaw/bootstrap-carla.sh macos-universal && ./PawPaw/.cleanup.sh macos-universal
+      #- name: Build macOS universal
+        #shell: bash
+        #run: |
+          #./build.sh macos-universal
+      #- uses: actions/upload-artifact@v2
+        #with:
+          #name: macOS universal package
+          #path: Carla/*.dmg
 
   # linux with win32 cross-compilation
   win32:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-    - name: Set up cache
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/debs
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
-        key: cache-win32
-    - name: Restore debian packages cache
-      run: |
-        if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
-          sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
-        fi
-    - name: Set up dependencies
-      run: |
-        wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && \
-        sudo dpkg --add-architecture i386 && \
-        sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \
-        sudo apt-get update -qq && \
-        sudo apt-get install -y build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable \
-          binutils-mingw-w64-i686 g++-mingw-w64-i686
-    - name: Cache debian packages
-      run: |
-        mkdir -p ~/PawPawBuilds/debs && \
-        sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
-    - name: Bootstrap win32 cross-compiled
-      shell: bash
-      run: |
-        ./PawPaw/bootstrap-carla.sh win32 && ./PawPaw/.cleanup.sh win32
-    #- name: Build win32 cross-compiled
-      #shell: bash
-      #run: |
-        #./build.sh win32
-    #- uses: actions/upload-artifact@v2
-      #with:
-        #name: win32 installer
-        #path: Carla/*.zip
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/PawPawBuilds/builds
+            ~/PawPawBuilds/debs
+            ~/PawPawBuilds/downloads
+            ~/PawPawBuilds/targets
+          key: win32
+      - name: Restore debian packages cache
+        run: |
+          if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
+            sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
+          fi
+      - name: Set up dependencies
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update -qq
+          sudo apt-get install -yq build-essential curl cmake jq llvm qttools5-dev-tools
+          sudo apt-get install -yq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
+      - name: Cache debian packages
+        run: |
+          mkdir -p ~/PawPawBuilds/debs
+          sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
+      - name: Bootstrap win32 cross-compiled
+        shell: bash
+        run: |
+          ./PawPaw/bootstrap-carla.sh win32 && ./PawPaw/.cleanup.sh win32
+      #- name: Build win32 cross-compiled
+        #shell: bash
+        #run: |
+          #./build.sh win32
+      #- uses: actions/upload-artifact@v2
+        #with:
+          #name: win32 installer
+          #path: Carla/*.zip
 
   # linux with win64 cross-compilation
   win64:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-    - name: Set up cache
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/debs
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
-        key: cache-win64
-    - name: Restore debian packages cache
-      run: |
-        if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
-          sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
-        fi
-    - name: Set up dependencies
-      run: |
-        wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && \
-        sudo dpkg --add-architecture i386 && \
-        sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \
-        sudo apt-get update -qq && \
-        sudo apt-get install -y build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable \
-          binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
-    - name: Cache debian packages
-      run: |
-        mkdir -p ~/PawPawBuilds/debs && \
-        sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
-    - name: Bootstrap win64 cross-compiled
-      shell: bash
-      run: |
-        ./PawPaw/bootstrap-carla.sh win64 && ./PawPaw/.cleanup.sh win64
-    #- name: Build win64 cross-compiled
-      #shell: bash
-      #run: |
-        #./build.sh win64
-    #- uses: actions/upload-artifact@v2
-      #with:
-        #name: win64 installer
-        #path: Carla/*.zip
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/PawPawBuilds/builds
+            ~/PawPawBuilds/debs
+            ~/PawPawBuilds/downloads
+            ~/PawPawBuilds/targets
+          key: win64
+      - name: Restore debian packages cache
+        run: |
+          if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
+            sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
+          fi6
+      - name: Set up dependencies
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update -qq
+          sudo apt-get install -yq build-essential curl cmake jq llvm qttools5-dev-tools
+          sudo apt-get install -yq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
+          sudo apt-get install -yq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
+      - name: Cache debian packages
+        run: |
+          mkdir -p ~/PawPawBuilds/debs
+          sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
+      - name: Bootstrap win64 cross-compiled
+        shell: bash
+        run: |
+          ./PawPaw/bootstrap-carla.sh win64 && ./PawPaw/.cleanup.sh win64
+      #- name: Build win64 cross-compiled
+        #shell: bash
+        #run: |
+          #./build.sh win64
+      #- uses: actions/upload-artifact@v2
+        #with:
+          #name: win64 installer
+          #path: Carla/*.zip
diff --git a/Carla b/Carla
index b02121e..8463126 160000
--- a/Carla
+++ b/Carla
@@ -1 +1 @@
-Subproject commit b02121e9a2cc6229b3863a54405c52614471895c
+Subproject commit 84631263228f3269d0ff70484eaf0c5637cbb52b