39 files changed, 507 insertions, 150 deletions
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index 827ab0ac7..ec71524a3 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -4,8 +4,6 @@ add_library(audio_core STATIC
    audio_renderer.cpp
    audio_renderer.h
    buffer.h
-    cubeb_sink.cpp
-    cubeb_sink.h
    codec.cpp
    codec.h
    null_sink.h
@@ -15,6 +13,8 @@ add_library(audio_core STATIC
    sink_details.cpp
    sink_details.h
    sink_stream.h
+    $<$<BOOL:${ENABLE_CUBEB}>:cubeb_sink.cpp cubeb_sink.h>
 )
 create_target_directory_groups(audio_core)
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 816414e8d..355abd682 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -200,6 +200,7 @@ void FileBackend::Write(const Entry& entry) {
    SUB(Service, SPL)                                                                              \
    SUB(Service, SSL)                                                                              \
    SUB(Service, Time)                                                                             \
+    SUB(Service, USB)                                                                              \
    SUB(Service, VI)                                                                               \
    SUB(Service, WLAN)                                                                             \
    CLS(HW)                                                                                        \
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 7ab5277ea..a889ebefa 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -87,6 +87,7 @@ enum class Class : ClassType {
    Service_SPL,       ///< The SPL service
    Service_SSL,       ///< The SSL service
    Service_Time,      ///< The time service
+    Service_USB,       ///< The USB (Universal Serial Bus) service
    Service_VI,        ///< The VI (Video interface) service
    Service_WLAN,      ///< The WLAN (Wireless local area network) service
    HW,                ///< Low-level hardware emulation
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index c11f017da..0abf7edc1 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -315,6 +315,8 @@ add_library(core STATIC
    hle/service/time/interface.h
    hle/service/time/time.cpp
    hle/service/time/time.h
+    hle/service/usb/usb.cpp
+    hle/service/usb/usb.h
    hle/service/vi/vi.cpp
    hle/service/vi/vi.h
    hle/service/vi/vi_m.cpp
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index 7933c105c..134e41ebc 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -14,8 +14,8 @@
 namespace Kernel {
-ClientPort::ClientPort() {}
+ClientPort::ClientPort() = default;
-ClientPort::~ClientPort() {}
+ClientPort::~ClientPort() = default;
 ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
    // Note: Threads do not wait for the server endpoint to call
@@ -40,4 +40,12 @@ ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
    return MakeResult(std::get<SharedPtr<ClientSession>>(sessions));
 }
+void ClientPort::ConnectionClosed() {
+    if (active_sessions == 0) {
+        return;
+    }
+    --active_sessions;
+}
 } // namespace Kernel
diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h
index b42c94bde..b1269ea5c 100644
--- a/src/core/hle/kernel/client_port.h
+++ b/src/core/hle/kernel/client_port.h
@@ -37,14 +37,20 @@ public:
     */
    ResultVal<SharedPtr<ClientSession>> Connect();
-    SharedPtr<ServerPort> server_port; ///< ServerPort associated with this client port.
+    /**
-    u32 max_sessions;    ///< Maximum number of simultaneous sessions the port can have
+     * Signifies that a previously active connection has been closed,
-    u32 active_sessions; ///< Number of currently open sessions to this port
+     * decreasing the total number of active connections to this port.
-    std::string name;    ///< Name of client port (optional)
+     */
+    void ConnectionClosed();
 private:
    ClientPort();
    ~ClientPort() override;
+    SharedPtr<ServerPort> server_port; ///< ServerPort associated with this client port.
+    u32 max_sessions = 0;    ///< Maximum number of simultaneous sessions the port can have
+    u32 active_sessions = 0; ///< Number of currently open sessions to this port
+    std::string name;        ///< Name of client port (optional)
 };
 } // namespace Kernel
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp
index 60370e9ec..93560152f 100644
--- a/src/core/hle/kernel/server_session.cpp
+++ b/src/core/hle/kernel/server_session.cpp
@@ -27,7 +27,7 @@ ServerSession::~ServerSession() {
    // Decrease the port's connection count.
    if (parent->port)
-        parent->port->active_sessions--;
+        parent->port->ConnectionClosed();
    // TODO(Subv): Wake up all the ClientSession's waiting threads and set
    // the SendSyncRequest result to 0xC920181A.
diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp
index 7a185c6c8..4109cb7f7 100644
--- a/src/core/hle/service/apm/apm.cpp
+++ b/src/core/hle/service/apm/apm.cpp
@@ -13,6 +13,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
    auto module_ = std::make_shared<Module>();
    std::make_shared<APM>(module_, "apm")->InstallAsService(service_manager);
    std::make_shared<APM>(module_, "apm:p")->InstallAsService(service_manager);
+    std::make_shared<APM_Sys>()->InstallAsService(service_manager);
 }
 } // namespace Service::APM
