216 files changed, 1377 insertions, 1227 deletions
diff --git a/src/.clang-format b/src/.clang-format
index 1c6b71b2e..f92771ec3 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2016 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# SPDX-License-Identifier: GPL-2.0-or-later
 ---
 Language:        Cpp
 # BasedOnStyle:  LLVM
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9367f67c1..fc177fa52 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 # Enable modules to include each other's files
 include_directories(.)
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index 2971c42a2..5fe1d5fa5 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 add_library(audio_core STATIC
    audio_core.cpp
    audio_core.h
diff --git a/src/audio_core/renderer/command/command_buffer.cpp b/src/audio_core/renderer/command/command_buffer.cpp
index 40074cf14..2ef879ee1 100644
--- a/src/audio_core/renderer/command/command_buffer.cpp
+++ b/src/audio_core/renderer/command/command_buffer.cpp
@@ -339,7 +339,7 @@ void CommandBuffer::GenerateDepopPrepareCommand(const s32 node_id, const VoiceSt
    cmd.previous_samples = memory_pool->Translate(CpuAddr(voice_state.previous_samples.data()),
                                                  MaxMixBuffers * sizeof(s32));
    cmd.buffer_count = buffer_count;
-    cmd.depop_buffer = memory_pool->Translate(CpuAddr(buffer.data()), buffer_count * sizeof(s32));
+    cmd.depop_buffer = memory_pool->Translate(CpuAddr(buffer.data()), buffer.size_bytes());
    GenerateEnd<DepopPrepareCommand>(cmd);
 }
diff --git a/src/audio_core/renderer/command/mix/depop_prepare.cpp b/src/audio_core/renderer/command/mix/depop_prepare.cpp
index 2ee076ef6..69bb78ccc 100644
--- a/src/audio_core/renderer/command/mix/depop_prepare.cpp
+++ b/src/audio_core/renderer/command/mix/depop_prepare.cpp
@@ -19,7 +19,7 @@ void DepopPrepareCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor
 void DepopPrepareCommand::Process(const ADSP::CommandListProcessor& processor) {
    auto samples{reinterpret_cast<s32*>(previous_samples)};
-    auto buffer{std::span(reinterpret_cast<s32*>(depop_buffer), buffer_count)};
+    auto buffer{reinterpret_cast<s32*>(depop_buffer)};
    for (u32 i = 0; i < buffer_count; i++) {
        if (samples[i]) {
diff --git a/src/audio_core/renderer/effect/effect_info_base.h b/src/audio_core/renderer/effect/effect_info_base.h
index 43d0589cc..8c9583878 100644
--- a/src/audio_core/renderer/effect/effect_info_base.h
+++ b/src/audio_core/renderer/effect/effect_info_base.h
@@ -419,13 +419,13 @@ protected:
    /// Workbuffers assigned to this effect
    std::array<AddressInfo, 2> workbuffers{AddressInfo(CpuAddr(0), 0), AddressInfo(CpuAddr(0), 0)};
    /// Aux/Capture buffer info for reading
-    CpuAddr send_buffer_info;
+    CpuAddr send_buffer_info{};
    /// Aux/Capture buffer for reading
-    CpuAddr send_buffer;
+    CpuAddr send_buffer{};
    /// Aux/Capture buffer info for writing
-    CpuAddr return_buffer_info;
+    CpuAddr return_buffer_info{};
    /// Aux/Capture buffer for writing
-    CpuAddr return_buffer;
+    CpuAddr return_buffer{};
    /// Parameters of this effect
    std::array<u8, sizeof(InParameterVersion2)> parameter{};
    /// State of this effect used by the AudioRenderer across calls
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 05fdfea82..a6dc31b53 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 if (DEFINED ENV{AZURECIREPO})
  set(BUILD_REPOSITORY $ENV{AZURECIREPO})
 endif()
diff --git a/src/common/alignment.h b/src/common/alignment.h
index 8570c7d3c..7e897334b 100644
--- a/src/common/alignment.h
+++ b/src/common/alignment.h
@@ -1,4 +1,5 @@
-// This file is under the public domain.
+// SPDX-FileCopyrightText: 2014 Jannik Vogel <email@jannikvogel.de>
+// SPDX-License-Identifier: CC0-1.0
 #pragma once
diff --git a/src/common/atomic_helpers.h b/src/common/atomic_helpers.h
index 6d912b52e..bef5015c1 100644
--- a/src/common/atomic_helpers.h
+++ b/src/common/atomic_helpers.h
@@ -1,4 +1,7 @@
-// ©2013-2016 Cameron Desrochers.
+// SPDX-FileCopyrightText: 2013-2016 Cameron Desrochers
+// SPDX-FileCopyrightText: 2015 Jeff Preshing
+// SPDX-License-Identifier: BSD-2-Clause AND Zlib
 // Distributed under the simplified BSD license (see the license file that
 // should have come with this header).
 // Uses Jeff Preshing's semaphore implementation (under the terms of its
diff --git a/src/common/detached_tasks.cpp b/src/common/detached_tasks.cpp
index ec31d0b88..da64848da 100644
--- a/src/common/detached_tasks.cpp
+++ b/src/common/detached_tasks.cpp
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <thread>
 #include "common/assert.h"
diff --git a/src/common/detached_tasks.h b/src/common/detached_tasks.h
index 5dd8fc27b..416a2d7f3 100644
--- a/src/common/detached_tasks.h
+++ b/src/common/detached_tasks.h
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/error.cpp b/src/common/error.cpp
index d4455e310..ddb03bd45 100644
--- a/src/common/error.cpp
+++ b/src/common/error.cpp
@@ -1,6 +1,6 @@
-// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Refer to the license.txt file included.
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include <cstddef>
 #ifdef _WIN32
diff --git a/src/common/error.h b/src/common/error.h
index e084d4b0f..62a3bd835 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -1,6 +1,6 @@
-// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Refer to the license.txt file included.
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
diff --git a/src/common/fixed_point.h b/src/common/fixed_point.h
index 1d45e51b3..4a0f72cc9 100644
--- a/src/common/fixed_point.h
+++ b/src/common/fixed_point.h
@@ -1,28 +1,8 @@
+// SPDX-FileCopyrightText: 2015 Evan Teran
+// SPDX-License-Identifier: MIT
 // From: https://github.com/eteran/cpp-utilities/blob/master/fixed/include/cpp-utilities/fixed.h
 // See also: http://stackoverflow.com/questions/79677/whats-the-best-way-to-do-fixed-point-math
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Evan Teran
- *
- * 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.
- */
 #ifndef FIXED_H_
 #define FIXED_H_
diff --git a/src/common/hash.h b/src/common/hash.h
index 298930702..b6f3e6d6f 100644
--- a/src/common/hash.h
+++ b/src/common/hash.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/input.h b/src/common/input.h
index 995c35d9d..213aa2384 100644
--- a/src/common/input.h
+++ b/src/common/input.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index b3793106d..8ce1c2fd1 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <atomic>
 #include <chrono>
diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h
index a0e80fe3c..12e5e2498 100644
--- a/src/common/logging/backend.h
+++ b/src/common/logging/backend.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp
index 6de9bacbf..a959acb74 100644
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include "common/logging/filter.h"
diff --git a/src/common/logging/filter.h b/src/common/logging/filter.h
index 29419f051..54d172cc0 100644
--- a/src/common/logging/filter.h
+++ b/src/common/logging/filter.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 0c80d01ee..c00c01a9e 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp
index b2cad58d8..09398ea64 100644
--- a/src/common/logging/text_formatter.cpp
+++ b/src/common/logging/text_formatter.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <cstdio>
diff --git a/src/common/logging/text_formatter.h b/src/common/logging/text_formatter.h
index 92c0bf0c5..0d0ec4370 100644
--- a/src/common/logging/text_formatter.h
+++ b/src/common/logging/text_formatter.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/microprofile.cpp b/src/common/microprofile.cpp
index ee25dd37f..e6657c82f 100644
--- a/src/common/microprofile.cpp
+++ b/src/common/microprofile.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 // Includes the MicroProfile implementation in this file for compilation
 #define MICROPROFILE_IMPL 1
diff --git a/src/common/microprofile.h b/src/common/microprofile.h
index 54e7f3cc4..91d14d5e1 100644
--- a/src/common/microprofile.h
+++ b/src/common/microprofile.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/microprofileui.h b/src/common/microprofileui.h
index 41abe6b75..39ed18ffa 100644
--- a/src/common/microprofileui.h
+++ b/src/common/microprofileui.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/param_package.cpp b/src/common/param_package.cpp
index 462502e34..629babb81 100644
--- a/src/common/param_package.cpp
+++ b/src/common/param_package.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <stdexcept>
diff --git a/src/common/param_package.h b/src/common/param_package.h
index c13e45479..d7c13cb1f 100644
--- a/src/common/param_package.h
+++ b/src/common/param_package.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/quaternion.h b/src/common/quaternion.h
index 4d0871eb4..5bb5f2af0 100644
--- a/src/common/quaternion.h
+++ b/src/common/quaternion.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/reader_writer_queue.h b/src/common/reader_writer_queue.h
index 8d2c9408c..60c41a8cb 100644
--- a/src/common/reader_writer_queue.h
+++ b/src/common/reader_writer_queue.h
@@ -1,6 +1,5 @@
-// ©2013-2020 Cameron Desrochers.
+// SPDX-FileCopyrightText: 2013-2020 Cameron Desrochers
-// Distributed under the simplified BSD license (see the license file that
+// SPDX-License-Identifier: BSD-2-Clause
-// should have come with this header).
 #pragma once
diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in
index cc88994c6..f0c124d69 100644
--- a/src/common/scm_rev.cpp.in
+++ b/src/common/scm_rev.cpp.in
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "common/scm_rev.h"
diff --git a/src/common/scm_rev.h b/src/common/scm_rev.h
index 563015ec9..88404316a 100644
--- a/src/common/scm_rev.h
+++ b/src/common/scm_rev.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/scope_exit.h b/src/common/scope_exit.h
index 35dac3a8f..e9c789c88 100644
--- a/src/common/scope_exit.h
+++ b/src/common/scope_exit.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/telemetry.cpp b/src/common/telemetry.cpp
index 67261c55b..d26394359 100644
--- a/src/common/telemetry.cpp
+++ b/src/common/telemetry.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <cstring>
diff --git a/src/common/telemetry.h b/src/common/telemetry.h
index f9a824a7d..ba633d5a5 100644
--- a/src/common/telemetry.h
+++ b/src/common/telemetry.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.h
index f7ae9d8c2..053798e79 100644
--- a/src/common/threadsafe_queue.h
+++ b/src/common/threadsafe_queue.h
@@ -39,7 +39,7 @@ public:
    template <typename Arg>
    void Push(Arg&& t) {
        // create the element, add it to the queue
-        write_ptr->current = std::forward<Arg>(t);
+        write_ptr->current = std::move(t);
        // set the next pointer to a new element ptr
        // then advance the write pointer
        ElementPtr* new_ptr = new ElementPtr();
diff --git a/src/common/uint128.h b/src/common/uint128.h
index 199d0f55e..f890ffec2 100644
--- a/src/common/uint128.h
+++ b/src/common/uint128.h
@@ -31,17 +31,12 @@ namespace Common {
    return _udiv128(r[1], r[0], d, &remainder);
 #endif
 #else
-#ifdef __SIZEOF_INT128__
-    const auto product = static_cast<unsigned __int128>(a) * static_cast<unsigned __int128>(b);
-    return static_cast<u64>(product / d);
-#else
    const u64 diva = a / d;
    const u64 moda = a % d;
    const u64 divb = b / d;
    const u64 modb = b % d;
    return diva * b + moda * divb + moda * modb / d;
 #endif
-#endif
 }
 // This function multiplies 2 u64 values and produces a u128 value;
diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp
index 6aaa8cdf9..8b08332ab 100644
--- a/src/common/x64/native_clock.cpp
+++ b/src/common/x64/native_clock.cpp
@@ -75,8 +75,8 @@ NativeClock::NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequen
 }
 u64 NativeClock::GetRTSC() {
-    TimePoint current_time_point{};
    TimePoint new_time_point{};
+    TimePoint current_time_point{};
    current_time_point.pack = Common::AtomicLoad128(time_point.pack.data());
    do {
diff --git a/src/common/x64/xbyak_abi.h b/src/common/x64/xbyak_abi.h
index 87b3d63a4..67e6e63c8 100644
--- a/src/common/x64/xbyak_abi.h
+++ b/src/common/x64/xbyak_abi.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/common/x64/xbyak_util.h b/src/common/x64/xbyak_util.h
index 44d2558f1..250e5cddb 100644
--- a/src/common/x64/xbyak_util.h
+++ b/src/common/x64/xbyak_util.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index c1cc62a45..9dbe5bdca 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 add_library(core STATIC
    announce_multiplayer_session.cpp
    announce_multiplayer_session.h
@@ -448,6 +451,7 @@ add_library(core STATIC
    hle/service/hid/hidbus.h
    hle/service/hid/irs.cpp
    hle/service/hid/irs.h
+    hle/service/hid/irs_ring_lifo.h
    hle/service/hid/ring_lifo.h
    hle/service/hid/xcd.cpp
    hle/service/hid/xcd.h
@@ -723,8 +727,6 @@ add_library(core STATIC
    internal_network/sockets.h
    loader/deconstructed_rom_directory.cpp
    loader/deconstructed_rom_directory.h
-    loader/elf.cpp
-    loader/elf.h
    loader/kip.cpp
    loader/kip.h
    loader/loader.cpp
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index c092db9ff..73f259525 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp
index 6aae79c48..e9123c13d 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <fmt/format.h>
 #include "common/logging/log.h"
diff --git a/src/core/arm/dynarmic/arm_dynarmic_cp15.h b/src/core/arm/dynarmic/arm_dynarmic_cp15.h
index f271b2070..5b2a51636 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_cp15.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_cp15.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 95791a07f..ea32a4a8d 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <atomic>
diff --git a/src/core/core.h b/src/core/core.h
index 13122dd61..0ce3b1d60 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 5425637f5..2dbb99c8b 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -6,9 +6,7 @@
 #include <string>
 #include <tuple>
-#include "common/logging/log.h"
 #include "common/microprofile.h"
-#include "common/thread.h"
 #include "core/core_timing.h"
 #include "core/core_timing_util.h"
 #include "core/hardware_properties.h"
@@ -44,10 +42,10 @@ CoreTiming::CoreTiming()
 CoreTiming::~CoreTiming() = default;
-void CoreTiming::ThreadEntry(CoreTiming& instance, size_t id) {
+void CoreTiming::ThreadEntry(CoreTiming& instance) {
-    const std::string name = "yuzu:HostTiming_" + std::to_string(id);
+    constexpr char name[] = "yuzu:HostTiming";
-    MicroProfileOnThreadCreate(name.c_str());
+    MicroProfileOnThreadCreate(name);
-    Common::SetCurrentThreadName(name.c_str());
+    Common::SetCurrentThreadName(name);
    Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical);
    instance.on_thread_init();
    instance.ThreadLoop();
@@ -63,127 +61,100 @@ void CoreTiming::Initialize(std::function<void()>&& on_thread_init_) {
        -> std::optional<std::chrono::nanoseconds> { return std::nullopt; };
    ev_lost = CreateEvent("_lost_event", empty_timed_callback);
    if (is_multicore) {
-        worker_threads.emplace_back(ThreadEntry, std::ref(*this), 0);
+        timer_thread = std::make_unique<std::thread>(ThreadEntry, std::ref(*this));
    }
 }
 void CoreTiming::Shutdown() {
-    is_paused = true;
+    paused = true;
    shutting_down = true;
-    std::atomic_thread_fence(std::memory_order_release);
+    pause_event.Set();
+    event.Set();
-    event_cv.notify_all();
+    if (timer_thread) {
-    wait_pause_cv.notify_all();
+        timer_thread->join();
-    for (auto& thread : worker_threads) {
-        thread.join();
    }
-    worker_threads.clear();
    pause_callbacks.clear();
    ClearPendingEvents();
+    timer_thread.reset();
    has_started = false;
 }
-void CoreTiming::Pause(bool is_paused_) {
+void CoreTiming::Pause(bool is_paused) {
-    std::unique_lock main_lock(event_mutex);
+    paused = is_paused;
-    if (is_paused_ == paused_state.load(std::memory_order_relaxed)) {
+    pause_event.Set();
-        return;
-    }
-    if (is_multicore) {
-        is_paused = is_paused_;
-        event_cv.notify_all();
-        if (!is_paused_) {
-            wait_pause_cv.notify_all();
-        }
-    }
-    paused_state.store(is_paused_, std::memory_order_relaxed);
-    if (!is_paused_) {
+    if (!is_paused) {
        pause_end_time = GetGlobalTimeNs().count();
    }
    for (auto& cb : pause_callbacks) {
-        cb(is_paused_);
+        cb(is_paused);
    }
 }
-void CoreTiming::SyncPause(bool is_paused_) {
+void CoreTiming::SyncPause(bool is_paused) {
-    std::unique_lock main_lock(event_mutex);
+    if (is_paused == paused && paused_set == paused) {
-    if (is_paused_ == paused_state.load(std::memory_order_relaxed)) {
        return;
    }
-    if (is_multicore) {
+    Pause(is_paused);
-        is_paused = is_paused_;
+    if (timer_thread) {
-        event_cv.notify_all();
+        if (!is_paused) {
-        if (!is_paused_) {
+            pause_event.Set();
-            wait_pause_cv.notify_all();
-        }
-    }
-    paused_state.store(is_paused_, std::memory_order_relaxed);
-    if (is_multicore) {
-        if (is_paused_) {
-            wait_signal_cv.wait(main_lock, [this] { return pause_count == worker_threads.size(); });
-        } else {
-            wait_signal_cv.wait(main_lock, [this] { return pause_count == 0; });
        }
+        event.Set();
+        while (paused_set != is_paused)
+            ;
    }
-    if (!is_paused_) {
+    if (!is_paused) {
        pause_end_time = GetGlobalTimeNs().count();
    }
    for (auto& cb : pause_callbacks) {
-        cb(is_paused_);
+        cb(is_paused);
    }
 }
 bool CoreTiming::IsRunning() const {
-    return !paused_state.load(std::memory_order_acquire);
+    return !paused_set;
 }
 bool CoreTiming::HasPendingEvents() const {
-    std::unique_lock main_lock(event_mutex);
+    return !(wait_set && event_queue.empty());
-    return !event_queue.empty() || pending_events.load(std::memory_order_relaxed) != 0;
 }
 void CoreTiming::ScheduleEvent(std::chrono::nanoseconds ns_into_future,
                               const std::shared_ptr<EventType>& event_type,
                               std::uintptr_t user_data, bool absolute_time) {
+    {
+        std::scoped_lock scope{basic_lock};
+        const auto next_time{absolute_time ? ns_into_future : GetGlobalTimeNs() + ns_into_future};
-    std::unique_lock main_lock(event_mutex);
+        event_queue.emplace_back(
-    const auto next_time{absolute_time ? ns_into_future : GetGlobalTimeNs() + ns_into_future};
+            Event{next_time.count(), event_fifo_id++, user_data, event_type, 0});
+        std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
-    event_queue.emplace_back(Event{next_time.count(), event_fifo_id++, user_data, event_type, 0});
-    pending_events.fetch_add(1, std::memory_order_relaxed);
-    std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
-    if (is_multicore) {
-        event_cv.notify_one();
    }
+    event.Set();
 }
 void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
                                      std::chrono::nanoseconds resched_time,
                                      const std::shared_ptr<EventType>& event_type,
                                      std::uintptr_t user_data, bool absolute_time) {
-    std::unique_lock main_lock(event_mutex);
+    std::scoped_lock scope{basic_lock};
    const auto next_time{absolute_time ? start_time : GetGlobalTimeNs() + start_time};
    event_queue.emplace_back(
        Event{next_time.count(), event_fifo_id++, user_data, event_type, resched_time.count()});
-    pending_events.fetch_add(1, std::memory_order_relaxed);
    std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
-    if (is_multicore) {
-        event_cv.notify_one();
-    }
 }
 void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
                                 std::uintptr_t user_data) {
-    std::unique_lock main_lock(event_mutex);
+    std::scoped_lock scope{basic_lock};
    const auto itr = std::remove_if(event_queue.begin(), event_queue.end(), [&](const Event& e) {
        return e.type.lock().get() == event_type.get() && e.user_data == user_data;
    });
@@ -192,7 +163,6 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
    if (itr != event_queue.end()) {
        event_queue.erase(itr, event_queue.end());
        std::make_heap(event_queue.begin(), event_queue.end(), std::greater<>());
-        pending_events.fetch_sub(1, std::memory_order_relaxed);
    }
 }
@@ -232,12 +202,11 @@ u64 CoreTiming::GetClockTicks() const {
 }
 void CoreTiming::ClearPendingEvents() {
-    std::unique_lock main_lock(event_mutex);
    event_queue.clear();
 }
 void CoreTiming::RemoveEvent(const std::shared_ptr<EventType>& event_type) {
-    std::unique_lock main_lock(event_mutex);
+    std::scoped_lock lock{basic_lock};
    const auto itr = std::remove_if(event_queue.begin(), event_queue.end(), [&](const Event& e) {
        return e.type.lock().get() == event_type.get();
@@ -251,28 +220,27 @@ void CoreTiming::RemoveEvent(const std::shared_ptr<EventType>& event_type) {
 }
 void CoreTiming::RegisterPauseCallback(PauseCallback&& callback) {
-    std::unique_lock main_lock(event_mutex);
+    std::scoped_lock lock{basic_lock};
    pause_callbacks.emplace_back(std::move(callback));
 }
 std::optional<s64> CoreTiming::Advance() {
+    std::scoped_lock lock{advance_lock, basic_lock};
    global_timer = GetGlobalTimeNs().count();
-    std::unique_lock main_lock(event_mutex);
    while (!event_queue.empty() && event_queue.front().time <= global_timer) {
        Event evt = std::move(event_queue.front());
        std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>());
        event_queue.pop_back();
        if (const auto event_type{evt.type.lock()}) {
-            event_mutex.unlock();
+            basic_lock.unlock();
            const auto new_schedule_time{event_type->callback(
                evt.user_data, evt.time,
                std::chrono::nanoseconds{GetGlobalTimeNs().count() - evt.time})};
-            event_mutex.lock();
+            basic_lock.lock();
-            pending_events.fetch_sub(1, std::memory_order_relaxed);
            if (evt.reschedule_time != 0) {
                // If this event was scheduled into a pause, its time now is going to be way behind.
@@ -285,9 +253,9 @@ std::optional<s64> CoreTiming::Advance() {
                const auto next_schedule_time{new_schedule_time.has_value()
                                                  ? new_schedule_time.value().count()
                                                  : evt.reschedule_time};
                event_queue.emplace_back(
                    Event{next_time, event_fifo_id++, evt.user_data, evt.type, next_schedule_time});
-                pending_events.fetch_add(1, std::memory_order_relaxed);
                std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
            }
        }
@@ -304,34 +272,27 @@ std::optional<s64> CoreTiming::Advance() {
 }
 void CoreTiming::ThreadLoop() {
-    const auto predicate = [this] { return !event_queue.empty() || is_paused; };
    has_started = true;
    while (!shutting_down) {
-        while (!is_paused && !shutting_down) {
+        while (!paused) {
+            paused_set = false;
            const auto next_time = Advance();
            if (next_time) {
                if (*next_time > 0) {
                    std::chrono::nanoseconds next_time_ns = std::chrono::nanoseconds(*next_time);
-                    std::unique_lock main_lock(event_mutex);
+                    event.WaitFor(next_time_ns);
-                    event_cv.wait_for(main_lock, next_time_ns, predicate);
                }
            } else {
-                std::unique_lock main_lock(event_mutex);
+                wait_set = true;
-                event_cv.wait(main_lock, predicate);
+                event.Wait();
            }
+            wait_set = false;
        }
-        std::unique_lock main_lock(event_mutex);
-        pause_count++;
+        paused_set = true;
-        if (pause_count == worker_threads.size()) {
+        clock->Pause(true);
-            clock->Pause(true);
+        pause_event.Wait();
-            wait_signal_cv.notify_all();
+        clock->Pause(false);
-        }
-        wait_pause_cv.wait(main_lock, [this] { return !is_paused || shutting_down; });
-        pause_count--;
-        if (pause_count == 0) {
-            clock->Pause(false);
-            wait_signal_cv.notify_all();
-        }
    }
 }
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 09b6ed81a..6aa3ae923 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -5,7 +5,6 @@
 #include <atomic>
 #include <chrono>
-#include <condition_variable>
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -15,6 +14,7 @@
 #include <vector>
 #include "common/common_types.h"
+#include "common/thread.h"
 #include "common/wall_clock.h"
 namespace Core::Timing {
@@ -143,7 +143,7 @@ private:
    /// Clear all pending events. This should ONLY be done on exit.
    void ClearPendingEvents();
-    static void ThreadEntry(CoreTiming& instance, size_t id);
+    static void ThreadEntry(CoreTiming& instance);
    void ThreadLoop();
    std::unique_ptr<Common::WallClock> clock;
@@ -156,24 +156,21 @@ private:
    // accomodated by the standard adaptor class.
    std::vector<Event> event_queue;
    u64 event_fifo_id = 0;
-    std::atomic<size_t> pending_events{};
    std::shared_ptr<EventType> ev_lost;
+    Common::Event event{};
+    Common::Event pause_event{};
+    std::mutex basic_lock;
+    std::mutex advance_lock;
+    std::unique_ptr<std::thread> timer_thread;
+    std::atomic<bool> paused{};
+    std::atomic<bool> paused_set{};
+    std::atomic<bool> wait_set{};
+    std::atomic<bool> shutting_down{};
    std::atomic<bool> has_started{};
    std::function<void()> on_thread_init{};
-    std::vector<std::thread> worker_threads;
-    std::condition_variable event_cv;
-    std::condition_variable wait_pause_cv;
-    std::condition_variable wait_signal_cv;
-    mutable std::mutex event_mutex;
-    std::atomic<bool> paused_state{};
-    bool is_paused{};
-    bool shutting_down{};
    bool is_multicore{};
-    size_t pause_count{};
    s64 pause_end_time{};
    /// Cycle timing
diff --git a/src/core/file_sys/errors.h b/src/core/file_sys/errors.h
index ff15b3e23..7cee0c7df 100644
--- a/src/core/file_sys/errors.h
+++ b/src/core/file_sys/errors.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h
index a405e3c94..094d1e713 100644
--- a/src/core/frontend/applets/software_keyboard.h
+++ b/src/core/frontend/applets/software_keyboard.h
@@ -17,6 +17,8 @@ struct KeyboardInitializeParameters {
    std::u16string sub_text;
    std::u16string guide_text;
    std::u16string initial_text;
+    char16_t left_optional_symbol_key;
+    char16_t right_optional_symbol_key;
    u32 max_text_length;
    u32 min_text_length;
    s32 initial_cursor_position;
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index 57c6ffc43..1be2dccb0 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <mutex>
 #include "core/frontend/emu_window.h"
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h
index b3bffecb2..ac1906d5e 100644
--- a/src/core/frontend/emu_window.h
+++ b/src/core/frontend/emu_window.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h
index 602e12606..416da15ec 100644
--- a/src/core/hle/ipc.h
+++ b/src/core/hle/ipc.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h
index 004bb2005..d631c0357 100644
--- a/src/core/hle/ipc_helpers.h
+++ b/src/core/hle/ipc_helpers.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp
index d63e77d15..3cb22ff4d 100644
--- a/src/core/hle/kernel/k_client_port.cpp
+++ b/src/core/hle/kernel/k_client_port.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 Citra Emulator Project
+// SPDX-FileCopyrightText: 2021 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "common/scope_exit.h"
 #include "core/hle/kernel/hle_ipc.h"
diff --git a/src/core/hle/kernel/k_client_port.h b/src/core/hle/kernel/k_client_port.h
index ef8583efc..e17eff28f 100644
--- a/src/core/hle/kernel/k_client_port.h
+++ b/src/core/hle/kernel/k_client_port.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp
index b662788b3..d3e99665f 100644
--- a/src/core/hle/kernel/k_process.cpp
+++ b/src/core/hle/kernel/k_process.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <bitset>
diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h
index 5e3e22ad8..d56d73bab 100644
--- a/src/core/hle/kernel/k_process.h
+++ b/src/core/hle/kernel/k_process.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/kernel/k_shared_memory.cpp b/src/core/hle/kernel/k_shared_memory.cpp
index b77735736..8ff1545b6 100644
--- a/src/core/hle/kernel/k_shared_memory.cpp
+++ b/src/core/hle/kernel/k_shared_memory.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "common/assert.h"
 #include "core/core.h"
diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/core/hle/kernel/k_shared_memory.h
index 2c1db0e70..34cb98456 100644
--- a/src/core/hle/kernel/k_shared_memory.h
+++ b/src/core/hle/kernel/k_shared_memory.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index aa9e5b89d..4de44cd06 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.cpp b/src/core/hle/service/am/applets/applet_software_keyboard.cpp
index faa092957..c18236045 100644
--- a/src/core/hle/service/am/applets/applet_software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/applet_software_keyboard.cpp
@@ -536,6 +536,8 @@ void SoftwareKeyboard::InitializeFrontendNormalKeyboard() {
        .sub_text{std::move(sub_text)},
        .guide_text{std::move(guide_text)},
        .initial_text{initial_text},
+        .left_optional_symbol_key{swkbd_config_common.left_optional_symbol_key},
+        .right_optional_symbol_key{swkbd_config_common.right_optional_symbol_key},
        .max_text_length{max_text_length},
        .min_text_length{min_text_length},
        .initial_cursor_position{initial_cursor_position},
@@ -591,6 +593,8 @@ void SoftwareKeyboard::InitializeFrontendInlineKeyboardOld() {
        .sub_text{},
        .guide_text{},
        .initial_text{current_text},
+        .left_optional_symbol_key{appear_arg.left_optional_symbol_key},
+        .right_optional_symbol_key{appear_arg.right_optional_symbol_key},
        .max_text_length{max_text_length},
        .min_text_length{min_text_length},
        .initial_cursor_position{initial_cursor_position},
@@ -632,6 +636,8 @@ void SoftwareKeyboard::InitializeFrontendInlineKeyboardNew() {
        .sub_text{},
        .guide_text{},
        .initial_text{current_text},
+        .left_optional_symbol_key{appear_arg.left_optional_symbol_key},
+        .right_optional_symbol_key{appear_arg.right_optional_symbol_key},
        .max_text_length{max_text_length},
        .min_text_length{min_text_length},
        .initial_cursor_position{initial_cursor_position},
diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp
index d5107e41f..c4b44cbf9 100644
--- a/src/core/hle/service/hid/irs.cpp
+++ b/src/core/hle/service/hid/irs.cpp
@@ -166,7 +166,7 @@ void IRS::RunClusteringProcessor(Kernel::HLERequestContext& ctx) {
    if (result.IsSuccess()) {
        auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle);
-        MakeProcessor<ClusteringProcessor>(parameters.camera_handle, device);
+        MakeProcessorWithCoreContext<ClusteringProcessor>(parameters.camera_handle, device);
        auto& image_transfer_processor =
            GetProcessor<ClusteringProcessor>(parameters.camera_handle);
        image_transfer_processor.SetConfig(parameters.processor_config);
diff --git a/src/core/hle/service/hid/irs_ring_lifo.h b/src/core/hle/service/hid/irs_ring_lifo.h
new file mode 100644
index 000000000..255d1d296
--- /dev/null
+++ b/src/core/hle/service/hid/irs_ring_lifo.h
@@ -0,0 +1,47 @@
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+#include <array>
+#include "common/common_types.h"
+namespace Service::IRS {
+template <typename State, std::size_t max_buffer_size>
+struct Lifo {
+    s64 sampling_number{};
+    s64 buffer_count{};
+    std::array<State, max_buffer_size> entries{};
+    const State& ReadCurrentEntry() const {
+        return entries[GetBufferTail()];
+    }
+    const State& ReadPreviousEntry() const {
+        return entries[GetPreviousEntryIndex()];
+    }
+    s64 GetBufferTail() const {
+        return sampling_number % max_buffer_size;
+    }
+    std::size_t GetPreviousEntryIndex() const {
+        return static_cast<size_t>((GetBufferTail() + max_buffer_size - 1) % max_buffer_size);
+    }
+    std::size_t GetNextEntryIndex() const {
+        return static_cast<size_t>((GetBufferTail() + 1) % max_buffer_size);
+    }
+    void WriteNextEntry(const State& new_state) {
+        if (buffer_count < static_cast<s64>(max_buffer_size)) {
+            buffer_count++;
+        }
+        sampling_number++;
+        entries[GetBufferTail()] = new_state;
+    }
+};
+} // namespace Service::IRS
diff --git a/src/core/hle/service/hid/irsensor/clustering_processor.cpp b/src/core/hle/service/hid/irsensor/clustering_processor.cpp
index 6479af212..e2f4ae876 100644
--- a/src/core/hle/service/hid/irsensor/clustering_processor.cpp
+++ b/src/core/hle/service/hid/irsensor/clustering_processor.cpp
@@ -1,34 +1,265 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
+#include <queue>
+#include "core/hid/emulated_controller.h"
+#include "core/hid/hid_core.h"
 #include "core/hle/service/hid/irsensor/clustering_processor.h"
 namespace Service::IRS {
-ClusteringProcessor::ClusteringProcessor(Core::IrSensor::DeviceFormat& device_format)
+ClusteringProcessor::ClusteringProcessor(Core::HID::HIDCore& hid_core_,
-    : device(device_format) {
+                                         Core::IrSensor::DeviceFormat& device_format,
+                                         std::size_t npad_index)
+    : device{device_format} {
+    npad_device = hid_core_.GetEmulatedControllerByIndex(npad_index);
    device.mode = Core::IrSensor::IrSensorMode::ClusteringProcessor;
    device.camera_status = Core::IrSensor::IrCameraStatus::Unconnected;
    device.camera_internal_status = Core::IrSensor::IrCameraInternalStatus::Stopped;
+    SetDefaultConfig();
+    shared_memory = std::construct_at(
+        reinterpret_cast<ClusteringSharedMemory*>(&device_format.state.processor_raw_data));
+    Core::HID::ControllerUpdateCallback engine_callback{
+        .on_change = [this](Core::HID::ControllerTriggerType type) { OnControllerUpdate(type); },
+        .is_npad_service = true,
+    };
+    callback_key = npad_device->SetCallback(engine_callback);
 }
-ClusteringProcessor::~ClusteringProcessor() = default;
+ClusteringProcessor::~ClusteringProcessor() {
+    npad_device->DeleteCallback(callback_key);
+};
-void ClusteringProcessor::StartProcessor() {}
+void ClusteringProcessor::StartProcessor() {
+    device.camera_status = Core::IrSensor::IrCameraStatus::Available;
+    device.camera_internal_status = Core::IrSensor::IrCameraInternalStatus::Ready;
+}
 void ClusteringProcessor::SuspendProcessor() {}
 void ClusteringProcessor::StopProcessor() {}
+void ClusteringProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType type) {
+    if (type != Core::HID::ControllerTriggerType::IrSensor) {
+        return;
+    }
+    next_state = {};
+    const auto camera_data = npad_device->GetCamera();
+    auto filtered_image = camera_data.data;
+    RemoveLowIntensityData(filtered_image);
+    const auto window_start_x = static_cast<std::size_t>(current_config.window_of_interest.x);
+    const auto window_start_y = static_cast<std::size_t>(current_config.window_of_interest.y);
+    const auto window_end_x =
+        window_start_x + static_cast<std::size_t>(current_config.window_of_interest.width);
+    const auto window_end_y =
+        window_start_y + static_cast<std::size_t>(current_config.window_of_interest.height);
+    for (std::size_t y = window_start_y; y < window_end_y; y++) {
+        for (std::size_t x = window_start_x; x < window_end_x; x++) {
+            u8 pixel = GetPixel(filtered_image, x, y);
+            if (pixel == 0) {
+                continue;
+            }
+            const auto cluster = GetClusterProperties(filtered_image, x, y);
+            if (cluster.pixel_count > current_config.pixel_count_max) {
+                continue;
+            }
+            if (cluster.pixel_count < current_config.pixel_count_min) {
+                continue;
+            }
+            // Cluster object limit reached
+            if (next_state.object_count >= next_state.data.size()) {
+                continue;
+            }
+            next_state.data[next_state.object_count] = cluster;
+            next_state.object_count++;
+        }
+    }
+    next_state.sampling_number = camera_data.sample;
+    next_state.timestamp = next_state.timestamp + 131;
+    next_state.ambient_noise_level = Core::IrSensor::CameraAmbientNoiseLevel::Low;
+    shared_memory->clustering_lifo.WriteNextEntry(next_state);
+    if (!IsProcessorActive()) {
+        StartProcessor();
+    }
+}
+void ClusteringProcessor::RemoveLowIntensityData(std::vector<u8>& data) {
+    for (u8& pixel : data) {
+        if (pixel < current_config.pixel_count_min) {
+            pixel = 0;
+        }
+    }
+}
+ClusteringProcessor::ClusteringData ClusteringProcessor::GetClusterProperties(std::vector<u8>& data,
+                                                                              std::size_t x,
+                                                                              std::size_t y) {
+    using DataPoint = Common::Point<std::size_t>;
+    std::queue<DataPoint> search_points{};
+    ClusteringData current_cluster = GetPixelProperties(data, x, y);
+    SetPixel(data, x, y, 0);
+    search_points.emplace<DataPoint>({x, y});
+    while (!search_points.empty()) {
+        const auto point = search_points.front();
+        search_points.pop();
+        // Avoid negative numbers
+        if (point.x == 0 || point.y == 0) {
+            continue;
+        }
+        std::array<DataPoint, 4> new_points{
+            DataPoint{point.x - 1, point.y},
+            {point.x, point.y - 1},
+            {point.x + 1, point.y},
+            {point.x, point.y + 1},
+        };
+        for (const auto new_point : new_points) {
+            if (new_point.x >= width) {
+                continue;
+            }
+            if (new_point.y >= height) {
+                continue;
+            }
+            if (GetPixel(data, new_point.x, new_point.y) < current_config.object_intensity_min) {
+                continue;
+            }
+            const ClusteringData cluster = GetPixelProperties(data, new_point.x, new_point.y);
+            current_cluster = MergeCluster(current_cluster, cluster);
+            SetPixel(data, new_point.x, new_point.y, 0);
+            search_points.emplace<DataPoint>({new_point.x, new_point.y});
+        }
+    }
+    return current_cluster;
+}
+ClusteringProcessor::ClusteringData ClusteringProcessor::GetPixelProperties(
+    const std::vector<u8>& data, std::size_t x, std::size_t y) const {
+    return {
+        .average_intensity = GetPixel(data, x, y) / 255.0f,
+        .centroid =
+            {
+                .x = static_cast<f32>(x),
+                .y = static_cast<f32>(y),
+            },
+        .pixel_count = 1,
+        .bound =
+            {
+                .x = static_cast<s16>(x),
+                .y = static_cast<s16>(y),
+                .width = 1,
+                .height = 1,
+            },
+    };
+}
+ClusteringProcessor::ClusteringData ClusteringProcessor::MergeCluster(
+    const ClusteringData a, const ClusteringData b) const {
+    const f32 a_pixel_count = static_cast<f32>(a.pixel_count);
+    const f32 b_pixel_count = static_cast<f32>(b.pixel_count);
+    const f32 pixel_count = a_pixel_count + b_pixel_count;
+    const f32 average_intensity =
+        (a.average_intensity * a_pixel_count + b.average_intensity * b_pixel_count) / pixel_count;
+    const Core::IrSensor::IrsCentroid centroid = {
+        .x = (a.centroid.x * a_pixel_count + b.centroid.x * b_pixel_count) / pixel_count,
+        .y = (a.centroid.y * a_pixel_count + b.centroid.y * b_pixel_count) / pixel_count,
+    };
+    s16 bound_start_x = a.bound.x < b.bound.x ? a.bound.x : b.bound.x;
+    s16 bound_start_y = a.bound.y < b.bound.y ? a.bound.y : b.bound.y;
+    s16 a_bound_end_x = a.bound.x + a.bound.width;
+    s16 a_bound_end_y = a.bound.y + a.bound.height;
+    s16 b_bound_end_x = b.bound.x + b.bound.width;
+    s16 b_bound_end_y = b.bound.y + b.bound.height;
+    const Core::IrSensor::IrsRect bound = {
+        .x = bound_start_x,
+        .y = bound_start_y,
+        .width = a_bound_end_x > b_bound_end_x ? static_cast<s16>(a_bound_end_x - bound_start_x)
+                                               : static_cast<s16>(b_bound_end_x - bound_start_x),
+        .height = a_bound_end_y > b_bound_end_y ? static_cast<s16>(a_bound_end_y - bound_start_y)
+                                                : static_cast<s16>(b_bound_end_y - bound_start_y),
+    };
+    return {
+        .average_intensity = average_intensity,
+        .centroid = centroid,
+        .pixel_count = static_cast<u32>(pixel_count),
+        .bound = bound,
+    };
+}
+u8 ClusteringProcessor::GetPixel(const std::vector<u8>& data, std::size_t x, std::size_t y) const {
+    if ((y * width) + x > data.size()) {
+        return 0;
+    }
+    return data[(y * width) + x];
+}
+void ClusteringProcessor::SetPixel(std::vector<u8>& data, std::size_t x, std::size_t y, u8 value) {
+    if ((y * width) + x > data.size()) {
+        return;
+    }
+    data[(y * width) + x] = value;
+}
+void ClusteringProcessor::SetDefaultConfig() {
+    using namespace std::literals::chrono_literals;
+    current_config.camera_config.exposure_time = std::chrono::microseconds(200ms).count();
+    current_config.camera_config.gain = 2;
+    current_config.camera_config.is_negative_used = false;
+    current_config.camera_config.light_target = Core::IrSensor::CameraLightTarget::BrightLeds;
+    current_config.window_of_interest = {
+        .x = 0,
+        .y = 0,
+        .width = width,
+        .height = height,
+    };
+    current_config.pixel_count_min = 3;
+    current_config.pixel_count_max = static_cast<u32>(GetDataSize(format));
+    current_config.is_external_light_filter_enabled = true;
+    current_config.object_intensity_min = 150;
+    npad_device->SetCameraFormat(format);
+}
 void ClusteringProcessor::SetConfig(Core::IrSensor::PackedClusteringProcessorConfig config) {
    current_config.camera_config.exposure_time = config.camera_config.exposure_time;
    current_config.camera_config.gain = config.camera_config.gain;
    current_config.camera_config.is_negative_used = config.camera_config.is_negative_used;
    current_config.camera_config.light_target =
        static_cast<Core::IrSensor::CameraLightTarget>(config.camera_config.light_target);
+    current_config.window_of_interest = config.window_of_interest;
    current_config.pixel_count_min = config.pixel_count_min;
    current_config.pixel_count_max = config.pixel_count_max;
    current_config.is_external_light_filter_enabled = config.is_external_light_filter_enabled;
    current_config.object_intensity_min = config.object_intensity_min;
+    LOG_INFO(Service_IRS,
+             "Processor config, exposure_time={}, gain={}, is_negative_used={}, "
+             "light_target={}, window_of_interest=({}, {}, {}, {}), pixel_count_min={}, "
+             "pixel_count_max={}, is_external_light_filter_enabled={}, object_intensity_min={}",
+             current_config.camera_config.exposure_time, current_config.camera_config.gain,
+             current_config.camera_config.is_negative_used,
+             current_config.camera_config.light_target, current_config.window_of_interest.x,
+             current_config.window_of_interest.y, current_config.window_of_interest.width,
+             current_config.window_of_interest.height, current_config.pixel_count_min,
+             current_config.pixel_count_max, current_config.is_external_light_filter_enabled,
+             current_config.object_intensity_min);
+    npad_device->SetCameraFormat(format);
 }
 } // namespace Service::IRS
diff --git a/src/core/hle/service/hid/irsensor/clustering_processor.h b/src/core/hle/service/hid/irsensor/clustering_processor.h
index 6e2ba8846..dc01a8ea7 100644
--- a/src/core/hle/service/hid/irsensor/clustering_processor.h
+++ b/src/core/hle/service/hid/irsensor/clustering_processor.h
@@ -5,12 +5,19 @@
 #include "common/common_types.h"
 #include "core/hid/irs_types.h"
+#include "core/hle/service/hid/irs_ring_lifo.h"
 #include "core/hle/service/hid/irsensor/processor_base.h"
+namespace Core::HID {
+class EmulatedController;
+} // namespace Core::HID
 namespace Service::IRS {
 class ClusteringProcessor final : public ProcessorBase {
 public:
-    explicit ClusteringProcessor(Core::IrSensor::DeviceFormat& device_format);
+    explicit ClusteringProcessor(Core::HID::HIDCore& hid_core_,
+                                 Core::IrSensor::DeviceFormat& device_format,
+                                 std::size_t npad_index);
    ~ClusteringProcessor() override;
    // Called when the processor is initialized
@@ -26,6 +33,10 @@ public:
    void SetConfig(Core::IrSensor::PackedClusteringProcessorConfig config);
 private:
+    static constexpr auto format = Core::IrSensor::ImageTransferProcessorFormat::Size320x240;
+    static constexpr std::size_t width = 320;
+    static constexpr std::size_t height = 240;
    // This is nn::irsensor::ClusteringProcessorConfig
    struct ClusteringProcessorConfig {
        Core::IrSensor::CameraConfig camera_config;
@@ -68,7 +79,32 @@ private:
    static_assert(sizeof(ClusteringProcessorState) == 0x198,
                  "ClusteringProcessorState is an invalid size");
+    struct ClusteringSharedMemory {
+        Service::IRS::Lifo<ClusteringProcessorState, 6> clustering_lifo;
+        static_assert(sizeof(clustering_lifo) == 0x9A0, "clustering_lifo is an invalid size");
+        INSERT_PADDING_WORDS(0x11F);
+    };
+    static_assert(sizeof(ClusteringSharedMemory) == 0xE20,
+                  "ClusteringSharedMemory is an invalid size");
+    void OnControllerUpdate(Core::HID::ControllerTriggerType type);
+    void RemoveLowIntensityData(std::vector<u8>& data);
+    ClusteringData GetClusterProperties(std::vector<u8>& data, std::size_t x, std::size_t y);
+    ClusteringData GetPixelProperties(const std::vector<u8>& data, std::size_t x,
+                                      std::size_t y) const;
+    ClusteringData MergeCluster(const ClusteringData a, const ClusteringData b) const;
+    u8 GetPixel(const std::vector<u8>& data, std::size_t x, std::size_t y) const;
+    void SetPixel(std::vector<u8>& data, std::size_t x, std::size_t y, u8 value);
+    // Sets config parameters of the camera
+    void SetDefaultConfig();
+    ClusteringSharedMemory* shared_memory = nullptr;
+    ClusteringProcessorState next_state{};
    ClusteringProcessorConfig current_config{};
    Core::IrSensor::DeviceFormat& device;
+    Core::HID::EmulatedController* npad_device;
+    int callback_key{};
 };
 } // namespace Service::IRS
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index c64291e7f..dadaf897f 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -194,13 +194,16 @@ Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session,
                                               Kernel::HLERequestContext& ctx) {
    const auto guard = LockService();
+    Result result = ResultSuccess;
    switch (ctx.GetCommandType()) {
    case IPC::CommandType::Close:
    case IPC::CommandType::TIPC_Close: {
        session.Close();
        IPC::ResponseBuilder rb{ctx, 2};
        rb.Push(ResultSuccess);
-        return IPC::ERR_REMOTE_PROCESS_DEAD;
+        result = IPC::ERR_REMOTE_PROCESS_DEAD;
+        break;
    }
    case IPC::CommandType::ControlWithContext:
    case IPC::CommandType::Control: {
@@ -227,7 +230,7 @@ Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session,
        ctx.WriteToOutgoingCommandBuffer(ctx.GetThread());
    }
-    return ResultSuccess;
+    return result;
 }
 /// Initialize Services
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
deleted file mode 100644
index dfb10c34f..000000000
--- a/src/core/loader/elf.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-// SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
-// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include <cstring>
-#include <memory>
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "common/elf.h"
-#include "common/logging/log.h"
-#include "core/hle/kernel/code_set.h"
-#include "core/hle/kernel/k_page_table.h"
-#include "core/hle/kernel/k_process.h"
-#include "core/loader/elf.h"
-#include "core/memory.h"
-using namespace Common::ELF;
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// ElfReader class
-typedef int SectionID;
-class ElfReader {
-private:
-    char* base;
-    u32* base32;
-    Elf32_Ehdr* header;
-    Elf32_Phdr* segments;
-    Elf32_Shdr* sections;
-    u32* sectionAddrs;
-    bool relocate;
-    VAddr entryPoint;
-public:
-    explicit ElfReader(void* ptr);
-    u32 Read32(int off) const {
-        return base32[off >> 2];
-    }
-    // Quick accessors
-    u16 GetType() const {
-        return header->e_type;
-    }
-    u16 GetMachine() const {
-        return header->e_machine;
-    }
-    VAddr GetEntryPoint() const {
-        return entryPoint;
-    }
-    u32 GetFlags() const {
-        return (u32)(header->e_flags);
-    }
-    Kernel::CodeSet LoadInto(VAddr vaddr);
-    int GetNumSegments() const {
-        return (int)(header->e_phnum);
-    }
-    int GetNumSections() const {
-        return (int)(header->e_shnum);
-    }
-    const u8* GetPtr(int offset) const {
-        return (u8*)base + offset;
-    }
-    const char* GetSectionName(int section) const;
-    const u8* GetSectionDataPtr(int section) const {
-        if (section < 0 || section >= header->e_shnum)
-            return nullptr;
-        if (sections[section].sh_type != ElfShtNobits)
-            return GetPtr(sections[section].sh_offset);
-        else
-            return nullptr;
-    }
-    bool IsCodeSection(int section) const {
-        return sections[section].sh_type == ElfShtProgBits;
-    }
-    const u8* GetSegmentPtr(int segment) {
-        return GetPtr(segments[segment].p_offset);
-    }
-    u32 GetSectionAddr(SectionID section) const {
-        return sectionAddrs[section];
-    }
-    unsigned int GetSectionSize(SectionID section) const {
-        return sections[section].sh_size;
-    }
-    SectionID GetSectionByName(const char* name, int firstSection = 0) const; //-1 for not found
-    bool DidRelocate() const {
-        return relocate;
-    }
-};
-ElfReader::ElfReader(void* ptr) {
-    base = (char*)ptr;
-    base32 = (u32*)ptr;
-    header = (Elf32_Ehdr*)ptr;
-    segments = (Elf32_Phdr*)(base + header->e_phoff);
-    sections = (Elf32_Shdr*)(base + header->e_shoff);
-    entryPoint = header->e_entry;
-}
-const char* ElfReader::GetSectionName(int section) const {
-    if (sections[section].sh_type == ElfShtNull)
-        return nullptr;
-    int name_offset = sections[section].sh_name;
-    const char* ptr = reinterpret_cast<const char*>(GetSectionDataPtr(header->e_shstrndx));
-    if (ptr)
-        return ptr + name_offset;
-    return nullptr;
-}
-Kernel::CodeSet ElfReader::LoadInto(VAddr vaddr) {
-    LOG_DEBUG(Loader, "String section: {}", header->e_shstrndx);
-    // Should we relocate?
-    relocate = (header->e_type != ElfTypeExec);
-    if (relocate) {
-        LOG_DEBUG(Loader, "Relocatable module");
-        entryPoint += vaddr;
-    } else {
-        LOG_DEBUG(Loader, "Prerelocated executable");
-    }
-    LOG_DEBUG(Loader, "{} segments:", header->e_phnum);
-    // First pass : Get the bits into RAM
-    const VAddr base_addr = relocate ? vaddr : 0;
-    u64 total_image_size = 0;
-    for (unsigned int i = 0; i < header->e_phnum; ++i) {
-        const Elf32_Phdr* p = &segments[i];
-        if (p->p_type == ElfPtLoad) {
-            total_image_size += (p->p_memsz + 0xFFF) & ~0xFFF;
-        }
-    }
-    Kernel::PhysicalMemory program_image(total_image_size);
-    std::size_t current_image_position = 0;
-    Kernel::CodeSet codeset;
-    for (unsigned int i = 0; i < header->e_phnum; ++i) {
-        const Elf32_Phdr* p = &segments[i];
-        LOG_DEBUG(Loader, "Type: {} Vaddr: {:08X} Filesz: {:08X} Memsz: {:08X} ", p->p_type,
-                  p->p_vaddr, p->p_filesz, p->p_memsz);
-        if (p->p_type == ElfPtLoad) {
-            Kernel::CodeSet::Segment* codeset_segment;
-            u32 permission_flags = p->p_flags & (ElfPfRead | ElfPfWrite | ElfPfExec);
-            if (permission_flags == (ElfPfRead | ElfPfExec)) {
-                codeset_segment = &codeset.CodeSegment();
-            } else if (permission_flags == (ElfPfRead)) {
-                codeset_segment = &codeset.RODataSegment();
-            } else if (permission_flags == (ElfPfRead | ElfPfWrite)) {
-                codeset_segment = &codeset.DataSegment();
-            } else {
-                LOG_ERROR(Loader, "Unexpected ELF PT_LOAD segment id {} with flags {:X}", i,
-                          p->p_flags);
-                continue;
-            }
-            if (codeset_segment->size != 0) {
-                LOG_ERROR(Loader,
-                          "ELF has more than one segment of the same type. Skipping extra "
-                          "segment (id {})",
-                          i);
-                continue;
-            }
-            const VAddr segment_addr = base_addr + p->p_vaddr;
-            const u32 aligned_size = (p->p_memsz + 0xFFF) & ~0xFFF;
-            codeset_segment->offset = current_image_position;
-            codeset_segment->addr = segment_addr;
-            codeset_segment->size = aligned_size;
-            std::memcpy(program_image.data() + current_image_position, GetSegmentPtr(i),
-                        p->p_filesz);
-            current_image_position += aligned_size;
-        }
-    }
-    codeset.entrypoint = base_addr + header->e_entry;
-    codeset.memory = std::move(program_image);
-    LOG_DEBUG(Loader, "Done loading.");
-    return codeset;
-}
-SectionID ElfReader::GetSectionByName(const char* name, int firstSection) const {
-    for (int i = firstSection; i < header->e_shnum; i++) {
-        const char* secname = GetSectionName(i);
-        if (secname != nullptr && strcmp(name, secname) == 0)
-            return i;
-    }
-    return -1;
-}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Loader namespace
-namespace Loader {
-AppLoader_ELF::AppLoader_ELF(FileSys::VirtualFile file_) : AppLoader(std::move(file_)) {}
-FileType AppLoader_ELF::IdentifyType(const FileSys::VirtualFile& elf_file) {
-    static constexpr u16 ELF_MACHINE_ARM{0x28};
-    u32 magic = 0;
-    if (4 != elf_file->ReadObject(&magic)) {
-        return FileType::Error;
-    }
-    u16 machine = 0;
-    if (2 != elf_file->ReadObject(&machine, 18)) {
-        return FileType::Error;
-    }
-    if (Common::MakeMagic('\x7f', 'E', 'L', 'F') == magic && ELF_MACHINE_ARM == machine) {
-        return FileType::ELF;
-    }
-    return FileType::Error;
-}
-AppLoader_ELF::LoadResult AppLoader_ELF::Load(Kernel::KProcess& process,
-                                              [[maybe_unused]] Core::System& system) {
-    if (is_loaded) {
-        return {ResultStatus::ErrorAlreadyLoaded, {}};
-    }
-    std::vector<u8> buffer = file->ReadAllBytes();
-    if (buffer.size() != file->GetSize()) {
-        return {ResultStatus::ErrorIncorrectELFFileSize, {}};
-    }
-    const VAddr base_address = process.PageTable().GetCodeRegionStart();
-    ElfReader elf_reader(&buffer[0]);
-    Kernel::CodeSet codeset = elf_reader.LoadInto(base_address);
-    const VAddr entry_point = codeset.entrypoint;
-    // Setup the process code layout
-    if (process.LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), buffer.size()).IsError()) {
-        return {ResultStatus::ErrorNotInitialized, {}};
-    }
-    process.LoadModule(std::move(codeset), entry_point);
-    is_loaded = true;
-    return {ResultStatus::Success, LoadParameters{48, Core::Memory::DEFAULT_STACK_SIZE}};
-}
-} // namespace Loader
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h
deleted file mode 100644
index acd33dc3d..000000000
--- a/src/core/loader/elf.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
-// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-#include "core/loader/loader.h"
-namespace Core {
-class System;
-}
-namespace Loader {
-/// Loads an ELF/AXF file
-class AppLoader_ELF final : public AppLoader {
-public:
-    explicit AppLoader_ELF(FileSys::VirtualFile file);
-    /**
-     * Identifies whether or not the given file is an ELF file.
-     *
-     * @param elf_file The file to identify.
-     *
-     * @return FileType::ELF, or FileType::Error if the file is not an ELF file.
-     */
-    static FileType IdentifyType(const FileSys::VirtualFile& elf_file);
-    FileType GetFileType() const override {
-        return IdentifyType(file);
-    }
-    LoadResult Load(Kernel::KProcess& process, Core::System& system) override;
-};
-} // namespace Loader
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 994ee891f..104d16efa 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -12,7 +12,6 @@
 #include "core/core.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/loader/deconstructed_rom_directory.h"
-#include "core/loader/elf.h"
 #include "core/loader/kip.h"
 #include "core/loader/nax.h"
 #include "core/loader/nca.h"
@@ -39,8 +38,6 @@ std::optional<FileType> IdentifyFileLoader(FileSys::VirtualFile file) {
 FileType IdentifyFile(FileSys::VirtualFile file) {
    if (const auto romdir_type = IdentifyFileLoader<AppLoader_DeconstructedRomDirectory>(file)) {
        return *romdir_type;
-    } else if (const auto elf_type = IdentifyFileLoader<AppLoader_ELF>(file)) {
-        return *elf_type;
    } else if (const auto nso_type = IdentifyFileLoader<AppLoader_NSO>(file)) {
        return *nso_type;
    } else if (const auto nro_type = IdentifyFileLoader<AppLoader_NRO>(file)) {
@@ -69,8 +66,6 @@ FileType GuessFromFilename(const std::string& name) {
    const std::string extension =
        Common::ToLower(std::string(Common::FS::GetExtensionFromFilename(name)));
-    if (extension == "elf")
-        return FileType::ELF;
    if (extension == "nro")
        return FileType::NRO;
    if (extension == "nso")
@@ -89,8 +84,6 @@ FileType GuessFromFilename(const std::string& name) {
 std::string GetFileTypeString(FileType type) {
    switch (type) {
-    case FileType::ELF:
-        return "ELF";
    case FileType::NRO:
        return "NRO";
    case FileType::NSO:
@@ -208,10 +201,6 @@ static std::unique_ptr<AppLoader> GetFileLoader(Core::System& system, FileSys::V
                                                FileType type, u64 program_id,
                                                std::size_t program_index) {
    switch (type) {
-    // Standard ELF file format.
-    case FileType::ELF:
-        return std::make_unique<AppLoader_ELF>(std::move(file));
    // NX NSO file format.
    case FileType::NSO:
        return std::make_unique<AppLoader_NSO>(std::move(file));
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 7bf4faaf1..7b43f70ed 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -34,7 +34,6 @@ namespace Loader {
 enum class FileType {
    Error,
    Unknown,
-    ELF,
    NSO,
    NRO,
    NCA,
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 635449fce..1b44280b5 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <cstring>
diff --git a/src/core/memory.h b/src/core/memory.h
index 780c45385..2a21fbcfd 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp
index 6ef459b7a..f09c176f8 100644
--- a/src/core/perf_stats.cpp
+++ b/src/core/perf_stats.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <chrono>
diff --git a/src/core/perf_stats.h b/src/core/perf_stats.h
index 816202588..dd6becc02 100644
--- a/src/core/perf_stats.h
+++ b/src/core/perf_stats.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index 654db0b52..abcf6eb11 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
diff --git a/src/core/telemetry_session.h b/src/core/telemetry_session.h
index 6f3d45bea..887dc98f3 100644
--- a/src/core/telemetry_session.h
+++ b/src/core/telemetry_session.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
index 90dd629c6..4b91b88ce 100644
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 add_library(input_common STATIC
    drivers/camera.cpp
    drivers/camera.h
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index 00474ac77..de388ec4c 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "common/logging/log.h"
 #include "common/math_util.h"
diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h
index 7dc7a93c7..fc3a44572 100644
--- a/src/input_common/drivers/sdl_driver.h
+++ b/src/input_common/drivers/sdl_driver.h
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/input_common/drivers/tas_input.cpp b/src/input_common/drivers/tas_input.cpp
index 66dbefe00..21c6ed405 100644
--- a/src/input_common/drivers/tas_input.cpp
+++ b/src/input_common/drivers/tas_input.cpp
@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later.
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include <cstring>
 #include <fmt/format.h>
diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp
index 825262a07..808b21069 100644
--- a/src/input_common/drivers/udp_client.cpp
+++ b/src/input_common/drivers/udp_client.cpp
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <random>
 #include <boost/asio.hpp>
diff --git a/src/input_common/drivers/udp_client.h b/src/input_common/drivers/udp_client.h
index dece2a45b..cea9f579a 100644
--- a/src/input_common/drivers/udp_client.h
+++ b/src/input_common/drivers/udp_client.h
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/input_common/helpers/stick_from_buttons.cpp b/src/input_common/helpers/stick_from_buttons.cpp
index 31e6f62ab..536d413a5 100644
--- a/src/input_common/helpers/stick_from_buttons.cpp
+++ b/src/input_common/helpers/stick_from_buttons.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <chrono>
 #include <cmath>
diff --git a/src/input_common/helpers/stick_from_buttons.h b/src/input_common/helpers/stick_from_buttons.h
index 437ace4f7..e8d865743 100644
--- a/src/input_common/helpers/stick_from_buttons.h
+++ b/src/input_common/helpers/stick_from_buttons.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/input_common/helpers/touch_from_buttons.cpp b/src/input_common/helpers/touch_from_buttons.cpp
index f1b57d03a..da4a3dca5 100644
--- a/src/input_common/helpers/touch_from_buttons.cpp
+++ b/src/input_common/helpers/touch_from_buttons.cpp
@@ -1,6 +1,5 @@
-// Copyright 2020 Citra Emulator Project
+// SPDX-FileCopyrightText: 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include "common/settings.h"
diff --git a/src/input_common/helpers/touch_from_buttons.h b/src/input_common/helpers/touch_from_buttons.h
index 628f18215..c6cb3ab3c 100644
--- a/src/input_common/helpers/touch_from_buttons.h
+++ b/src/input_common/helpers/touch_from_buttons.h
@@ -1,6 +1,5 @@
-// Copyright 2020 Citra Emulator Project
+// SPDX-FileCopyrightText: 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/input_common/helpers/udp_protocol.cpp b/src/input_common/helpers/udp_protocol.cpp
index cdeab7e11..994380d21 100644
--- a/src/input_common/helpers/udp_protocol.cpp
+++ b/src/input_common/helpers/udp_protocol.cpp
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <cstddef>
 #include <cstring>
diff --git a/src/input_common/helpers/udp_protocol.h b/src/input_common/helpers/udp_protocol.h
index 889693e73..d9643ffe0 100644
--- a/src/input_common/helpers/udp_protocol.h
+++ b/src/input_common/helpers/udp_protocol.h
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index ca1cb9542..75a57b9fc 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <memory>
 #include "common/input.h"
diff --git a/src/input_common/main.h b/src/input_common/main.h
index b756bb5c6..9a969e747 100644
--- a/src/input_common/main.h
+++ b/src/input_common/main.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 382a69e2f..312f79b68 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
 add_library(network STATIC
    network.cpp
    network.h
diff --git a/src/shader_recompiler/CMakeLists.txt b/src/shader_recompiler/CMakeLists.txt
index ae1dbe619..af8e51fe8 100644
--- a/src/shader_recompiler/CMakeLists.txt
+++ b/src/shader_recompiler/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 add_library(shader_recompiler STATIC
    backend/bindings.h
    backend/glasm/emit_glasm.cpp
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
index d4a49ea99..98dd9035a 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@@ -1306,7 +1306,7 @@ void EmitContext::DefineInputs(const IR::Program& program) {
        subgroup_mask_gt = DefineInput(*this, U32[4], false, spv::BuiltIn::SubgroupGtMaskKHR);
        subgroup_mask_ge = DefineInput(*this, U32[4], false, spv::BuiltIn::SubgroupGeMaskKHR);
    }
-    if (info.uses_subgroup_invocation_id || info.uses_subgroup_shuffles ||
+    if (info.uses_fswzadd || info.uses_subgroup_invocation_id || info.uses_subgroup_shuffles ||
        (profile.warp_size_potentially_larger_than_guest &&
         (info.uses_subgroup_vote || info.uses_subgroup_mask))) {
        subgroup_local_invocation_id =
@@ -1411,7 +1411,8 @@ void EmitContext::DefineInputs(const IR::Program& program) {
 void EmitContext::DefineOutputs(const IR::Program& program) {
    const Info& info{program.info};
    const std::optional<u32> invocations{program.invocations};
-    if (info.stores.AnyComponent(IR::Attribute::PositionX) || stage == Stage::VertexB) {
+    if (runtime_info.convert_depth_mode || info.stores.AnyComponent(IR::Attribute::PositionX) ||
+        stage == Stage::VertexB) {
        output_position = DefineOutput(*this, F32[4], invocations, spv::BuiltIn::Position);
    }
    if (info.stores[IR::Attribute::PointSize] || runtime_info.fixed_state_point_size) {
diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/logic_operation_three_input_lut3.py b/src/shader_recompiler/frontend/maxwell/translate/impl/logic_operation_three_input_lut3.py
index 8f547c266..e66d50d61 100644
--- a/src/shader_recompiler/frontend/maxwell/translate/impl/logic_operation_three_input_lut3.py
+++ b/src/shader_recompiler/frontend/maxwell/translate/impl/logic_operation_three_input_lut3.py
@@ -1,7 +1,5 @@
-# Copyright © 2022 degasus <markus@selfnet.de>
+# SPDX-FileCopyrightText: 2022 degasus <markus@selfnet.de>
-# This work is free. You can redistribute it and/or modify it under the
+# SPDX-License-Identifier: WTFPL
-# terms of the Do What The Fuck You Want To Public License, Version 2,
-# as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.
 from itertools import product
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index fbbcf673a..43ad2c7ff 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 add_executable(tests
    common/bit_field.cpp
    common/cityhash.cpp
diff --git a/src/tests/common/bit_field.cpp b/src/tests/common/bit_field.cpp
index 182638000..0071ae52e 100644
--- a/src/tests/common/bit_field.cpp
+++ b/src/tests/common/bit_field.cpp
@@ -1,6 +1,5 @@
-// Copyright 2019 Citra Emulator Project
+// SPDX-FileCopyrightText: 2019 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <cstring>
diff --git a/src/tests/common/param_package.cpp b/src/tests/common/param_package.cpp
index e31ca3544..d036cc83a 100644
--- a/src/tests/common/param_package.cpp
+++ b/src/tests/common/param_package.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <catch2/catch.hpp>
 #include <math.h>
diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cpp
index 894975e6f..7c432a63c 100644
--- a/src/tests/core/core_timing.cpp
+++ b/src/tests/core/core_timing.cpp
@@ -8,7 +8,6 @@
 #include <chrono>
 #include <cstdlib>
 #include <memory>
-#include <mutex>
 #include <optional>
 #include <string>
@@ -23,15 +22,14 @@ std::array<s64, 5> delays{};
 std::bitset<CB_IDS.size()> callbacks_ran_flags;
 u64 expected_callback = 0;
-std::mutex control_mutex;
 template <unsigned int IDX>
 std::optional<std::chrono::nanoseconds> HostCallbackTemplate(std::uintptr_t user_data, s64 time,
                                                             std::chrono::nanoseconds ns_late) {
-    std::unique_lock<std::mutex> lk(control_mutex);
    static_assert(IDX < CB_IDS.size(), "IDX out of range");
    callbacks_ran_flags.set(IDX);
    REQUIRE(CB_IDS[IDX] == user_data);
+    REQUIRE(CB_IDS[IDX] == CB_IDS[calls_order[expected_callback]]);
    delays[IDX] = ns_late.count();
    ++expected_callback;
    return std::nullopt;
diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
index 275b430d9..3f905c05c 100644
--- a/src/tests/tests.cpp
+++ b/src/tests/tests.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 14de7bc89..5b3808351 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 add_subdirectory(host_shaders)
 if(LIBVA_FOUND)
diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp
index b0ce9f000..d43f7175a 100644
--- a/src/video_core/gpu_thread.cpp
+++ b/src/video_core/gpu_thread.cpp
@@ -31,8 +31,7 @@ static void RunThread(std::stop_token stop_token, Core::System& system,
    VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer();
    while (!stop_token.stop_requested()) {
-        CommandDataContainer next;
+        CommandDataContainer next = state.queue.PopWait(stop_token);
-        state.queue.Pop(next, stop_token);
        if (stop_token.stop_requested()) {
            break;
        }
diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h
index be0ac2214..2f8210cb9 100644
--- a/src/video_core/gpu_thread.h
+++ b/src/video_core/gpu_thread.h
@@ -10,7 +10,7 @@
 #include <thread>
 #include <variant>
-#include "common/bounded_threadsafe_queue.h"
+#include "common/threadsafe_queue.h"
 #include "video_core/framebuffer_config.h"
 namespace Tegra {
@@ -96,7 +96,7 @@ struct CommandDataContainer {
 /// Struct used to synchronize the GPU thread
 struct SynchState final {
-    using CommandQueue = Common::MPSCQueue<CommandDataContainer>;
+    using CommandQueue = Common::MPSCQueue<CommandDataContainer, true>;
    std::mutex write_lock;
    CommandQueue queue;
    u64 last_fence{};
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt
index 190fc6aea..2149ab93e 100644
--- a/src/video_core/host_shaders/CMakeLists.txt
+++ b/src/video_core/host_shaders/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 set(FIDELITYFX_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/externals/FidelityFX-FSR/ffx-fsr)
 set(GLSL_INCLUDES
diff --git a/src/video_core/host_shaders/StringShaderHeader.cmake b/src/video_core/host_shaders/StringShaderHeader.cmake
index 1b4bc6103..9f7525535 100644
--- a/src/video_core/host_shaders/StringShaderHeader.cmake
+++ b/src/video_core/host_shaders/StringShaderHeader.cmake
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2020 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 set(SOURCE_FILE ${CMAKE_ARGV3})
 set(HEADER_FILE ${CMAKE_ARGV4})
 set(INPUT_FILE ${CMAKE_ARGV5})
diff --git a/src/video_core/host_shaders/source_shader.h.in b/src/video_core/host_shaders/source_shader.h.in
index 929dec39b..f189ee06b 100644
--- a/src/video_core/host_shaders/source_shader.h.in
+++ b/src/video_core/host_shaders/source_shader.h.in
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2020 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 #include <string_view>
diff --git a/src/video_core/host_shaders/vulkan_present_scaleforce_fp16.frag b/src/video_core/host_shaders/vulkan_present_scaleforce_fp16.frag
index 924c03060..3dc9c0df5 100644
--- a/src/video_core/host_shaders/vulkan_present_scaleforce_fp16.frag
+++ b/src/video_core/host_shaders/vulkan_present_scaleforce_fp16.frag
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
 #version 460
 #extension GL_GOOGLE_include_directive : enable
diff --git a/src/video_core/host_shaders/vulkan_present_scaleforce_fp32.frag b/src/video_core/host_shaders/vulkan_present_scaleforce_fp32.frag
index a594b83ca..77ed07552 100644
--- a/src/video_core/host_shaders/vulkan_present_scaleforce_fp32.frag
+++ b/src/video_core/host_shaders/vulkan_present_scaleforce_fp32.frag
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
 #version 460
 #extension GL_GOOGLE_include_directive : enable
diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp
index 9756a81d6..45791aa75 100644
--- a/src/video_core/renderer_base.cpp
+++ b/src/video_core/renderer_base.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "common/logging/log.h"
 #include "core/frontend/emu_window.h"
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index 30d19b178..8d20cbece 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 159b71161..a0d048b0b 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <array>
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index c79461d59..31a16fcba 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/video_core/renderer_opengl/gl_resource_manager.cpp b/src/video_core/renderer_opengl/gl_resource_manager.cpp
index f6839a657..3a664fdec 100644
--- a/src/video_core/renderer_opengl/gl_resource_manager.cpp
+++ b/src/video_core/renderer_opengl/gl_resource_manager.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <string_view>
 #include <glad/glad.h>
diff --git a/src/video_core/renderer_opengl/gl_resource_manager.h b/src/video_core/renderer_opengl/gl_resource_manager.h
index 84e07f8bd..bc05ba4bd 100644
--- a/src/video_core/renderer_opengl/gl_resource_manager.h
+++ b/src/video_core/renderer_opengl/gl_resource_manager.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index 07d4b7cf0..1ad56d9e7 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -299,7 +299,7 @@ void ShaderCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading,
    state.has_loaded = true;
    lock.unlock();
-    workers->WaitForRequests();
+    workers->WaitForRequests(stop_loading);
    if (!use_asynchronous_shaders) {
        workers.reset();
    }
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index 129966e72..a0d9d10ef 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <string_view>
 #include <vector>
@@ -18,6 +17,7 @@ static OGLProgram LinkSeparableProgram(GLuint shader) {
    glProgramParameteri(program.handle, GL_PROGRAM_SEPARABLE, GL_TRUE);
    glAttachShader(program.handle, shader);
    glLinkProgram(program.handle);
+    glDetachShader(program.handle, shader);
    if (!Settings::values.renderer_debug) {
        return program;
    }
diff --git a/src/video_core/renderer_opengl/gl_shader_util.h b/src/video_core/renderer_opengl/gl_shader_util.h
index a64ef37dc..43ebcdeba 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.h
+++ b/src/video_core/renderer_opengl/gl_shader_util.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 9a9243544..01028cee0 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <cstddef>
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index ae9558a33..1a32e739d 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp
index 689164a6a..7d1431b6d 100644
--- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp
+++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp
@@ -317,195 +317,204 @@ VkPrimitiveTopology PrimitiveTopology([[maybe_unused]] const Device& device,
    }
 }
-VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttribute::Size size) {
+VkFormat VertexFormat(const Device& device, Maxwell::VertexAttribute::Type type,
-    switch (type) {
+                      Maxwell::VertexAttribute::Size size) {
-    case Maxwell::VertexAttribute::Type::UnsignedNorm:
+    const VkFormat format{([&]() {
-        switch (size) {
+        switch (type) {
-        case Maxwell::VertexAttribute::Size::Size_8:
+        case Maxwell::VertexAttribute::Type::UnsignedNorm:
-            return VK_FORMAT_R8_UNORM;
+            switch (size) {
-        case Maxwell::VertexAttribute::Size::Size_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8:
-            return VK_FORMAT_R8G8_UNORM;
+                return VK_FORMAT_R8_UNORM;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8:
-            return VK_FORMAT_R8G8B8_UNORM;
+                return VK_FORMAT_R8G8_UNORM;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8:
-            return VK_FORMAT_R8G8B8A8_UNORM;
+                return VK_FORMAT_R8G8B8_UNORM;
-        case Maxwell::VertexAttribute::Size::Size_16:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
-            return VK_FORMAT_R16_UNORM;
+                return VK_FORMAT_R8G8B8A8_UNORM;
-        case Maxwell::VertexAttribute::Size::Size_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16:
-            return VK_FORMAT_R16G16_UNORM;
+                return VK_FORMAT_R16_UNORM;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16:
-            return VK_FORMAT_R16G16B16_UNORM;
+                return VK_FORMAT_R16G16_UNORM;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16:
-            return VK_FORMAT_R16G16B16A16_UNORM;
+                return VK_FORMAT_R16G16B16_UNORM;
-        case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
-            return VK_FORMAT_A2B10G10R10_UNORM_PACK32;
+                return VK_FORMAT_R16G16B16A16_UNORM;
-        default:
+            case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
+                return VK_FORMAT_A2B10G10R10_UNORM_PACK32;
+            default:
+                break;
+            }
            break;
-        }
+        case Maxwell::VertexAttribute::Type::SignedNorm:
-        break;
+            switch (size) {
-    case Maxwell::VertexAttribute::Type::SignedNorm:
+            case Maxwell::VertexAttribute::Size::Size_8:
-        switch (size) {
+                return VK_FORMAT_R8_SNORM;
-        case Maxwell::VertexAttribute::Size::Size_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8:
-            return VK_FORMAT_R8_SNORM;
+                return VK_FORMAT_R8G8_SNORM;
-        case Maxwell::VertexAttribute::Size::Size_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8:
-            return VK_FORMAT_R8G8_SNORM;
+                return VK_FORMAT_R8G8B8_SNORM;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
-            return VK_FORMAT_R8G8B8_SNORM;
+                return VK_FORMAT_R8G8B8A8_SNORM;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_16:
-            return VK_FORMAT_R8G8B8A8_SNORM;
+                return VK_FORMAT_R16_SNORM;
-        case Maxwell::VertexAttribute::Size::Size_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16:
-            return VK_FORMAT_R16_SNORM;
+                return VK_FORMAT_R16G16_SNORM;
-        case Maxwell::VertexAttribute::Size::Size_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16:
-            return VK_FORMAT_R16G16_SNORM;
+                return VK_FORMAT_R16G16B16_SNORM;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
-            return VK_FORMAT_R16G16B16_SNORM;
+                return VK_FORMAT_R16G16B16A16_SNORM;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
-            return VK_FORMAT_R16G16B16A16_SNORM;
+                return VK_FORMAT_A2B10G10R10_SNORM_PACK32;
-        case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
+            default:
-            return VK_FORMAT_A2B10G10R10_SNORM_PACK32;
+                break;
-        default:
+            }
            break;
-        }
+        case Maxwell::VertexAttribute::Type::UnsignedScaled:
-        break;
+            switch (size) {
-    case Maxwell::VertexAttribute::Type::UnsignedScaled:
+            case Maxwell::VertexAttribute::Size::Size_8:
-        switch (size) {
+                return VK_FORMAT_R8_USCALED;
-        case Maxwell::VertexAttribute::Size::Size_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8:
-            return VK_FORMAT_R8_USCALED;
+                return VK_FORMAT_R8G8_USCALED;
-        case Maxwell::VertexAttribute::Size::Size_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8:
-            return VK_FORMAT_R8G8_USCALED;
+                return VK_FORMAT_R8G8B8_USCALED;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
-            return VK_FORMAT_R8G8B8_USCALED;
+                return VK_FORMAT_R8G8B8A8_USCALED;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_16:
-            return VK_FORMAT_R8G8B8A8_USCALED;
+                return VK_FORMAT_R16_USCALED;
-        case Maxwell::VertexAttribute::Size::Size_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16:
-            return VK_FORMAT_R16_USCALED;
+                return VK_FORMAT_R16G16_USCALED;
-        case Maxwell::VertexAttribute::Size::Size_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16:
-            return VK_FORMAT_R16G16_USCALED;
+                return VK_FORMAT_R16G16B16_USCALED;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
-            return VK_FORMAT_R16G16B16_USCALED;
+                return VK_FORMAT_R16G16B16A16_USCALED;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
-            return VK_FORMAT_R16G16B16A16_USCALED;
+                return VK_FORMAT_A2B10G10R10_USCALED_PACK32;
-        case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
+            default:
-            return VK_FORMAT_A2B10G10R10_USCALED_PACK32;
+                break;
-        default:
+            }
            break;
-        }
+        case Maxwell::VertexAttribute::Type::SignedScaled:
-        break;
+            switch (size) {
-    case Maxwell::VertexAttribute::Type::SignedScaled:
+            case Maxwell::VertexAttribute::Size::Size_8:
-        switch (size) {
+                return VK_FORMAT_R8_SSCALED;
-        case Maxwell::VertexAttribute::Size::Size_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8:
-            return VK_FORMAT_R8_SSCALED;
+                return VK_FORMAT_R8G8_SSCALED;
-        case Maxwell::VertexAttribute::Size::Size_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8:
-            return VK_FORMAT_R8G8_SSCALED;
+                return VK_FORMAT_R8G8B8_SSCALED;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
-            return VK_FORMAT_R8G8B8_SSCALED;
+                return VK_FORMAT_R8G8B8A8_SSCALED;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_16:
-            return VK_FORMAT_R8G8B8A8_SSCALED;
+                return VK_FORMAT_R16_SSCALED;
-        case Maxwell::VertexAttribute::Size::Size_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16:
-            return VK_FORMAT_R16_SSCALED;
+                return VK_FORMAT_R16G16_SSCALED;
-        case Maxwell::VertexAttribute::Size::Size_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16:
-            return VK_FORMAT_R16G16_SSCALED;
+                return VK_FORMAT_R16G16B16_SSCALED;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
-            return VK_FORMAT_R16G16B16_SSCALED;
+                return VK_FORMAT_R16G16B16A16_SSCALED;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
-            return VK_FORMAT_R16G16B16A16_SSCALED;
+                return VK_FORMAT_A2B10G10R10_SSCALED_PACK32;
-        case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
+            default:
-            return VK_FORMAT_A2B10G10R10_SSCALED_PACK32;
+                break;
-        default:
+            }
            break;
-        }
+        case Maxwell::VertexAttribute::Type::UnsignedInt:
-        break;
+            switch (size) {
-    case Maxwell::VertexAttribute::Type::UnsignedInt:
+            case Maxwell::VertexAttribute::Size::Size_8:
-        switch (size) {
+                return VK_FORMAT_R8_UINT;
-        case Maxwell::VertexAttribute::Size::Size_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8:
-            return VK_FORMAT_R8_UINT;
+                return VK_FORMAT_R8G8_UINT;
-        case Maxwell::VertexAttribute::Size::Size_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8:
-            return VK_FORMAT_R8G8_UINT;
+                return VK_FORMAT_R8G8B8_UINT;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
-            return VK_FORMAT_R8G8B8_UINT;
+                return VK_FORMAT_R8G8B8A8_UINT;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_16:
-            return VK_FORMAT_R8G8B8A8_UINT;
+                return VK_FORMAT_R16_UINT;
-        case Maxwell::VertexAttribute::Size::Size_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16:
-            return VK_FORMAT_R16_UINT;
+                return VK_FORMAT_R16G16_UINT;
-        case Maxwell::VertexAttribute::Size::Size_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16:
-            return VK_FORMAT_R16G16_UINT;
+                return VK_FORMAT_R16G16B16_UINT;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
-            return VK_FORMAT_R16G16B16_UINT;
+                return VK_FORMAT_R16G16B16A16_UINT;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_32:
-            return VK_FORMAT_R16G16B16A16_UINT;
+                return VK_FORMAT_R32_UINT;
-        case Maxwell::VertexAttribute::Size::Size_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32:
-            return VK_FORMAT_R32_UINT;
+                return VK_FORMAT_R32G32_UINT;
-        case Maxwell::VertexAttribute::Size::Size_32_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32_32:
-            return VK_FORMAT_R32G32_UINT;
+                return VK_FORMAT_R32G32B32_UINT;
-        case Maxwell::VertexAttribute::Size::Size_32_32_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32_32_32:
-            return VK_FORMAT_R32G32B32_UINT;
+                return VK_FORMAT_R32G32B32A32_UINT;
-        case Maxwell::VertexAttribute::Size::Size_32_32_32_32:
+            case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
-            return VK_FORMAT_R32G32B32A32_UINT;
+                return VK_FORMAT_A2B10G10R10_UINT_PACK32;
-        case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
+            default:
-            return VK_FORMAT_A2B10G10R10_UINT_PACK32;
+                break;
-        default:
+            }
            break;
-        }
+        case Maxwell::VertexAttribute::Type::SignedInt:
-        break;
+            switch (size) {
-    case Maxwell::VertexAttribute::Type::SignedInt:
+            case Maxwell::VertexAttribute::Size::Size_8:
-        switch (size) {
+                return VK_FORMAT_R8_SINT;
-        case Maxwell::VertexAttribute::Size::Size_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8:
-            return VK_FORMAT_R8_SINT;
+                return VK_FORMAT_R8G8_SINT;
-        case Maxwell::VertexAttribute::Size::Size_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8:
-            return VK_FORMAT_R8G8_SINT;
+                return VK_FORMAT_R8G8B8_SINT;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
-            return VK_FORMAT_R8G8B8_SINT;
+                return VK_FORMAT_R8G8B8A8_SINT;
-        case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
+            case Maxwell::VertexAttribute::Size::Size_16:
-            return VK_FORMAT_R8G8B8A8_SINT;
+                return VK_FORMAT_R16_SINT;
-        case Maxwell::VertexAttribute::Size::Size_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16:
-            return VK_FORMAT_R16_SINT;
+                return VK_FORMAT_R16G16_SINT;
-        case Maxwell::VertexAttribute::Size::Size_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16:
-            return VK_FORMAT_R16G16_SINT;
+                return VK_FORMAT_R16G16B16_SINT;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
-            return VK_FORMAT_R16G16B16_SINT;
+                return VK_FORMAT_R16G16B16A16_SINT;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_32:
-            return VK_FORMAT_R16G16B16A16_SINT;
+                return VK_FORMAT_R32_SINT;
-        case Maxwell::VertexAttribute::Size::Size_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32:
-            return VK_FORMAT_R32_SINT;
+                return VK_FORMAT_R32G32_SINT;
-        case Maxwell::VertexAttribute::Size::Size_32_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32_32:
-            return VK_FORMAT_R32G32_SINT;
+                return VK_FORMAT_R32G32B32_SINT;
-        case Maxwell::VertexAttribute::Size::Size_32_32_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32_32_32:
-            return VK_FORMAT_R32G32B32_SINT;
+                return VK_FORMAT_R32G32B32A32_SINT;
-        case Maxwell::VertexAttribute::Size::Size_32_32_32_32:
+            case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
-            return VK_FORMAT_R32G32B32A32_SINT;
+                return VK_FORMAT_A2B10G10R10_SINT_PACK32;
-        case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
+            default:
-            return VK_FORMAT_A2B10G10R10_SINT_PACK32;
+                break;
-        default:
+            }
            break;
-        }
+        case Maxwell::VertexAttribute::Type::Float:
-        break;
+            switch (size) {
-    case Maxwell::VertexAttribute::Type::Float:
+            case Maxwell::VertexAttribute::Size::Size_16:
-        switch (size) {
+                return VK_FORMAT_R16_SFLOAT;
-        case Maxwell::VertexAttribute::Size::Size_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16:
-            return VK_FORMAT_R16_SFLOAT;
+                return VK_FORMAT_R16G16_SFLOAT;
-        case Maxwell::VertexAttribute::Size::Size_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16:
-            return VK_FORMAT_R16G16_SFLOAT;
+                return VK_FORMAT_R16G16B16_SFLOAT;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
-            return VK_FORMAT_R16G16B16_SFLOAT;
+                return VK_FORMAT_R16G16B16A16_SFLOAT;
-        case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
+            case Maxwell::VertexAttribute::Size::Size_32:
-            return VK_FORMAT_R16G16B16A16_SFLOAT;
+                return VK_FORMAT_R32_SFLOAT;
-        case Maxwell::VertexAttribute::Size::Size_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32:
-            return VK_FORMAT_R32_SFLOAT;
+                return VK_FORMAT_R32G32_SFLOAT;
-        case Maxwell::VertexAttribute::Size::Size_32_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32_32:
-            return VK_FORMAT_R32G32_SFLOAT;
+                return VK_FORMAT_R32G32B32_SFLOAT;
-        case Maxwell::VertexAttribute::Size::Size_32_32_32:
+            case Maxwell::VertexAttribute::Size::Size_32_32_32_32:
-            return VK_FORMAT_R32G32B32_SFLOAT;
+                return VK_FORMAT_R32G32B32A32_SFLOAT;
-        case Maxwell::VertexAttribute::Size::Size_32_32_32_32:
+            case Maxwell::VertexAttribute::Size::Size_11_11_10:
-            return VK_FORMAT_R32G32B32A32_SFLOAT;
+                return VK_FORMAT_B10G11R11_UFLOAT_PACK32;
-        case Maxwell::VertexAttribute::Size::Size_11_11_10:
+            default:
-            return VK_FORMAT_B10G11R11_UFLOAT_PACK32;
+                break;
-        default:
+            }
            break;
        }
-        break;
+        return VK_FORMAT_UNDEFINED;
+    })()};
+    if (format == VK_FORMAT_UNDEFINED) {
+        UNIMPLEMENTED_MSG("Unimplemented vertex format of type={} and size={}", type, size);
    }
-    UNIMPLEMENTED_MSG("Unimplemented vertex format of type={} and size={}", type, size);
-    return {};
+    return device.GetSupportedFormat(format, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT,
+                                     FormatType::Buffer);
 }
 VkCompareOp ComparisonOp(Maxwell::ComparisonOp comparison) {
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.h b/src/video_core/renderer_vulkan/maxwell_to_vk.h
index 9edd6af6a..356d46292 100644
--- a/src/video_core/renderer_vulkan/maxwell_to_vk.h
+++ b/src/video_core/renderer_vulkan/maxwell_to_vk.h
@@ -48,7 +48,8 @@ VkShaderStageFlagBits ShaderStage(Shader::Stage stage);
 VkPrimitiveTopology PrimitiveTopology(const Device& device, Maxwell::PrimitiveTopology topology);
-VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttribute::Size size);
+VkFormat VertexFormat(const Device& device, Maxwell::VertexAttribute::Type type,
+                      Maxwell::VertexAttribute::Size size);
 VkCompareOp ComparisonOp(Maxwell::ComparisonOp comparison);
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index 682f05335..5aca8f038 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -559,7 +559,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
            vertex_attributes.push_back({
                .location = static_cast<u32>(index),
                .binding = attribute.buffer,
-                .format = MaxwellToVK::VertexFormat(attribute.Type(), attribute.Size()),
+                .format = MaxwellToVK::VertexFormat(device, attribute.Type(), attribute.Size()),
                .offset = attribute.offset,
            });
        }
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 09e035799..43cc94fab 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -452,7 +452,7 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading
    state.has_loaded = true;
    lock.unlock();
-    workers.WaitForRequests();
+    workers.WaitForRequests(stop_loading);
    if (state.statistics) {
        state.statistics->Report();
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
index 10f9fe7fe..16e46d3e5 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -939,7 +939,7 @@ void RasterizerVulkan::UpdateVertexInput(Tegra::Engines::Maxwell3D::Regs& regs)
                .pNext = nullptr,
                .location = static_cast<u32>(index),
                .binding = binding,
-                .format = MaxwellToVK::VertexFormat(attribute.type, attribute.size),
+                .format = MaxwellToVK::VertexFormat(device, attribute.type, attribute.size),
                .offset = attribute.offset,
            });
        }
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
index ba6d81420..16463a892 100644
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -1618,6 +1618,9 @@ ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParam
 ImageView::~ImageView() = default;
 VkImageView ImageView::DepthView() {
+    if (!image_handle) {
+        return VK_NULL_HANDLE;
+    }
    if (depth_view) {
        return *depth_view;
    }
@@ -1627,6 +1630,9 @@ VkImageView ImageView::DepthView() {
 }
 VkImageView ImageView::StencilView() {
+    if (!image_handle) {
+        return VK_NULL_HANDLE;
+    }
    if (stencil_view) {
        return *stencil_view;
    }
@@ -1636,6 +1642,9 @@ VkImageView ImageView::StencilView() {
 }
 VkImageView ImageView::ColorView() {
+    if (!image_handle) {
+        return VK_NULL_HANDLE;
+    }
    if (color_view) {
        return *color_view;
    }
@@ -1645,6 +1654,9 @@ VkImageView ImageView::ColorView() {
 VkImageView ImageView::StorageView(Shader::TextureType texture_type,
                                   Shader::ImageFormat image_format) {
+    if (!image_handle) {
+        return VK_NULL_HANDLE;
+    }
    if (image_format == Shader::ImageFormat::Typeless) {
        return Handle(texture_type);
    }
diff --git a/src/video_core/surface.cpp b/src/video_core/surface.cpp
index eecd0deff..079d5f028 100644
--- a/src/video_core/surface.cpp
+++ b/src/video_core/surface.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "common/common_types.h"
 #include "common/math_util.h"
diff --git a/src/video_core/surface.h b/src/video_core/surface.h
index 0175432ff..16273f185 100644
--- a/src/video_core/surface.h
+++ b/src/video_core/surface.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 2f2594585..04ac4af11 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <memory>
diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h
index 084df641f..f8e2444f3 100644
--- a/src/video_core/video_core.h
+++ b/src/video_core/video_core.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 743ac09f6..ddecfca13 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -50,6 +50,21 @@ constexpr std::array R4G4_UNORM_PACK8{
    VK_FORMAT_UNDEFINED,
 };
+constexpr std::array R16G16B16_SFLOAT{
+    VK_FORMAT_R16G16B16A16_SFLOAT,
+    VK_FORMAT_UNDEFINED,
+};
+constexpr std::array R16G16B16_SSCALED{
+    VK_FORMAT_R16G16B16A16_SSCALED,
+    VK_FORMAT_UNDEFINED,
+};
+constexpr std::array R8G8B8_SSCALED{
+    VK_FORMAT_R8G8B8A8_SSCALED,
+    VK_FORMAT_UNDEFINED,
+};
 } // namespace Alternatives
 enum class NvidiaArchitecture {
@@ -102,6 +117,12 @@ constexpr const VkFormat* GetFormatAlternatives(VkFormat format) {
        return Alternatives::B5G6R5_UNORM_PACK16.data();
    case VK_FORMAT_R4G4_UNORM_PACK8:
        return Alternatives::R4G4_UNORM_PACK8.data();
+    case VK_FORMAT_R16G16B16_SFLOAT:
+        return Alternatives::R16G16B16_SFLOAT.data();
+    case VK_FORMAT_R16G16B16_SSCALED:
+        return Alternatives::R16G16B16_SSCALED.data();
+    case VK_FORMAT_R8G8B8_SSCALED:
+        return Alternatives::R8G8B8_SSCALED.data();
    default:
        return nullptr;
    }
@@ -122,109 +143,142 @@ VkFormatFeatureFlags GetFormatFeatures(VkFormatProperties properties, FormatType
 std::unordered_map<VkFormat, VkFormatProperties> GetFormatProperties(vk::PhysicalDevice physical) {
    static constexpr std::array formats{
-        VK_FORMAT_A8B8G8R8_UNORM_PACK32,
+        VK_FORMAT_A1R5G5B5_UNORM_PACK16,
-        VK_FORMAT_A8B8G8R8_UINT_PACK32,
+        VK_FORMAT_A2B10G10R10_SINT_PACK32,
-        VK_FORMAT_A8B8G8R8_SNORM_PACK32,
+        VK_FORMAT_A2B10G10R10_SNORM_PACK32,
+        VK_FORMAT_A2B10G10R10_SSCALED_PACK32,
+        VK_FORMAT_A2B10G10R10_UINT_PACK32,
+        VK_FORMAT_A2B10G10R10_UNORM_PACK32,
+        VK_FORMAT_A2B10G10R10_USCALED_PACK32,
        VK_FORMAT_A8B8G8R8_SINT_PACK32,
+        VK_FORMAT_A8B8G8R8_SNORM_PACK32,
        VK_FORMAT_A8B8G8R8_SRGB_PACK32,
-        VK_FORMAT_R5G6B5_UNORM_PACK16,
+        VK_FORMAT_A8B8G8R8_UINT_PACK32,
-        VK_FORMAT_B5G6R5_UNORM_PACK16,
+        VK_FORMAT_A8B8G8R8_UNORM_PACK32,
-        VK_FORMAT_R5G5B5A1_UNORM_PACK16,
+        VK_FORMAT_ASTC_10x10_SRGB_BLOCK,
+        VK_FORMAT_ASTC_10x10_UNORM_BLOCK,
+        VK_FORMAT_ASTC_10x5_SRGB_BLOCK,
+        VK_FORMAT_ASTC_10x5_UNORM_BLOCK,
+        VK_FORMAT_ASTC_10x6_SRGB_BLOCK,
+        VK_FORMAT_ASTC_10x6_UNORM_BLOCK,
+        VK_FORMAT_ASTC_10x8_SRGB_BLOCK,
+        VK_FORMAT_ASTC_10x8_UNORM_BLOCK,
+        VK_FORMAT_ASTC_12x10_SRGB_BLOCK,
+        VK_FORMAT_ASTC_12x10_UNORM_BLOCK,
+        VK_FORMAT_ASTC_12x12_SRGB_BLOCK,
+        VK_FORMAT_ASTC_12x12_UNORM_BLOCK,
+        VK_FORMAT_ASTC_4x4_SRGB_BLOCK,
+        VK_FORMAT_ASTC_4x4_UNORM_BLOCK,
+        VK_FORMAT_ASTC_5x4_SRGB_BLOCK,
+        VK_FORMAT_ASTC_5x4_UNORM_BLOCK,
+        VK_FORMAT_ASTC_5x5_SRGB_BLOCK,
+        VK_FORMAT_ASTC_5x5_UNORM_BLOCK,
+        VK_FORMAT_ASTC_6x5_SRGB_BLOCK,
+        VK_FORMAT_ASTC_6x5_UNORM_BLOCK,
+        VK_FORMAT_ASTC_6x6_SRGB_BLOCK,
+        VK_FORMAT_ASTC_6x6_UNORM_BLOCK,
+        VK_FORMAT_ASTC_8x5_SRGB_BLOCK,
+        VK_FORMAT_ASTC_8x5_UNORM_BLOCK,
+        VK_FORMAT_ASTC_8x6_SRGB_BLOCK,
+        VK_FORMAT_ASTC_8x6_UNORM_BLOCK,
+        VK_FORMAT_ASTC_8x8_SRGB_BLOCK,
+        VK_FORMAT_ASTC_8x8_UNORM_BLOCK,
+        VK_FORMAT_B10G11R11_UFLOAT_PACK32,
+        VK_FORMAT_B4G4R4A4_UNORM_PACK16,
        VK_FORMAT_B5G5R5A1_UNORM_PACK16,
-        VK_FORMAT_A2B10G10R10_UNORM_PACK32,
+        VK_FORMAT_B5G6R5_UNORM_PACK16,
-        VK_FORMAT_A2B10G10R10_UINT_PACK32,
+        VK_FORMAT_B8G8R8A8_SRGB,
-        VK_FORMAT_A1R5G5B5_UNORM_PACK16,
+        VK_FORMAT_B8G8R8A8_UNORM,
-        VK_FORMAT_R32G32B32A32_SFLOAT,
+        VK_FORMAT_BC1_RGBA_SRGB_BLOCK,
-        VK_FORMAT_R32G32B32A32_SINT,
+        VK_FORMAT_BC1_RGBA_UNORM_BLOCK,
-        VK_FORMAT_R32G32B32A32_UINT,
+        VK_FORMAT_BC2_SRGB_BLOCK,
-        VK_FORMAT_R32G32_SFLOAT,
+        VK_FORMAT_BC2_UNORM_BLOCK,
-        VK_FORMAT_R32G32_SINT,
+        VK_FORMAT_BC3_SRGB_BLOCK,
-        VK_FORMAT_R32G32_UINT,
+        VK_FORMAT_BC3_UNORM_BLOCK,
+        VK_FORMAT_BC4_SNORM_BLOCK,
+        VK_FORMAT_BC4_UNORM_BLOCK,
+        VK_FORMAT_BC5_SNORM_BLOCK,
+        VK_FORMAT_BC5_UNORM_BLOCK,
+        VK_FORMAT_BC6H_SFLOAT_BLOCK,
+        VK_FORMAT_BC6H_UFLOAT_BLOCK,
+        VK_FORMAT_BC7_SRGB_BLOCK,
+        VK_FORMAT_BC7_UNORM_BLOCK,
+        VK_FORMAT_D16_UNORM,
+        VK_FORMAT_D16_UNORM_S8_UINT,
+        VK_FORMAT_D24_UNORM_S8_UINT,
+        VK_FORMAT_D32_SFLOAT,
+        VK_FORMAT_D32_SFLOAT_S8_UINT,
+        VK_FORMAT_E5B9G9R9_UFLOAT_PACK32,
+        VK_FORMAT_R16G16B16A16_SFLOAT,
        VK_FORMAT_R16G16B16A16_SINT,
-        VK_FORMAT_R16G16B16A16_UINT,
        VK_FORMAT_R16G16B16A16_SNORM,
+        VK_FORMAT_R16G16B16A16_SSCALED,
+        VK_FORMAT_R16G16B16A16_UINT,
        VK_FORMAT_R16G16B16A16_UNORM,
-        VK_FORMAT_R16G16_UNORM,
+        VK_FORMAT_R16G16B16A16_USCALED,
-        VK_FORMAT_R16G16_SNORM,
+        VK_FORMAT_R16G16B16_SFLOAT,
+        VK_FORMAT_R16G16B16_SINT,
+        VK_FORMAT_R16G16B16_SNORM,
+        VK_FORMAT_R16G16B16_SSCALED,
+        VK_FORMAT_R16G16B16_UINT,
+        VK_FORMAT_R16G16B16_UNORM,
+        VK_FORMAT_R16G16B16_USCALED,
        VK_FORMAT_R16G16_SFLOAT,
-        VK_FORMAT_R16G16_UINT,
        VK_FORMAT_R16G16_SINT,
-        VK_FORMAT_R16_UNORM,
+        VK_FORMAT_R16G16_SNORM,
+        VK_FORMAT_R16G16_SSCALED,
+        VK_FORMAT_R16G16_UINT,
+        VK_FORMAT_R16G16_UNORM,
+        VK_FORMAT_R16G16_USCALED,
+        VK_FORMAT_R16_SFLOAT,
+        VK_FORMAT_R16_SINT,
        VK_FORMAT_R16_SNORM,
+        VK_FORMAT_R16_SSCALED,
        VK_FORMAT_R16_UINT,
+        VK_FORMAT_R16_UNORM,
+        VK_FORMAT_R16_USCALED,
+        VK_FORMAT_R32G32B32A32_SFLOAT,
+        VK_FORMAT_R32G32B32A32_SINT,
+        VK_FORMAT_R32G32B32A32_UINT,
+        VK_FORMAT_R32G32B32_SFLOAT,
+        VK_FORMAT_R32G32B32_SINT,
+        VK_FORMAT_R32G32B32_UINT,
+        VK_FORMAT_R32G32_SFLOAT,
+        VK_FORMAT_R32G32_SINT,
+        VK_FORMAT_R32G32_UINT,
+        VK_FORMAT_R32_SFLOAT,
+        VK_FORMAT_R32_SINT,
+        VK_FORMAT_R32_UINT,
+        VK_FORMAT_R4G4B4A4_UNORM_PACK16,
+        VK_FORMAT_R4G4_UNORM_PACK8,
+        VK_FORMAT_R5G5B5A1_UNORM_PACK16,
+        VK_FORMAT_R5G6B5_UNORM_PACK16,
+        VK_FORMAT_R8G8B8A8_SINT,
+        VK_FORMAT_R8G8B8A8_SNORM,
        VK_FORMAT_R8G8B8A8_SRGB,
-        VK_FORMAT_R8G8_UNORM,
+        VK_FORMAT_R8G8B8A8_SSCALED,
-        VK_FORMAT_R8G8_SNORM,
+        VK_FORMAT_R8G8B8A8_UINT,
+        VK_FORMAT_R8G8B8A8_UNORM,
+        VK_FORMAT_R8G8B8A8_USCALED,
+        VK_FORMAT_R8G8B8_SINT,
+        VK_FORMAT_R8G8B8_SNORM,
+        VK_FORMAT_R8G8B8_SSCALED,
+        VK_FORMAT_R8G8B8_UINT,
+        VK_FORMAT_R8G8B8_UNORM,
+        VK_FORMAT_R8G8B8_USCALED,
        VK_FORMAT_R8G8_SINT,
+        VK_FORMAT_R8G8_SNORM,
+        VK_FORMAT_R8G8_SSCALED,
        VK_FORMAT_R8G8_UINT,
-        VK_FORMAT_R8_UNORM,
+        VK_FORMAT_R8G8_UNORM,
-        VK_FORMAT_R8_SNORM,
+        VK_FORMAT_R8G8_USCALED,
        VK_FORMAT_R8_SINT,
+        VK_FORMAT_R8_SNORM,
+        VK_FORMAT_R8_SSCALED,
        VK_FORMAT_R8_UINT,
-        VK_FORMAT_B10G11R11_UFLOAT_PACK32,
+        VK_FORMAT_R8_UNORM,
-        VK_FORMAT_R32_SFLOAT,
+        VK_FORMAT_R8_USCALED,
-        VK_FORMAT_R32_UINT,
-        VK_FORMAT_R32_SINT,
-        VK_FORMAT_R16_SFLOAT,
-        VK_FORMAT_R16G16B16A16_SFLOAT,
-        VK_FORMAT_B8G8R8A8_UNORM,
-        VK_FORMAT_B8G8R8A8_SRGB,
-        VK_FORMAT_R4G4_UNORM_PACK8,
-        VK_FORMAT_R4G4B4A4_UNORM_PACK16,
-        VK_FORMAT_B4G4R4A4_UNORM_PACK16,
-        VK_FORMAT_D32_SFLOAT,
-        VK_FORMAT_D16_UNORM,
        VK_FORMAT_S8_UINT,
-        VK_FORMAT_D16_UNORM_S8_UINT,
-        VK_FORMAT_D24_UNORM_S8_UINT,
-        VK_FORMAT_D32_SFLOAT_S8_UINT,
-        VK_FORMAT_BC1_RGBA_UNORM_BLOCK,
-        VK_FORMAT_BC2_UNORM_BLOCK,
-        VK_FORMAT_BC3_UNORM_BLOCK,
-        VK_FORMAT_BC4_UNORM_BLOCK,
-        VK_FORMAT_BC4_SNORM_BLOCK,
-        VK_FORMAT_BC5_UNORM_BLOCK,
-        VK_FORMAT_BC5_SNORM_BLOCK,
-        VK_FORMAT_BC7_UNORM_BLOCK,
-        VK_FORMAT_BC6H_UFLOAT_BLOCK,
-        VK_FORMAT_BC6H_SFLOAT_BLOCK,
-        VK_FORMAT_BC1_RGBA_SRGB_BLOCK,
-        VK_FORMAT_BC2_SRGB_BLOCK,
-        VK_FORMAT_BC3_SRGB_BLOCK,
-        VK_FORMAT_BC7_SRGB_BLOCK,
-        VK_FORMAT_ASTC_4x4_UNORM_BLOCK,
-        VK_FORMAT_ASTC_4x4_SRGB_BLOCK,
-        VK_FORMAT_ASTC_5x4_UNORM_BLOCK,
-        VK_FORMAT_ASTC_5x4_SRGB_BLOCK,
-        VK_FORMAT_ASTC_5x5_UNORM_BLOCK,
-        VK_FORMAT_ASTC_5x5_SRGB_BLOCK,
-        VK_FORMAT_ASTC_6x5_UNORM_BLOCK,
-        VK_FORMAT_ASTC_6x5_SRGB_BLOCK,
-        VK_FORMAT_ASTC_6x6_UNORM_BLOCK,
-        VK_FORMAT_ASTC_6x6_SRGB_BLOCK,
-        VK_FORMAT_ASTC_8x5_UNORM_BLOCK,
-        VK_FORMAT_ASTC_8x5_SRGB_BLOCK,
-        VK_FORMAT_ASTC_8x6_UNORM_BLOCK,
-        VK_FORMAT_ASTC_8x6_SRGB_BLOCK,
-        VK_FORMAT_ASTC_8x8_UNORM_BLOCK,
-        VK_FORMAT_ASTC_8x8_SRGB_BLOCK,
-        VK_FORMAT_ASTC_10x5_UNORM_BLOCK,
-        VK_FORMAT_ASTC_10x5_SRGB_BLOCK,
-        VK_FORMAT_ASTC_10x6_UNORM_BLOCK,
-        VK_FORMAT_ASTC_10x6_SRGB_BLOCK,
-        VK_FORMAT_ASTC_10x8_UNORM_BLOCK,
-        VK_FORMAT_ASTC_10x8_SRGB_BLOCK,
-        VK_FORMAT_ASTC_10x10_UNORM_BLOCK,
-        VK_FORMAT_ASTC_10x10_SRGB_BLOCK,
-        VK_FORMAT_ASTC_12x10_UNORM_BLOCK,
-        VK_FORMAT_ASTC_12x10_SRGB_BLOCK,
-        VK_FORMAT_ASTC_12x12_UNORM_BLOCK,
-        VK_FORMAT_ASTC_12x12_SRGB_BLOCK,
-        VK_FORMAT_ASTC_8x6_UNORM_BLOCK,
-        VK_FORMAT_ASTC_8x6_SRGB_BLOCK,
-        VK_FORMAT_ASTC_6x5_UNORM_BLOCK,
-        VK_FORMAT_ASTC_6x5_SRGB_BLOCK,
-        VK_FORMAT_E5B9G9R9_UFLOAT_PACK32,
    };
    std::unordered_map<VkFormat, VkFormatProperties> format_properties;
    for (const auto format : formats) {
@@ -739,9 +793,9 @@ VkFormat Device::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFlags
        if (!IsFormatSupported(alternative, wanted_usage, format_type)) {
            continue;
        }
-        LOG_WARNING(Render_Vulkan,
+        LOG_DEBUG(Render_Vulkan,
-                    "Emulating format={} with alternative format={} with usage={} and type={}",
+                  "Emulating format={} with alternative format={} with usage={} and type={}",
-                    wanted_format, alternative, wanted_usage, format_type);
+                  wanted_format, alternative, wanted_usage, format_type);
        return alternative;
    }
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt
index 753fb6e7a..3f75d97d1 100644
--- a/src/web_service/CMakeLists.txt
+++ b/src/web_service/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 add_library(web_service STATIC
    announce_room_json.cpp
    announce_room_json.h
diff --git a/src/web_service/telemetry_json.cpp b/src/web_service/telemetry_json.cpp
index 46faddb61..51c792004 100644
--- a/src/web_service/telemetry_json.cpp
+++ b/src/web_service/telemetry_json.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <nlohmann/json.hpp>
 #include "common/detached_tasks.h"
diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h
index df51e00f8..504002c04 100644
--- a/src/web_service/telemetry_json.h
+++ b/src/web_service/telemetry_json.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/web_service/verify_login.cpp b/src/web_service/verify_login.cpp
index ceb55ca6b..050080278 100644
--- a/src/web_service/verify_login.cpp
+++ b/src/web_service/verify_login.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <nlohmann/json.hpp>
 #include "web_service/verify_login.h"
diff --git a/src/web_service/verify_login.h b/src/web_service/verify_login.h
index 821b345d7..8d0adce74 100644
--- a/src/web_service/verify_login.h
+++ b/src/web_service/verify_login.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp
index dce9772fe..378804c08 100644
--- a/src/web_service/web_backend.cpp
+++ b/src/web_service/web_backend.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <mutex>
diff --git a/src/web_service/web_backend.h b/src/web_service/web_backend.h
index 81f58583c..11b5f558c 100644
--- a/src/web_service/web_backend.h
+++ b/src/web_service/web_backend.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 66873143e..f6b389ede 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
diff --git a/src/yuzu/Info.plist b/src/yuzu/Info.plist
index 5f1c95d54..0eb377926 100644
--- a/src/yuzu/Info.plist
+++ b/src/yuzu/Info.plist
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+SPDX-FileCopyrightText: 2015 Pierre de La Morinerie <kemenaran@gmail.com>
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui
index 1dd7b74bf..c4ffb293e 100644
--- a/src/yuzu/aboutdialog.ui
+++ b/src/yuzu/aboutdialog.ui
@@ -127,7 +127,7 @@ p, li { white-space: pre-wrap; }
       <item>
        <widget class="QLabel" name="labelLinks">
         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://yuzu-emu.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Website&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/yuzu-emu&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Source Code&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/yuzu-emu/yuzu/graphs/contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Contributors&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/yuzu-emu/yuzu/blob/master/license.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;License&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://yuzu-emu.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Website&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/yuzu-emu&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Source Code&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/yuzu-emu/yuzu/graphs/contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Contributors&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;License&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="openExternalLinks">
          <bool>true</bool>
diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp
index 826c6c224..c8bcfb223 100644
--- a/src/yuzu/applets/qt_profile_select.cpp
+++ b/src/yuzu/applets/qt_profile_select.cpp
@@ -100,6 +100,7 @@ QtProfileSelectionDialog::QtProfileSelectionDialog(Core::HID::HIDCore& hid_core,
                }
                QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, key, Qt::NoModifier);
                QCoreApplication::postEvent(tree_view, event);
+                SelectUser(tree_view->currentIndex());
            });
    const auto& profiles = profile_manager->GetAllUsers();
diff --git a/src/yuzu/applets/qt_software_keyboard.cpp b/src/yuzu/applets/qt_software_keyboard.cpp
index e8b217d90..e60506197 100644
--- a/src/yuzu/applets/qt_software_keyboard.cpp
+++ b/src/yuzu/applets/qt_software_keyboard.cpp
@@ -213,9 +213,9 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
            ui->button_ok_num,
        },
        {
-            nullptr,
+            ui->button_left_optional_num,
            ui->button_0_num,
-            nullptr,
+            ui->button_right_optional_num,
            ui->button_ok_num,
        },
    }};
@@ -330,7 +330,9 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
        ui->button_7_num,
        ui->button_8_num,
        ui->button_9_num,
+        ui->button_left_optional_num,
        ui->button_0_num,
+        ui->button_right_optional_num,
    };
    SetupMouseHover();
@@ -342,6 +344,9 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
    ui->label_header->setText(QString::fromStdU16String(initialize_parameters.header_text));
    ui->label_sub->setText(QString::fromStdU16String(initialize_parameters.sub_text));
+    ui->button_left_optional_num->setText(QChar{initialize_parameters.left_optional_symbol_key});
+    ui->button_right_optional_num->setText(QChar{initialize_parameters.right_optional_symbol_key});
    current_text = initialize_parameters.initial_text;
    cursor_position = initialize_parameters.initial_cursor_position;
@@ -932,6 +937,15 @@ void QtSoftwareKeyboardDialog::DisableKeyboardButtons() {
                button->setEnabled(true);
            }
        }
+        const auto enable_left_optional = initialize_parameters.left_optional_symbol_key != '\0';
+        const auto enable_right_optional = initialize_parameters.right_optional_symbol_key != '\0';
+        ui->button_left_optional_num->setEnabled(enable_left_optional);
+        ui->button_left_optional_num->setVisible(enable_left_optional);
+        ui->button_right_optional_num->setEnabled(enable_right_optional);
+        ui->button_right_optional_num->setVisible(enable_right_optional);
        break;
    }
    }
@@ -1019,7 +1033,10 @@ bool QtSoftwareKeyboardDialog::ValidateInputText(const QString& input_text) {
    }
    if (bottom_osk_index == BottomOSKIndex::NumberPad &&
-        std::any_of(input_text.begin(), input_text.end(), [](QChar c) { return !c.isDigit(); })) {
+        std::any_of(input_text.begin(), input_text.end(), [this](QChar c) {
+            return !c.isDigit() && c != QChar{initialize_parameters.left_optional_symbol_key} &&
+                   c != QChar{initialize_parameters.right_optional_symbol_key};
+        })) {
        return false;
    }
@@ -1384,6 +1401,10 @@ void QtSoftwareKeyboardDialog::MoveButtonDirection(Direction direction) {
        }
    };
+    // Store the initial row and column.
+    const auto initial_row = row;
+    const auto initial_column = column;
    switch (bottom_osk_index) {
    case BottomOSKIndex::LowerCase:
    case BottomOSKIndex::UpperCase: {
@@ -1394,6 +1415,11 @@ void QtSoftwareKeyboardDialog::MoveButtonDirection(Direction direction) {
        auto* curr_button = keyboard_buttons[index][row][column];
        while (!curr_button || !curr_button->isEnabled() || curr_button == prev_button) {
+            // If we returned back to where we started from, break the loop.
+            if (row == initial_row && column == initial_column) {
+                break;
+            }
            move_direction(NUM_ROWS_NORMAL, NUM_COLUMNS_NORMAL);
            curr_button = keyboard_buttons[index][row][column];
        }
@@ -1408,6 +1434,11 @@ void QtSoftwareKeyboardDialog::MoveButtonDirection(Direction direction) {
        auto* curr_button = numberpad_buttons[row][column];
        while (!curr_button || !curr_button->isEnabled() || curr_button == prev_button) {
+            // If we returned back to where we started from, break the loop.
+            if (row == initial_row && column == initial_column) {
+                break;
+            }
            move_direction(NUM_ROWS_NUMPAD, NUM_COLUMNS_NUMPAD);
            curr_button = numberpad_buttons[row][column];
        }
diff --git a/src/yuzu/applets/qt_software_keyboard.h b/src/yuzu/applets/qt_software_keyboard.h
index 1c489fbb6..35d4ee2ef 100644
--- a/src/yuzu/applets/qt_software_keyboard.h
+++ b/src/yuzu/applets/qt_software_keyboard.h
@@ -211,7 +211,7 @@ private:
    std::array<std::array<QPushButton*, NUM_COLUMNS_NUMPAD>, NUM_ROWS_NUMPAD> numberpad_buttons;
    // Contains a set of all buttons used in keyboard_buttons and numberpad_buttons.
-    std::array<QPushButton*, 110> all_buttons;
+    std::array<QPushButton*, 112> all_buttons;
    std::size_t row{0};
    std::size_t column{0};
diff --git a/src/yuzu/applets/qt_software_keyboard.ui b/src/yuzu/applets/qt_software_keyboard.ui
index b0a1fcde9..9661cb260 100644
--- a/src/yuzu/applets/qt_software_keyboard.ui
+++ b/src/yuzu/applets/qt_software_keyboard.ui
@@ -3298,6 +3298,24 @@ p, li { white-space: pre-wrap; }
              </property>
             </widget>
            </item>
+            <item row="4" column="2">
+             <widget class="QPushButton" name="button_left_optional_num">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>1</horstretch>
+                <verstretch>1</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="font">
+               <font>
+                <pointsize>28</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string notr="true"></string>
+              </property>
+             </widget>
+            </item>
            <item row="4" column="3">
             <widget class="QPushButton" name="button_0_num">
              <property name="sizePolicy">
@@ -3316,6 +3334,24 @@ p, li { white-space: pre-wrap; }
              </property>
             </widget>
            </item>
+            <item row="4" column="4">
+             <widget class="QPushButton" name="button_right_optional_num">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>1</horstretch>
+                <verstretch>1</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="font">
+               <font>
+                <pointsize>28</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string notr="true"></string>
+              </property>
+             </widget>
+            </item>
            <item row="1" column="4">
             <widget class="QPushButton" name="button_3_num">
              <property name="sizePolicy">
@@ -3494,7 +3530,9 @@ p, li { white-space: pre-wrap; }
  <tabstop>button_7_num</tabstop>
  <tabstop>button_8_num</tabstop>
  <tabstop>button_9_num</tabstop>
+  <tabstop>button_left_optional_num</tabstop>
  <tabstop>button_0_num</tabstop>
+  <tabstop>button_right_optional_num</tabstop>
 </tabstops>
 <resources>
  <include location="../../../dist/icons/overlay/overlay.qrc"/>
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 0ee3820a2..ef3bdfb1a 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <glad/glad.h>
@@ -805,6 +804,7 @@ void GRenderWindow::TouchEndEvent() {
 }
 void GRenderWindow::InitializeCamera() {
+    constexpr auto camera_update_ms = std::chrono::milliseconds{50}; // (50ms, 20Hz)
    if (!Settings::values.enable_ir_sensor) {
        return;
    }
@@ -838,7 +838,7 @@ void GRenderWindow::InitializeCamera() {
    camera_timer = std::make_unique<QTimer>();
    connect(camera_timer.get(), &QTimer::timeout, [this] { RequestCameraCapture(); });
    // This timer should be dependent of camera resolution 5ms for every 100 pixels
-    camera_timer->start(100);
+    camera_timer->start(camera_update_ms);
 }
 void GRenderWindow::FinalizeCamera() {
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index b4781e697..c45ebf1a2 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/bootmanager.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/compatdb.cpp b/src/yuzu/compatdb.cpp
index 2442bb3c3..f46fff340 100644
--- a/src/yuzu/compatdb.cpp
+++ b/src/yuzu/compatdb.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QButtonGroup>
 #include <QMessageBox>
diff --git a/src/yuzu/compatdb.h b/src/yuzu/compatdb.h
index e2b2522bd..3252fc47a 100644
--- a/src/yuzu/compatdb.h
+++ b/src/yuzu/compatdb.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 3b22102a8..58f1239bf 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <QKeySequence>
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index 937b2d95b..486ceea94 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index dd4959417..97fb664bf 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QCheckBox>
 #include <QObject>
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index 56800b6ff..e597dcdb5 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp
index 84808f678..e16d127a8 100644
--- a/src/yuzu/configuration/configure_debug.cpp
+++ b/src/yuzu/configuration/configure_debug.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QDesktopServices>
 #include <QUrl>
diff --git a/src/yuzu/configuration/configure_debug.h b/src/yuzu/configuration/configure_debug.h
index 73f71c9e3..64d68ab8f 100644
--- a/src/yuzu/configuration/configure_debug.h
+++ b/src/yuzu/configuration/configure_debug.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index 92ef4467b..4301313cf 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <memory>
 #include "common/logging/log.h"
diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h
index cec1610ad..1f724834a 100644
--- a/src/yuzu/configuration/configure_dialog.h
+++ b/src/yuzu/configuration/configure_dialog.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 2a446205b..7ade01ba6 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <functional>
 #include <utility>
diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h
index b6f3bb5ed..a090c1a3f 100644
--- a/src/yuzu/configuration/configure_general.h
+++ b/src/yuzu/configuration/configure_general.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 6b33c4535..87e5d0f48 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 // Include this early to include Vulkan headers how we want to
 #include "video_core/vulkan_common/vulkan_wrapper.h"
diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h
index 1b101c940..70034eb1b 100644
--- a/src/yuzu/configuration/configure_graphics.h
+++ b/src/yuzu/configuration/configure_graphics.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_hotkeys.cpp b/src/yuzu/configuration/configure_hotkeys.cpp
index edf0893c4..daa77a8f8 100644
--- a/src/yuzu/configuration/configure_hotkeys.cpp
+++ b/src/yuzu/configuration/configure_hotkeys.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QMenu>
 #include <QMessageBox>
diff --git a/src/yuzu/configuration/configure_hotkeys.h b/src/yuzu/configuration/configure_hotkeys.h
index f943ec538..b45ecb185 100644
--- a/src/yuzu/configuration/configure_hotkeys.h
+++ b/src/yuzu/configuration/configure_hotkeys.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index f1b061b13..16fba3deb 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <memory>
 #include <thread>
diff --git a/src/yuzu/configuration/configure_input.h b/src/yuzu/configuration/configure_input.h
index 4cafa3dab..c89189c36 100644
--- a/src/yuzu/configuration/configure_input.h
+++ b/src/yuzu/configuration/configure_input.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index f3be9a374..00bee85b2 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <memory>
diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h
index 47df6b3d3..79434fdd8 100644
--- a/src/yuzu/configuration/configure_input_player.h
+++ b/src/yuzu/configuration/configure_input_player.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_motion_touch.cpp b/src/yuzu/configuration/configure_motion_touch.cpp
index c313b0919..d1b870c72 100644
--- a/src/yuzu/configuration/configure_motion_touch.cpp
+++ b/src/yuzu/configuration/configure_motion_touch.cpp
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <sstream>
diff --git a/src/yuzu/configuration/configure_motion_touch.h b/src/yuzu/configuration/configure_motion_touch.h
index 91d1ae671..7dcc9318e 100644
--- a/src/yuzu/configuration/configure_motion_touch.h
+++ b/src/yuzu/configuration/configure_motion_touch.h
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_per_game_addons.cpp b/src/yuzu/configuration/configure_per_game_addons.cpp
index 4906997ab..674a75a62 100644
--- a/src/yuzu/configuration/configure_per_game_addons.cpp
+++ b/src/yuzu/configuration/configure_per_game_addons.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <memory>
diff --git a/src/yuzu/configuration/configure_per_game_addons.h b/src/yuzu/configuration/configure_per_game_addons.h
index 14690fba8..53db405c1 100644
--- a/src/yuzu/configuration/configure_per_game_addons.h
+++ b/src/yuzu/configuration/configure_per_game_addons.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_profile_manager.cpp b/src/yuzu/configuration/configure_profile_manager.cpp
index 5442fe328..5c0217ba8 100644
--- a/src/yuzu/configuration/configure_profile_manager.cpp
+++ b/src/yuzu/configuration/configure_profile_manager.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <QFileDialog>
diff --git a/src/yuzu/configuration/configure_profile_manager.h b/src/yuzu/configuration/configure_profile_manager.h
index 575cb89d5..fe9033779 100644
--- a/src/yuzu/configuration/configure_profile_manager.h
+++ b/src/yuzu/configuration/configure_profile_manager.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index ecebb0fb7..bc9d9d77a 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <chrono>
 #include <optional>
diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h
index 5a1633192..8f02880a7 100644
--- a/src/yuzu/configuration/configure_system.h
+++ b/src/yuzu/configuration/configure_system.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_touch_from_button.cpp b/src/yuzu/configuration/configure_touch_from_button.cpp
index 06cc452c3..18e2eba69 100644
--- a/src/yuzu/configuration/configure_touch_from_button.cpp
+++ b/src/yuzu/configuration/configure_touch_from_button.cpp
@@ -1,6 +1,5 @@
-// Copyright 2020 Citra Emulator Project
+// SPDX-FileCopyrightText: 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QInputDialog>
 #include <QKeyEvent>
diff --git a/src/yuzu/configuration/configure_touch_from_button.h b/src/yuzu/configuration/configure_touch_from_button.h
index b8c55db66..5a1416d00 100644
--- a/src/yuzu/configuration/configure_touch_from_button.h
+++ b/src/yuzu/configuration/configure_touch_from_button.h
@@ -1,6 +1,5 @@
-// Copyright 2020 Citra Emulator Project
+// SPDX-FileCopyrightText: 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_touch_widget.h b/src/yuzu/configuration/configure_touch_widget.h
index 347b46583..49f533afe 100644
--- a/src/yuzu/configuration/configure_touch_widget.h
+++ b/src/yuzu/configuration/configure_touch_widget.h
@@ -1,6 +1,5 @@
-// Copyright 2020 Citra Emulator Project
+// SPDX-FileCopyrightText: 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_touchscreen_advanced.cpp b/src/yuzu/configuration/configure_touchscreen_advanced.cpp
index 29c86c7bc..5a03e48df 100644
--- a/src/yuzu/configuration/configure_touchscreen_advanced.cpp
+++ b/src/yuzu/configuration/configure_touchscreen_advanced.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <memory>
 #include "ui_configure_touchscreen_advanced.h"
diff --git a/src/yuzu/configuration/configure_touchscreen_advanced.h b/src/yuzu/configuration/configure_touchscreen_advanced.h
index 72061492c..034dc0d46 100644
--- a/src/yuzu/configuration/configure_touchscreen_advanced.h
+++ b/src/yuzu/configuration/configure_touchscreen_advanced.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp
index d3a60cdd1..2e98ede8e 100644
--- a/src/yuzu/configuration/configure_ui.cpp
+++ b/src/yuzu/configuration/configure_ui.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <utility>
diff --git a/src/yuzu/configuration/configure_ui.h b/src/yuzu/configuration/configure_ui.h
index 48b6e6d82..95af8370e 100644
--- a/src/yuzu/configuration/configure_ui.h
+++ b/src/yuzu/configuration/configure_ui.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/configuration/configure_web.cpp b/src/yuzu/configuration/configure_web.cpp
index ff4bf44f4..d668c992b 100644
--- a/src/yuzu/configuration/configure_web.cpp
+++ b/src/yuzu/configuration/configure_web.cpp
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QIcon>
 #include <QMessageBox>
diff --git a/src/yuzu/configuration/configure_web.h b/src/yuzu/configuration/configure_web.h
index 041b51149..03feb55f8 100644
--- a/src/yuzu/configuration/configure_web.h
+++ b/src/yuzu/configuration/configure_web.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/debugger/controller.cpp b/src/yuzu/debugger/controller.cpp
index 6b834c42e..e4bf16a04 100644
--- a/src/yuzu/debugger/controller.cpp
+++ b/src/yuzu/debugger/controller.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QAction>
 #include <QLayout>
diff --git a/src/yuzu/debugger/controller.h b/src/yuzu/debugger/controller.h
index 52cea3326..9651dfaa9 100644
--- a/src/yuzu/debugger/controller.h
+++ b/src/yuzu/debugger/controller.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/debugger/profiler.cpp b/src/yuzu/debugger/profiler.cpp
index 33110685a..d3e2d3c12 100644
--- a/src/yuzu/debugger/profiler.cpp
+++ b/src/yuzu/debugger/profiler.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QAction>
 #include <QLayout>
diff --git a/src/yuzu/debugger/profiler.h b/src/yuzu/debugger/profiler.h
index 8e69fdb06..4c8ccd3c2 100644
--- a/src/yuzu/debugger/profiler.h
+++ b/src/yuzu/debugger/profiler.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp
index 0ea31cd33..7f7c5fc42 100644
--- a/src/yuzu/debugger/wait_tree.cpp
+++ b/src/yuzu/debugger/wait_tree.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <fmt/format.h>
diff --git a/src/yuzu/debugger/wait_tree.h b/src/yuzu/debugger/wait_tree.h
index f21b9f467..7e528b592 100644
--- a/src/yuzu/debugger/wait_tree.h
+++ b/src/yuzu/debugger/wait_tree.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/discord.h b/src/yuzu/discord.h
index a867cc4d6..e08784498 100644
--- a/src/yuzu/discord.h
+++ b/src/yuzu/discord.h
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/discord_impl.cpp b/src/yuzu/discord_impl.cpp
index 66f928af6..c351e9b83 100644
--- a/src/yuzu/discord_impl.cpp
+++ b/src/yuzu/discord_impl.cpp
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <chrono>
 #include <string>
diff --git a/src/yuzu/discord_impl.h b/src/yuzu/discord_impl.h
index 03ad42681..84710b9c6 100644
--- a/src/yuzu/discord_impl.h
+++ b/src/yuzu/discord_impl.h
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index 5bcf582bf..041e6ac11 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <regex>
 #include <QApplication>
diff --git a/src/yuzu/game_list.h b/src/yuzu/game_list.h
index 9605985cc..f783283c9 100644
--- a/src/yuzu/game_list.h
+++ b/src/yuzu/game_list.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h
index cd7d63536..e7667cf60 100644
--- a/src/yuzu/game_list_p.h
+++ b/src/yuzu/game_list_p.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/hotkeys.cpp b/src/yuzu/hotkeys.cpp
index d59aa5d18..13723f6e5 100644
--- a/src/yuzu/hotkeys.cpp
+++ b/src/yuzu/hotkeys.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <sstream>
 #include <QShortcut>
diff --git a/src/yuzu/hotkeys.h b/src/yuzu/hotkeys.h
index 57a7c7da5..dc5b7f628 100644
--- a/src/yuzu/hotkeys.h
+++ b/src/yuzu/hotkeys.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp
index e273744fd..e263a07a7 100644
--- a/src/yuzu/loading_screen.cpp
+++ b/src/yuzu/loading_screen.cpp
@@ -147,6 +147,10 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size
        ui->progress_bar->setMaximum(static_cast<int>(total));
        previous_total = total;
    }
+    // Reset the progress bar ranges if compilation is done
+    if (stage == VideoCore::LoadCallbackStage::Complete) {
+        ui->progress_bar->setRange(0, 0);
+    }
    QString estimate;
    // If theres a drastic slowdown in the rate, then display an estimate
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index e56fcabff..dc7b343d9 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <cinttypes>
 #include <clocale>
@@ -9,6 +8,10 @@
 #ifdef __APPLE__
 #include <unistd.h> // for chdir
 #endif
+#ifdef __linux__
+#include <csignal>
+#include <sys/socket.h>
+#endif
 // VFS includes must be before glad as they will conflict with Windows file api, which uses defines.
 #include "applets/qt_controller.h"
@@ -260,6 +263,10 @@ GMainWindow::GMainWindow(bool has_broken_vulkan)
      config{std::make_unique<Config>(*system)},
      vfs{std::make_shared<FileSys::RealVfsFilesystem>()},
      provider{std::make_unique<FileSys::ManualContentProvider>()} {
+#ifdef __linux__
+    SetupSigInterrupts();
+#endif
    Common::Log::Initialize();
    LoadTranslation();
@@ -379,6 +386,8 @@ GMainWindow::GMainWindow(bool has_broken_vulkan)
    SDL_EnableScreenSaver();
 #endif
+    SetupPrepareForSleep();
    Common::Log::Start();
    QStringList args = QApplication::arguments();
@@ -463,7 +472,13 @@ GMainWindow::~GMainWindow() {
    if (render_window->parent() == nullptr) {
        delete render_window;
    }
    system->GetRoomNetwork().Shutdown();
+#ifdef __linux__
+    ::close(sig_interrupt_fds[0]);
+    ::close(sig_interrupt_fds[1]);
+#endif
 }
 void GMainWindow::RegisterMetaTypes() {
@@ -1061,12 +1076,26 @@ void GMainWindow::InitializeHotkeys() {
                     [] { Settings::values.audio_muted = !Settings::values.audio_muted; });
    connect_shortcut(QStringLiteral("Audio Volume Down"), [] {
        const auto current_volume = static_cast<int>(Settings::values.volume.GetValue());
-        const auto new_volume = std::max(current_volume - 5, 0);
+        int step = 5;
+        if (current_volume <= 30) {
+            step = 2;
+        }
+        if (current_volume <= 6) {
+            step = 1;
+        }
+        const auto new_volume = std::max(current_volume - step, 0);
        Settings::values.volume.SetValue(static_cast<u8>(new_volume));
    });
    connect_shortcut(QStringLiteral("Audio Volume Up"), [] {
        const auto current_volume = static_cast<int>(Settings::values.volume.GetValue());
-        const auto new_volume = std::min(current_volume + 5, 100);
+        int step = 5;
+        if (current_volume < 30) {
+            step = 2;
+        }
+        if (current_volume < 6) {
+            step = 1;
+        }
+        const auto new_volume = std::min(current_volume + step, 100);
        Settings::values.volume.SetValue(static_cast<u8>(new_volume));
    });
    connect_shortcut(QStringLiteral("Toggle Framerate Limit"), [] {
@@ -1314,6 +1343,43 @@ void GMainWindow::OnDisplayTitleBars(bool show) {
    }
 }
+void GMainWindow::SetupPrepareForSleep() {
+#ifdef __linux__
+    auto bus = QDBusConnection::systemBus();
+    if (bus.isConnected()) {
+        const bool success = bus.connect(
+            QStringLiteral("org.freedesktop.login1"), QStringLiteral("/org/freedesktop/login1"),
+            QStringLiteral("org.freedesktop.login1.Manager"), QStringLiteral("PrepareForSleep"),
+            QStringLiteral("b"), this, SLOT(OnPrepareForSleep(bool)));
+        if (!success) {
+            LOG_WARNING(Frontend, "Couldn't register PrepareForSleep signal");
+        }
+    } else {
+        LOG_WARNING(Frontend, "QDBusConnection system bus is not connected");
+    }
+#endif // __linux__
+}
+void GMainWindow::OnPrepareForSleep(bool prepare_sleep) {
+    if (emu_thread == nullptr) {
+        return;
+    }
+    if (prepare_sleep) {
+        if (emu_thread->IsRunning()) {
+            auto_paused = true;
+            OnPauseGame();
+        }
+    } else {
+        if (!emu_thread->IsRunning() && auto_paused) {
+            auto_paused = false;
+            RequestGameResume();
+            OnStartGame();
+        }
+    }
+}
 #ifdef __linux__
 static std::optional<QDBusObjectPath> HoldWakeLockLinux(u32 window_id = 0) {
    if (!QDBusConnection::sessionBus().isConnected()) {
@@ -1353,6 +1419,52 @@ static void ReleaseWakeLockLinux(QDBusObjectPath lock) {
                            QString::fromLatin1("org.freedesktop.portal.Request"));
    unlocker.call(QString::fromLatin1("Close"));
 }
+std::array<int, 3> GMainWindow::sig_interrupt_fds{0, 0, 0};
+void GMainWindow::SetupSigInterrupts() {
+    if (sig_interrupt_fds[2] == 1) {
+        return;
+    }
+    socketpair(AF_UNIX, SOCK_STREAM, 0, sig_interrupt_fds.data());
+    sig_interrupt_fds[2] = 1;
+    struct sigaction sa;
+    sa.sa_handler = &GMainWindow::HandleSigInterrupt;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = SA_RESETHAND;
+    sigaction(SIGINT, &sa, nullptr);
+    sigaction(SIGTERM, &sa, nullptr);
+    sig_interrupt_notifier = new QSocketNotifier(sig_interrupt_fds[1], QSocketNotifier::Read, this);
+    connect(sig_interrupt_notifier, &QSocketNotifier::activated, this,
+            &GMainWindow::OnSigInterruptNotifierActivated);
+    connect(this, &GMainWindow::SigInterrupt, this, &GMainWindow::close);
+}
+void GMainWindow::HandleSigInterrupt(int sig) {
+    if (sig == SIGINT) {
+        exit(1);
+    }
+    // Calling into Qt directly from a signal handler is not safe,
+    // so wake up a QSocketNotifier with this hacky write call instead.
+    char a = 1;
+    int ret = write(sig_interrupt_fds[0], &a, sizeof(a));
+    (void)ret;
+}
+void GMainWindow::OnSigInterruptNotifierActivated() {
+    sig_interrupt_notifier->setEnabled(false);
+    char a;
+    int ret = read(sig_interrupt_fds[1], &a, sizeof(a));
+    (void)ret;
+    sig_interrupt_notifier->setEnabled(true);
+    emit SigInterrupt();
+}
 #endif // __linux__
 void GMainWindow::PreventOSSleep() {
@@ -1476,17 +1588,18 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p
    return true;
 }
-void GMainWindow::SelectAndSetCurrentUser() {
+bool GMainWindow::SelectAndSetCurrentUser() {
    QtProfileSelectionDialog dialog(system->HIDCore(), this);
    dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
                          Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
    dialog.setWindowModality(Qt::WindowModal);
    if (dialog.exec() == QDialog::Rejected) {
-        return;
+        return false;
    }
    Settings::values.current_user = dialog.GetIndex();
+    return true;
 }
 void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t program_index,
@@ -1520,11 +1633,14 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
    Settings::LogSettings();
    if (UISettings::values.select_user_on_boot) {
-        SelectAndSetCurrentUser();
+        if (SelectAndSetCurrentUser() == false) {
+            return;
+        }
    }
-    if (!LoadROM(filename, program_id, program_index))
+    if (!LoadROM(filename, program_id, program_index)) {
        return;
+    }
    system->SetShuttingDown(false);
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 8d5c1398f..e13b38b24 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
@@ -164,6 +163,8 @@ signals:
    void WebBrowserExtractOfflineRomFS();
    void WebBrowserClosed(Service::AM::Applets::WebExitReason exit_reason, std::string last_url);
+    void SigInterrupt();
 public slots:
    void OnLoadComplete();
    void OnExecuteProgram(std::size_t program_index);
@@ -203,7 +204,7 @@ private:
    void ConnectMenuEvents();
    void UpdateMenuState();
-    MultiplayerState* multiplayer_state = nullptr;
+    void SetupPrepareForSleep();
    void PreventOSSleep();
    void AllowOSSleep();
@@ -217,7 +218,7 @@ private:
    void SetDiscordEnabled(bool state);
    void LoadAmiibo(const QString& filename);
-    void SelectAndSetCurrentUser();
+    bool SelectAndSetCurrentUser();
    /**
     * Stores the filename in the recently loaded files list.
@@ -252,12 +253,19 @@ private:
    void RequestGameResume();
    void closeEvent(QCloseEvent* event) override;
+#ifdef __linux__
+    void SetupSigInterrupts();
+    static void HandleSigInterrupt(int);
+    void OnSigInterruptNotifierActivated();
+#endif
 private slots:
    void OnStartGame();
    void OnRestartGame();
    void OnPauseGame();
    void OnPauseContinueGame();
    void OnStopGame();
+    void OnPrepareForSleep(bool prepare_sleep);
    void OnMenuReportCompatibility();
    void OnOpenModsPage();
    void OnOpenQuickstartGuide();
@@ -348,6 +356,8 @@ private:
    std::unique_ptr<DiscordRPC::DiscordInterface> discord_rpc;
    std::shared_ptr<InputCommon::InputSubsystem> input_subsystem;
+    MultiplayerState* multiplayer_state = nullptr;
    GRenderWindow* render_window;
    GameList* game_list;
    LoadingScreen* loading_screen;
@@ -420,6 +430,9 @@ private:
    bool is_tas_recording_dialog_active{};
 #ifdef __linux__
+    QSocketNotifier* sig_interrupt_notifier;
+    static std::array<int, 3> sig_interrupt_fds;
    QDBusObjectPath wake_lock{};
 #endif
diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index f683b80f7..2c1b547fb 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "yuzu/uisettings.h"
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 6cd4d6cb2..25d1bf1e6 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/util/sequence_dialog/sequence_dialog.cpp b/src/yuzu/util/sequence_dialog/sequence_dialog.cpp
index bb5f74ec4..4b10fa517 100644
--- a/src/yuzu/util/sequence_dialog/sequence_dialog.cpp
+++ b/src/yuzu/util/sequence_dialog/sequence_dialog.cpp
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <QDialogButtonBox>
 #include <QKeySequenceEdit>
diff --git a/src/yuzu/util/sequence_dialog/sequence_dialog.h b/src/yuzu/util/sequence_dialog/sequence_dialog.h
index 969c77740..85e146d40 100644
--- a/src/yuzu/util/sequence_dialog/sequence_dialog.h
+++ b/src/yuzu/util/sequence_dialog/sequence_dialog.h
@@ -1,6 +1,5 @@
-// Copyright 2018 Citra Emulator Project
+// SPDX-FileCopyrightText: 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/util/util.cpp b/src/yuzu/util/util.cpp
index ef31bc2d2..5c3e4589e 100644
--- a/src/yuzu/util/util.cpp
+++ b/src/yuzu/util/util.cpp
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <cmath>
diff --git a/src/yuzu/util/util.h b/src/yuzu/util/util.h
index e6790f260..39dd2d895 100644
--- a/src/yuzu/util/util.h
+++ b/src/yuzu/util/util.h
@@ -1,6 +1,5 @@
-// Copyright 2015 Citra Emulator Project
+// SPDX-FileCopyrightText: 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu/yuzu.qrc b/src/yuzu/yuzu.qrc
index 5733cac98..855df05fd 100644
--- a/src/yuzu/yuzu.qrc
+++ b/src/yuzu/yuzu.qrc
@@ -1,3 +1,8 @@
+<!--
+SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
 <RCC>
    <qresource prefix="/img">
        <file alias="yuzu.ico">../../dist/yuzu.ico</file>
diff --git a/src/yuzu/yuzu.rc b/src/yuzu/yuzu.rc
index 4a3645a71..1fc74d065 100644
--- a/src/yuzu/yuzu.rc
+++ b/src/yuzu/yuzu.rc
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include "winresrc.h"
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index c8901f2df..7d8ca3d8a 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 # Credits to Samantas5855 and others for this function.
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index ad7f9d239..bd0fb75f8 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <memory>
 #include <optional>
diff --git a/src/yuzu_cmd/config.h b/src/yuzu_cmd/config.h
index 32c03075f..021438b17 100644
--- a/src/yuzu_cmd/config.h
+++ b/src/yuzu_cmd/config.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index d9a2a460c..1168cf136 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index 8e38724db..4ac72c2f6 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <SDL.h>
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h
index 58b885465..90bb0b415 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h
@@ -1,6 +1,5 @@
-// Copyright 2016 Citra Emulator Project
+// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index e10d3f5b4..003890c07 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -1,6 +1,5 @@
-// Copyright 2014 Citra Emulator Project
+// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <chrono>
 #include <iostream>
diff --git a/src/yuzu_cmd/yuzu.rc b/src/yuzu_cmd/yuzu.rc
index 0cde75e2f..e230cf680 100644
--- a/src/yuzu_cmd/yuzu.rc
+++ b/src/yuzu_cmd/yuzu.rc
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include "winresrc.h"
 /////////////////////////////////////////////////////////////////////////////
 //