diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27d95d6fe..c1d983e53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,70 +27,103 @@ variables:
       unprotect: true
 
   before_script:
-    - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
       - export DEBIAN_FRONTEND="noninteractive"
       - export DEBIAN_PRIORITY="low"
       - export DEBCONF_NONINTERACTIVE_SEEN="true"
-      - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
       - dpkg --add-architecture i386
       - dpkg --add-architecture amd64
       - dpkg --add-architecture arm64
-      - echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
       - export APT_CACHE_DIR=`pwd`/apt-cache
-      - touch /etc/apt/apt.conf.d/99build
-      - echo Adding options to apt.conf':'
-      - echo APT::Install-Recommends "false"\;       | tee --append /etc/apt/apt.conf.d/99build
-      - echo quiet "1"\;                             | tee --append /etc/apt/apt.conf.d/99build
-      - echo APT::Get::Assume-Yes "true"\;           | tee --append /etc/apt/apt.conf.d/99build
-      - echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
       - mkdir --parents --verbose $APT_CACHE_DIR/partial/
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
+      - touch /etc/apt/apt.conf.d/99build
+      - |
+       echo Adding options to apt.conf':'
+      - |
+       echo APT::Install-Recommends "false"\;       | tee --append /etc/apt/apt.conf.d/99build
+      - |
+       echo quiet "1"\;                             | tee --append /etc/apt/apt.conf.d/99build
+      - |
+       echo APT::Get::Assume-Yes "true"\;           | tee --append /etc/apt/apt.conf.d/99build
+      - |
+       echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
       - apt-get update
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
       - apt-get install apt-utils
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
       - apt-get upgrade
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_upgraden\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_upgraden\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
       - apt-get install make git ccache
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
-      - echo Adding ccache configution option
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
       - mkdir --parents --verbose ~/.ccache/
       - touch ~/.ccache/ccache.conf
-      - echo base_dir = $PWD                  | tee --append ~/.ccache/ccache.conf
-      - echo cache_dir = $PWD/ccache          | tee --append ~/.ccache/ccache.conf
-      - echo compiler_check = content         | tee --append ~/.ccache/ccache.conf
-      - echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
-      - echo max_size = 50M                   | tee --append ~/.ccache/ccache.conf
-      - echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
+      - |
+       echo Adding ccache configution option
+      - |
+       echo base_dir = $PWD                  | tee --append ~/.ccache/ccache.conf
+      - |
+       echo cache_dir = $PWD/ccache          | tee --append ~/.ccache/ccache.conf
+      - |
+       echo compiler_check = content         | tee --append ~/.ccache/ccache.conf
+      - |
+       echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
+      - |
+       echo max_size = 50M                   | tee --append ~/.ccache/ccache.conf
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
       - ccache --zero-stats
       - ccache --show-stats
-      - echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
 
   after_script:
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
       - apt-get autoclean
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
       - ccache --show-stats --verbose
       - ccache --show-log-stats --verbose
-      - echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
 
 build-testing:
   <<: *job_build
@@ -103,17 +136,23 @@ build-testing:
   variables:
     CC: gcc
   script:
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
       - apt-get install gcc
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
       - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
       - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
-      - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
 
 build-i686-w64-mingw32:
   <<: *job_build
@@ -124,13 +163,17 @@ build-i686-w64-mingw32:
   variables:
     PREFIX: i686-w64-mingw32
   script:
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
       - apt-get install gcc-mingw-w64-i686-win32
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
       - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1
-      - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
 
 build-x86_64-linux-gnu:
   <<: *job_build
@@ -144,17 +187,23 @@ build-x86_64-linux-gnu:
     OBJDUMP: x86_64-linux-gnu-objdump
     PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
   script:
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
       - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
       - apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
       - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
-      - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
 
 build-i686-linux-gnu:
   <<: *job_build
@@ -168,17 +217,23 @@ build-i686-linux-gnu:
     OBJDUMP: i686-linux-gnu-objdump
     PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
   script:
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
       - apt-get install gcc-i686-linux-gnu || apt-get install gcc
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
       - apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
       - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
-      - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
 
 build-aarch64-linux-gnu:
   <<: *job_build
@@ -192,17 +247,23 @@ build-aarch64-linux-gnu:
     OBJDUMP: aarch64-linux-gnu-objdump
     PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
   script:
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
       - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
       - apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
       - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
-      - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
 
 build-x86_64-w64-mingw32:
   <<: *job_build
@@ -213,10 +274,14 @@ build-x86_64-w64-mingw32:
   variables:
     PREFIX: x86_64-w64-mingw32
   script:
-    - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
       - apt-get install gcc-mingw-w64-x86-64-win32
-      - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
 
-    - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+    - - |
+       echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
       - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1
-      - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+      - |
+       echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"