diff --git a/src/core/hle/service/apm/interface.cpp b/src/core/hle/service/apm/interface.cpp
index ce943d829..4cd8132f5 100644
--- a/src/core/hle/service/apm/interface.cpp
+++ b/src/core/hle/service/apm/interface.cpp
@@ -74,6 +74,31 @@ void APM::OpenSession(Kernel::HLERequestContext& ctx) {
    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
    rb.Push(RESULT_SUCCESS);
    rb.PushIpcInterface<ISession>();
+    LOG_DEBUG(Service_APM, "called");
+}
+APM_Sys::APM_Sys() : ServiceFramework{"apm:sys"} {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {0, nullptr, "RequestPerformanceMode"},
+        {1, &APM_Sys::GetPerformanceEvent, "GetPerformanceEvent"},
+        {2, nullptr, "GetThrottlingState"},
+        {3, nullptr, "GetLastThrottlingState"},
+        {4, nullptr, "ClearLastThrottlingState"},
+        {5, nullptr, "LoadAndApplySettings"},
+    };
+    // clang-format on
+    RegisterHandlers(functions);
+}
+void APM_Sys::GetPerformanceEvent(Kernel::HLERequestContext& ctx) {
+    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+    rb.Push(RESULT_SUCCESS);
+    rb.PushIpcInterface<ISession>();
+    LOG_DEBUG(Service_APM, "called");
 }
 } // namespace Service::APM
diff --git a/src/core/hle/service/apm/interface.h b/src/core/hle/service/apm/interface.h
index fa68c7d93..d14264ad7 100644
--- a/src/core/hle/service/apm/interface.h
+++ b/src/core/hle/service/apm/interface.h
@@ -19,4 +19,12 @@ private:
    std::shared_ptr<Module> apm;
 };
+class APM_Sys final : public ServiceFramework<APM_Sys> {
+public:
+    explicit APM_Sys();
+private:
+    void GetPerformanceEvent(Kernel::HLERequestContext& ctx);
+};
 } // namespace Service::APM
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index ed53f96c5..8f0262e34 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -337,6 +337,7 @@ public:
             "AcquireNpadStyleSetUpdateEventHandle"},
            {107, nullptr, "DisconnectNpad"},
            {108, &Hid::GetPlayerLedPattern, "GetPlayerLedPattern"},
+            {109, nullptr, "ActivateNpadWithRevision"},
            {120, &Hid::SetNpadJoyHoldType, "SetNpadJoyHoldType"},
            {121, &Hid::GetNpadJoyHoldType, "GetNpadJoyHoldType"},
            {122, &Hid::SetNpadJoyAssignmentModeSingleByDefault,
diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
index 2b74e6a33..8bc49935a 100644
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
@@ -7,8 +7,8 @@
 #include "core/core.h"
 #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
 #include "core/hle/service/nvdrv/devices/nvmap.h"
+#include "video_core/gpu.h"
 #include "video_core/renderer_base.h"
-#include "video_core/video_core.h"
 namespace Service::Nvidia::Devices {
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
index 4b601781f..be2b79256 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
@@ -2,14 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <cinttypes>
+#include <cstring>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h"
 #include "core/hle/service/nvdrv/devices/nvmap.h"
+#include "video_core/memory_manager.h"
+#include "video_core/rasterizer_interface.h"
 #include "video_core/renderer_base.h"
-#include "video_core/video_core.h"
 namespace Service::Nvidia::Devices {
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
index 671b092e1..5685eb2be 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@@ -2,6 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include <cstdlib>
+#include <cstring>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/service/nvdrv/devices/nvhost_ctrl.h"
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h
index 090261a60..6b496e9fe 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h
@@ -5,8 +5,6 @@
 #pragma once
 #include <array>
-#include <cstdlib>
-#include <cstring>
 #include <vector>
 #include "common/common_types.h"
 #include "core/hle/service/nvdrv/devices/nvdevice.h"
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
index 010072a5b..ae421247d 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <cinttypes>
+#include <cstring>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h"
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
index 5a1123ad2..116dabedb 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
@@ -2,12 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <cinttypes>
+#include <cstring>
-#include <map>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/hle/service/nvdrv/devices/nvhost_gpu.h"
+#include "core/memory.h"
+#include "video_core/gpu.h"
+#include "video_core/memory_manager.h"
 namespace Service::Nvidia::Devices {
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h
index aa8df2e6e..650ed8fbc 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <vector>
+#include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/hle/service/nvdrv/devices/nvdevice.h"
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp
index b51c73ee8..364619e67 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include <cstring>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/service/nvdrv/devices/nvhost_nvdec.h"
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h
index 0192aecdd..6ad74421b 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h
@@ -4,11 +4,9 @@
 #pragma once
-#include <array>
-#include <cstdlib>
-#include <cstring>
 #include <vector>
 #include "common/common_types.h"
+#include "common/swap.h"
 #include "core/hle/service/nvdrv/devices/nvdevice.h"
 namespace Service::Nvidia::Devices {
diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp
index 724eeb139..e9305bfb3 100644
--- a/src/core/hle/service/nvdrv/devices/nvmap.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 #include <algorithm>
-#include <cinttypes>
+#include <cstring>
 #include "common/assert.h"
 #include "common/logging/log.h"
diff --git a/src/core/hle/service/nvdrv/interface.h b/src/core/hle/service/nvdrv/interface.h
index 959b5ba29..1c3529bb6 100644
--- a/src/core/hle/service/nvdrv/interface.h
+++ b/src/core/hle/service/nvdrv/interface.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <memory>
-#include <string>
 #include "core/hle/kernel/event.h"
 #include "core/hle/service/nvdrv/nvdrv.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index 1555ea806..e8b30921a 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -54,7 +54,7 @@ u32 Module::Open(const std::string& device_name) {
    return fd;
 }
-u32 Module::Ioctl(u32 fd, u32_le command, const std::vector<u8>& input, std::vector<u8>& output) {
+u32 Module::Ioctl(u32 fd, u32 command, const std::vector<u8>& input, std::vector<u8>& output) {
    auto itr = open_files.find(fd);
    ASSERT_MSG(itr != open_files.end(), "Tried to talk to an invalid device");
diff --git a/src/core/hle/service/nvdrv/nvmemp.cpp b/src/core/hle/service/nvdrv/nvmemp.cpp
index 9ca6e5512..0e8e21bad 100644
--- a/src/core/hle/service/nvdrv/nvmemp.cpp
+++ b/src/core/hle/service/nvdrv/nvmemp.cpp
@@ -4,8 +4,6 @@
 #include "common/assert.h"
 #include "common/logging/log.h"
-#include "core/hle/ipc_helpers.h"
-#include "core/hle/service/nvdrv/nvdrv.h"
 #include "core/hle/service/nvdrv/nvmemp.h"
 namespace Service::Nvidia {
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index 58da1fdfa..570aa8493 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -3,8 +3,11 @@
 // Refer to the license.txt file included.
 #include <algorithm>
+#include <boost/optional.hpp>
 #include "common/alignment.h"
+#include "common/assert.h"
+#include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "common/scope_exit.h"
 #include "core/core.h"
@@ -43,7 +46,7 @@ NVFlinger::~NVFlinger() {
    CoreTiming::UnscheduleEvent(composition_event, 0);
 }
-u64 NVFlinger::OpenDisplay(const std::string& name) {
+u64 NVFlinger::OpenDisplay(std::string_view name) {
    LOG_WARNING(Service, "Opening display {}", name);
    // TODO(Subv): Currently we only support the Default display.
diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h
index 2c908297b..5374df175 100644
--- a/src/core/hle/service/nvflinger/nvflinger.h
+++ b/src/core/hle/service/nvflinger/nvflinger.h
@@ -5,7 +5,11 @@
 #pragma once
 #include <memory>
-#include <boost/optional.hpp>
+#include <string>
+#include <string_view>
+#include <vector>
+#include "common/common_types.h"
 #include "core/hle/kernel/event.h"
 namespace CoreTiming {
@@ -41,7 +45,7 @@ public:
    ~NVFlinger();
    /// Opens the specified display and returns the id.
-    u64 OpenDisplay(const std::string& name);
+    u64 OpenDisplay(std::string_view name);
    /// Creates a layer on the specified display and returns the layer id.
    u64 CreateLayer(u64 display_id);
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 31ea79773..889cdd41a 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -63,6 +63,7 @@
 #include "core/hle/service/spl/module.h"
 #include "core/hle/service/ssl/ssl.h"
 #include "core/hle/service/time/time.h"
+#include "core/hle/service/usb/usb.h"
 #include "core/hle/service/vi/vi.h"
 #include "core/hle/service/wlan/wlan.h"
@@ -249,6 +250,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) {
    SPL::InstallInterfaces(*sm);
    SSL::InstallInterfaces(*sm);
    Time::InstallInterfaces(*sm);
+    USB::InstallInterfaces(*sm);
    VI::InstallInterfaces(*sm, nv_flinger);
    WLAN::InstallInterfaces(*sm);
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp
index 37b58bb77..2172c681b 100644
--- a/src/core/hle/service/time/time.cpp
+++ b/src/core/hle/service/time/time.cpp
@@ -80,8 +80,8 @@ public:
            {5, nullptr, "GetTimeZoneRuleVersion"},
            {100, &ITimeZoneService::ToCalendarTime, "ToCalendarTime"},
            {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"},
-            {200, nullptr, "ToPosixTime"},
+            {201, nullptr, "ToPosixTime"},
-            {201, nullptr, "ToPosixTimeWithMyRule"},
+            {202, nullptr, "ToPosixTimeWithMyRule"},
        };
        RegisterHandlers(functions);
    }
diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp
new file mode 100644
index 000000000..e7fb5a419
--- /dev/null
+++ b/src/core/hle/service/usb/usb.cpp
@@ -0,0 +1,238 @@
+// Copyright 2018 yuzu emulator team
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+#include <memory>
+#include "common/logging/log.h"
+#include "core/hle/ipc_helpers.h"
+#include "core/hle/kernel/hle_ipc.h"
+#include "core/hle/service/service.h"
+#include "core/hle/service/sm/sm.h"
+#include "core/hle/service/usb/usb.h"
+namespace Service::USB {
+class IDsInterface final : public ServiceFramework<IDsInterface> {
+public:
+    explicit IDsInterface() : ServiceFramework{"IDsInterface"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "GetDsEndpoint"},
+            {1, nullptr, "GetSetupEvent"},
+            {2, nullptr, "Unknown"},
+            {3, nullptr, "EnableInterface"},
+            {4, nullptr, "DisableInterface"},
+            {5, nullptr, "CtrlInPostBufferAsync"},
+            {6, nullptr, "CtrlOutPostBufferAsync"},
+            {7, nullptr, "GetCtrlInCompletionEvent"},
+            {8, nullptr, "GetCtrlInReportData"},
+            {9, nullptr, "GetCtrlOutCompletionEvent"},
+            {10, nullptr, "GetCtrlOutReportData"},
+            {11, nullptr, "StallCtrl"},
+            {12, nullptr, "AppendConfigurationData"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+class USB_DS final : public ServiceFramework<USB_DS> {
+public:
+    explicit USB_DS() : ServiceFramework{"usb:ds"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "BindDevice"},
+            {1, nullptr, "BindClientProcess"},
+            {2, nullptr, "GetDsInterface"},
+            {3, nullptr, "GetStateChangeEvent"},
+            {4, nullptr, "GetState"},
+            {5, nullptr, "ClearDeviceData"},
+            {6, nullptr, "AddUsbStringDescriptor"},
+            {7, nullptr, "DeleteUsbStringDescriptor"},
+            {8, nullptr, "SetUsbDeviceDescriptor"},
+            {9, nullptr, "SetBinaryObjectStore"},
+            {10, nullptr, "Enable"},
+            {11, nullptr, "Disable"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+class IClientEpSession final : public ServiceFramework<IClientEpSession> {
+public:
+    explicit IClientEpSession() : ServiceFramework{"IClientEpSession"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Unknown1"},
+            {1, nullptr, "Unknown2"},
+            {2, nullptr, "Unknown3"},
+            {3, nullptr, "Unknown4"},
+            {4, nullptr, "PostBufferAsync"},
+            {5, nullptr, "Unknown5"},
+            {6, nullptr, "Unknown6"},
+            {7, nullptr, "Unknown7"},
+            {8, nullptr, "Unknown8"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+class IClientIfSession final : public ServiceFramework<IClientIfSession> {
+public:
+    explicit IClientIfSession() : ServiceFramework{"IClientIfSession"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Unknown1"},
+            {1, nullptr, "Unknown2"},
+            {2, nullptr, "Unknown3"},
+            {3, nullptr, "Unknown4"},
+            {4, nullptr, "Unknown5"},
+            {5, nullptr, "CtrlXferAsync"},
+            {6, nullptr, "Unknown6"},
+            {7, nullptr, "GetCtrlXferReport"},
+            {8, nullptr, "Unknown7"},
+            {9, nullptr, "GetClientEpSession"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+class USB_HS final : public ServiceFramework<USB_HS> {
+public:
+    explicit USB_HS() : ServiceFramework{"usb:hs"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "BindClientProcess"},
+            {1, nullptr, "Unknown1"},
+            {2, nullptr, "Unknown2"},
+            {3, nullptr, "Unknown3"},
+            {4, nullptr, "Unknown4"},
+            {5, nullptr, "Unknown5"},
+            {6, nullptr, "GetInterfaceStateChangeEvent"},
+            {7, nullptr, "GetClientIfSession"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+class IPdSession final : public ServiceFramework<IPdSession> {
+public:
+    explicit IPdSession() : ServiceFramework{"IPdSession"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "BindNoticeEvent"},
+            {1, nullptr, "Unknown1"},
+            {2, nullptr, "GetStatus"},
+            {3, nullptr, "GetNotice"},
+            {4, nullptr, "Unknown2"},
+            {5, nullptr, "Unknown3"},
+            {6, nullptr, "ReplyPowerRequest"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+class USB_PD final : public ServiceFramework<USB_PD> {
+public:
+    explicit USB_PD() : ServiceFramework{"usb:pd"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &USB_PD::GetPdSession, "GetPdSession"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+private:
+    void GetPdSession(Kernel::HLERequestContext& ctx) {
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(RESULT_SUCCESS);
+        rb.PushIpcInterface<IPdSession>();
+        LOG_DEBUG(Service_USB, "called");
+    }
+};
+class IPdCradleSession final : public ServiceFramework<IPdCradleSession> {
+public:
+    explicit IPdCradleSession() : ServiceFramework{"IPdCradleSession"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "VdmUserWrite"},
+            {1, nullptr, "VdmUserRead"},
+            {2, nullptr, "Vdm20Init"},
+            {3, nullptr, "GetFwType"},
+            {4, nullptr, "GetFwRevision"},
+            {5, nullptr, "GetManufacturerId"},
+            {6, nullptr, "GetDeviceId"},
+            {7, nullptr, "Unknown1"},
+            {8, nullptr, "Unknown2"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+class USB_PD_C final : public ServiceFramework<USB_PD_C> {
+public:
+    explicit USB_PD_C() : ServiceFramework{"usb:pd:c"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &USB_PD_C::GetPdCradleSession, "GetPdCradleSession"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+private:
+    void GetPdCradleSession(Kernel::HLERequestContext& ctx) {
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(RESULT_SUCCESS);
+        rb.PushIpcInterface<IPdCradleSession>();
+        LOG_DEBUG(Service_USB, "called");
+    }
+};
+class USB_PM final : public ServiceFramework<USB_PM> {
+public:
+    explicit USB_PM() : ServiceFramework{"usb:pm"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Unknown1"},
+            {1, nullptr, "Unknown2"},
+            {2, nullptr, "Unknown3"},
+            {3, nullptr, "Unknown4"},
+            {4, nullptr, "Unknown5"},
+            {5, nullptr, "Unknown6"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+void InstallInterfaces(SM::ServiceManager& sm) {
+    std::make_shared<USB_DS>()->InstallAsService(sm);
+    std::make_shared<USB_HS>()->InstallAsService(sm);
+    std::make_shared<USB_PD>()->InstallAsService(sm);
+    std::make_shared<USB_PD_C>()->InstallAsService(sm);
+    std::make_shared<USB_PM>()->InstallAsService(sm);
+}
+} // namespace Service::USB
diff --git a/src/core/hle/service/usb/usb.h b/src/core/hle/service/usb/usb.h
new file mode 100644
index 000000000..970a11fe8
--- /dev/null
+++ b/src/core/hle/service/usb/usb.h
@@ -0,0 +1,15 @@
+// Copyright 2018 yuzu emulator team
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+#pragma once
+namespace Service::SM {
+class ServiceManager;
+}
+namespace Service::USB {
+void InstallInterfaces(SM::ServiceManager& sm);
+} // namespace Service::USB
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp
index 076927dff..9a8cdd0ff 100644
--- a/src/core/loader/deconstructed_rom_directory.cpp
+++ b/src/core/loader/deconstructed_rom_directory.cpp
@@ -41,7 +41,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load(
    if (dir == nullptr) {
        if (file == nullptr)
            return ResultStatus::ErrorInvalidFormat;
-        const FileSys::VirtualDir dir = file->GetContainingDirectory();
+        dir = file->GetContainingDirectory();
    }
    const FileSys::VirtualFile npdm = dir->GetFile("main.npdm");
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index 1ca7e876c..cc4b326ae 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -6,9 +6,12 @@
 #include "ui_configure.h"
 #include "yuzu/configuration/config.h"
 #include "yuzu/configuration/configure_dialog.h"
+#include "yuzu/hotkeys.h"
-ConfigureDialog::ConfigureDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ConfigureDialog) {
+ConfigureDialog::ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry)
+    : QDialog(parent), ui(new Ui::ConfigureDialog) {
    ui->setupUi(this);
+    ui->generalTab->PopulateHotkeyList(registry);
    this->setConfiguration();
 }
diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h
index 21fa1f501..bbbdacc29 100644
--- a/src/yuzu/configuration/configure_dialog.h
+++ b/src/yuzu/configuration/configure_dialog.h
@@ -7,6 +7,8 @@
 #include <memory>
 #include <QDialog>
+class HotkeyRegistry;
 namespace Ui {
 class ConfigureDialog;
 }
@@ -15,7 +17,7 @@ class ConfigureDialog : public QDialog {
    Q_OBJECT
 public:
-    explicit ConfigureDialog(QWidget* parent);
+    explicit ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry);
    ~ConfigureDialog();
    void applyConfiguration();
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 04afc8724..d8caee1e8 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -35,6 +35,10 @@ void ConfigureGeneral::setConfiguration() {
    ui->use_docked_mode->setChecked(Settings::values.use_docked_mode);
 }
+void ConfigureGeneral::PopulateHotkeyList(const HotkeyRegistry& registry) {
+    ui->widget->Populate(registry);
+}
 void ConfigureGeneral::applyConfiguration() {
    UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked();
    UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked();
diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h
index 447552d8c..4770034cc 100644
--- a/src/yuzu/configuration/configure_general.h
+++ b/src/yuzu/configuration/configure_general.h
@@ -7,6 +7,8 @@
 #include <memory>
 #include <QWidget>
+class HotkeyRegistry;
 namespace Ui {
 class ConfigureGeneral;
 }
@@ -18,11 +20,11 @@ public:
    explicit ConfigureGeneral(QWidget* parent = nullptr);
    ~ConfigureGeneral();
+    void PopulateHotkeyList(const HotkeyRegistry& registry);
    void applyConfiguration();
 private:
    void setConfiguration();
-private:
    std::unique_ptr<Ui::ConfigureGeneral> ui;
 };
diff --git a/src/yuzu/hotkeys.cpp b/src/yuzu/hotkeys.cpp
index 61acb38ee..dce399774 100644
--- a/src/yuzu/hotkeys.cpp
+++ b/src/yuzu/hotkeys.cpp
@@ -10,58 +10,53 @@
 #include "yuzu/hotkeys.h"
 #include "yuzu/ui_settings.h"
-struct Hotkey {
+HotkeyRegistry::HotkeyRegistry() = default;
-    Hotkey() : shortcut(nullptr), context(Qt::WindowShortcut) {}
+HotkeyRegistry::~HotkeyRegistry() = default;
-    QKeySequence keyseq;
+void HotkeyRegistry::LoadHotkeys() {
-    QShortcut* shortcut;
-    Qt::ShortcutContext context;
-};
-typedef std::map<QString, Hotkey> HotkeyMap;
-typedef std::map<QString, HotkeyMap> HotkeyGroupMap;
-HotkeyGroupMap hotkey_groups;
-void SaveHotkeys() {
-    UISettings::values.shortcuts.clear();
-    for (auto group : hotkey_groups) {
-        for (auto hotkey : group.second) {
-            UISettings::values.shortcuts.emplace_back(
-                UISettings::Shortcut(group.first + "/" + hotkey.first,
-                                     UISettings::ContextualShortcut(hotkey.second.keyseq.toString(),
-                                                                    hotkey.second.context)));
-        }
-    }
-}
-void LoadHotkeys() {
    // Make sure NOT to use a reference here because it would become invalid once we call
    // beginGroup()
    for (auto shortcut : UISettings::values.shortcuts) {
-        QStringList cat = shortcut.first.split("/");
+        const QStringList cat = shortcut.first.split('/');
        Q_ASSERT(cat.size() >= 2);
        // RegisterHotkey assigns default keybindings, so use old values as default parameters
        Hotkey& hk = hotkey_groups[cat[0]][cat[1]];
        if (!shortcut.second.first.isEmpty()) {
            hk.keyseq = QKeySequence::fromString(shortcut.second.first);
-            hk.context = (Qt::ShortcutContext)shortcut.second.second;
+            hk.context = static_cast<Qt::ShortcutContext>(shortcut.second.second);
        }
        if (hk.shortcut)
            hk.shortcut->setKey(hk.keyseq);
    }
 }
-void RegisterHotkey(const QString& group, const QString& action, const QKeySequence& default_keyseq,
+void HotkeyRegistry::SaveHotkeys() {
-                    Qt::ShortcutContext default_context) {
+    UISettings::values.shortcuts.clear();
-    if (hotkey_groups[group].find(action) == hotkey_groups[group].end()) {
+    for (const auto& group : hotkey_groups) {
-        hotkey_groups[group][action].keyseq = default_keyseq;
+        for (const auto& hotkey : group.second) {
-        hotkey_groups[group][action].context = default_context;
+            UISettings::values.shortcuts.emplace_back(
+                UISettings::Shortcut(group.first + '/' + hotkey.first,
+                                     UISettings::ContextualShortcut(hotkey.second.keyseq.toString(),
+                                                                    hotkey.second.context)));
+        }
    }
 }
-QShortcut* GetHotkey(const QString& group, const QString& action, QWidget* widget) {
+void HotkeyRegistry::RegisterHotkey(const QString& group, const QString& action,
+                                    const QKeySequence& default_keyseq,
+                                    Qt::ShortcutContext default_context) {
+    auto& hotkey_group = hotkey_groups[group];
+    if (hotkey_group.find(action) != hotkey_group.end()) {
+        return;
+    }
+    auto& hotkey_action = hotkey_groups[group][action];
+    hotkey_action.keyseq = default_keyseq;
+    hotkey_action.context = default_context;
+}
+QShortcut* HotkeyRegistry::GetHotkey(const QString& group, const QString& action, QWidget* widget) {
    Hotkey& hk = hotkey_groups[group][action];
    if (!hk.shortcut)
@@ -72,10 +67,12 @@ QShortcut* GetHotkey(const QString& group, const QString& action, QWidget* widge
 GHotkeysDialog::GHotkeysDialog(QWidget* parent) : QWidget(parent) {
    ui.setupUi(this);
+}
-    for (auto group : hotkey_groups) {
+void GHotkeysDialog::Populate(const HotkeyRegistry& registry) {
+    for (const auto& group : registry.hotkey_groups) {
        QTreeWidgetItem* toplevel_item = new QTreeWidgetItem(QStringList(group.first));
-        for (auto hotkey : group.second) {
+        for (const auto& hotkey : group.second) {
            QStringList columns;
            columns << hotkey.first << hotkey.second.keyseq.toString();
            QTreeWidgetItem* item = new QTreeWidgetItem(columns);
diff --git a/src/yuzu/hotkeys.h b/src/yuzu/hotkeys.h
index a4ccc193b..f38e6c002 100644
--- a/src/yuzu/hotkeys.h
+++ b/src/yuzu/hotkeys.h
@@ -4,6 +4,7 @@
 #pragma once
+#include <map>
 #include "ui_hotkeys.h"
 class QDialog;
@@ -11,47 +12,69 @@ class QKeySequence;
 class QSettings;
 class QShortcut;
-/**
+class HotkeyRegistry final {
- * Register a hotkey.
+public:
- *
+    friend class GHotkeysDialog;
- * @param group General group this hotkey belongs to (e.g. "Main Window", "Debugger")
- * @param action Name of the action (e.g. "Start Emulation", "Load Image")
+    explicit HotkeyRegistry();
- * @param default_keyseq Default key sequence to assign if the hotkey wasn't present in the settings
+    ~HotkeyRegistry();
- * file before
- * @param default_context Default context to assign if the hotkey wasn't present in the settings
+    /**
- * file before
+     * Loads hotkeys from the settings file.
- * @warning Both the group and action strings will be displayed in the hotkey settings dialog
+     *
- */
+     * @note Yet unregistered hotkeys which are present in the settings will automatically be
-void RegisterHotkey(const QString& group, const QString& action,
+     *       registered.
-                    const QKeySequence& default_keyseq = QKeySequence(),
+     */
-                    Qt::ShortcutContext default_context = Qt::WindowShortcut);
+    void LoadHotkeys();
-/**
+    /**
- * Returns a QShortcut object whose activated() signal can be connected to other QObjects' slots.
+     * Saves all registered hotkeys to the settings file.
- *
+     *
- * @param group  General group this hotkey belongs to (e.g. "Main Window", "Debugger").
+     * @note Each hotkey group will be stored a settings group; For each hotkey inside that group, a
- * @param action Name of the action (e.g. "Start Emulation", "Load Image").
+     *       settings group will be created to store the key sequence and the hotkey context.
- * @param widget Parent widget of the returned QShortcut.
+     */
- * @warning If multiple QWidgets' call this function for the same action, the returned QShortcut
+    void SaveHotkeys();
- * will be the same. Thus, you shouldn't rely on the caller really being the QShortcut's parent.
- */
+    /**
-QShortcut* GetHotkey(const QString& group, const QString& action, QWidget* widget);
+     * Returns a QShortcut object whose activated() signal can be connected to other QObjects'
+     * slots.
-/**
+     *
- * Saves all registered hotkeys to the settings file.
+     * @param group  General group this hotkey belongs to (e.g. "Main Window", "Debugger").
- *
+     * @param action Name of the action (e.g. "Start Emulation", "Load Image").
- * @note Each hotkey group will be stored a settings group; For each hotkey inside that group, a
+     * @param widget Parent widget of the returned QShortcut.
- * settings group will be created to store the key sequence and the hotkey context.
+     * @warning If multiple QWidgets' call this function for the same action, the returned QShortcut
- */
+     *          will be the same. Thus, you shouldn't rely on the caller really being the
-void SaveHotkeys();
+     *          QShortcut's parent.
+     */
-/**
+    QShortcut* GetHotkey(const QString& group, const QString& action, QWidget* widget);
- * Loads hotkeys from the settings file.
- *
+    /**
- * @note Yet unregistered hotkeys which are present in the settings will automatically be
+     * Register a hotkey.
- * registered.
+     *
- */
+     * @param group General group this hotkey belongs to (e.g. "Main Window", "Debugger")
-void LoadHotkeys();
+     * @param action Name of the action (e.g. "Start Emulation", "Load Image")
+     * @param default_keyseq Default key sequence to assign if the hotkey wasn't present in the
+     *                       settings file before
+     * @param default_context Default context to assign if the hotkey wasn't present in the settings
+     *                        file before
+     * @warning Both the group and action strings will be displayed in the hotkey settings dialog
+     */
+    void RegisterHotkey(const QString& group, const QString& action,
+                        const QKeySequence& default_keyseq = {},
+                        Qt::ShortcutContext default_context = Qt::WindowShortcut);
+private:
+    struct Hotkey {
+        QKeySequence keyseq;
+        QShortcut* shortcut = nullptr;
+        Qt::ShortcutContext context = Qt::WindowShortcut;
+    };
+    using HotkeyMap = std::map<QString, Hotkey>;
+    using HotkeyGroupMap = std::map<QString, HotkeyMap>;
+    HotkeyGroupMap hotkey_groups;
+};
 class GHotkeysDialog : public QWidget {
    Q_OBJECT
@@ -59,6 +82,8 @@ class GHotkeysDialog : public QWidget {
 public:
    explicit GHotkeysDialog(QWidget* parent = nullptr);
+    void Populate(const HotkeyRegistry& registry);
 private:
    Ui::hotkeys ui;
 };
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index dd71bd763..17ed62c72 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -208,43 +208,46 @@ void GMainWindow::InitializeRecentFileMenuActions() {
 }
 void GMainWindow::InitializeHotkeys() {
-    RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
+    hotkey_registry.RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
-    RegisterHotkey("Main Window", "Start Emulation");
+    hotkey_registry.RegisterHotkey("Main Window", "Start Emulation");
-    RegisterHotkey("Main Window", "Continue/Pause", QKeySequence(Qt::Key_F4));
+    hotkey_registry.RegisterHotkey("Main Window", "Continue/Pause", QKeySequence(Qt::Key_F4));
-    RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen);
+    hotkey_registry.RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen);
-    RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence(Qt::Key_Escape),
+    hotkey_registry.RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence(Qt::Key_Escape),
-                   Qt::ApplicationShortcut);
+                                   Qt::ApplicationShortcut);
-    RegisterHotkey("Main Window", "Toggle Speed Limit", QKeySequence("CTRL+Z"),
+    hotkey_registry.RegisterHotkey("Main Window", "Toggle Speed Limit", QKeySequence("CTRL+Z"),
-                   Qt::ApplicationShortcut);
+                                   Qt::ApplicationShortcut);
-    LoadHotkeys();
+    hotkey_registry.LoadHotkeys();
-    connect(GetHotkey("Main Window", "Load File", this), &QShortcut::activated, this,
+    connect(hotkey_registry.GetHotkey("Main Window", "Load File", this), &QShortcut::activated,
-            &GMainWindow::OnMenuLoadFile);
+            this, &GMainWindow::OnMenuLoadFile);
-    connect(GetHotkey("Main Window", "Start Emulation", this), &QShortcut::activated, this,
+    connect(hotkey_registry.GetHotkey("Main Window", "Start Emulation", this),
-            &GMainWindow::OnStartGame);
+            &QShortcut::activated, this, &GMainWindow::OnStartGame);
-    connect(GetHotkey("Main Window", "Continue/Pause", this), &QShortcut::activated, this, [&] {
+    connect(hotkey_registry.GetHotkey("Main Window", "Continue/Pause", this), &QShortcut::activated,
-        if (emulation_running) {
+            this, [&] {
-            if (emu_thread->IsRunning()) {
+                if (emulation_running) {
-                OnPauseGame();
+                    if (emu_thread->IsRunning()) {
-            } else {
+                        OnPauseGame();
-                OnStartGame();
+                    } else {
-            }
+                        OnStartGame();
-        }
+                    }
-    });
+                }
-    connect(GetHotkey("Main Window", "Fullscreen", render_window), &QShortcut::activated,
+            });
-            ui.action_Fullscreen, &QAction::trigger);
+    connect(hotkey_registry.GetHotkey("Main Window", "Fullscreen", render_window),
-    connect(GetHotkey("Main Window", "Fullscreen", render_window), &QShortcut::activatedAmbiguously,
+            &QShortcut::activated, ui.action_Fullscreen, &QAction::trigger);
-            ui.action_Fullscreen, &QAction::trigger);
+    connect(hotkey_registry.GetHotkey("Main Window", "Fullscreen", render_window),
-    connect(GetHotkey("Main Window", "Exit Fullscreen", this), &QShortcut::activated, this, [&] {
+            &QShortcut::activatedAmbiguously, ui.action_Fullscreen, &QAction::trigger);
-        if (emulation_running) {
+    connect(hotkey_registry.GetHotkey("Main Window", "Exit Fullscreen", this),
-            ui.action_Fullscreen->setChecked(false);
+            &QShortcut::activated, this, [&] {
-            ToggleFullscreen();
+                if (emulation_running) {
-        }
+                    ui.action_Fullscreen->setChecked(false);
-    });
+                    ToggleFullscreen();
-    connect(GetHotkey("Main Window", "Toggle Speed Limit", this), &QShortcut::activated, this, [&] {
+                }
-        Settings::values.toggle_framelimit = !Settings::values.toggle_framelimit;
+            });
-        UpdateStatusBar();
+    connect(hotkey_registry.GetHotkey("Main Window", "Toggle Speed Limit", this),
-    });
+            &QShortcut::activated, this, [&] {
+                Settings::values.toggle_framelimit = !Settings::values.toggle_framelimit;
+                UpdateStatusBar();
+            });
 }
 void GMainWindow::SetDefaultUIGeometry() {
@@ -323,7 +326,8 @@ void GMainWindow::ConnectMenuEvents() {
    connect(ui.action_Show_Status_Bar, &QAction::triggered, statusBar(), &QStatusBar::setVisible);
    // Fullscreen
-    ui.action_Fullscreen->setShortcut(GetHotkey("Main Window", "Fullscreen", this)->key());
+    ui.action_Fullscreen->setShortcut(
+        hotkey_registry.GetHotkey("Main Window", "Fullscreen", this)->key());
    connect(ui.action_Fullscreen, &QAction::triggered, this, &GMainWindow::ToggleFullscreen);
    // Help
@@ -757,7 +761,7 @@ void GMainWindow::ToggleWindowMode() {
 }
 void GMainWindow::OnConfigure() {
-    ConfigureDialog configureDialog(this);
+    ConfigureDialog configureDialog(this, hotkey_registry);
    auto old_theme = UISettings::values.theme;
    auto result = configureDialog.exec();
    if (result == QDialog::Accepted) {
@@ -896,7 +900,7 @@ void GMainWindow::closeEvent(QCloseEvent* event) {
    UISettings::values.first_start = false;
    game_list->SaveInterfaceLayout();
-    SaveHotkeys();
+    hotkey_registry.SaveHotkeys();
    // Shutdown session if the emu thread is active...
    if (emu_thread != nullptr)
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index a60d831b9..6e335b8f8 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -9,6 +9,7 @@
 #include <QTimer>
 #include "core/core.h"
 #include "ui_main.h"
+#include "yuzu/hotkeys.h"
 class Config;
 class EmuThread;
@@ -172,6 +173,8 @@ private:
    // stores default icon theme search paths for the platform
    QStringList default_theme_paths;
+    HotkeyRegistry hotkey_registry;
 protected:
    void dropEvent(QDropEvent* event) override;
    void dragEnterEvent(QDragEnterEvent* event) override;