diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a074ea869..3a9d283dfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ message(STATUS "dusk: TP Version: ${DUSK_TP_VERSION}")
 source_group("dolzel" FILES ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${JSYSTEM_FILES} ${JSYSTEM_DEBUG_FILES} ${REL_FILES})
 source_group("dusk" FILES ${DUSK_FILES})
 
-set(GAME_COMPILE_DEFS TARGET_PC AVOID_UB=1 VERSION=0
+set(GAME_COMPILE_DEFS TARGET_PC WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0
     DUSK_TP_VERSION="${DUSK_TP_VERSION}" DUSK_GAME_NAME="${DUSK_GAME_NAME}" DUSK_GAME_VERSION="${DUSK_GAME_VERSION}")
 
 set(GAME_INCLUDE_DIRS
diff --git a/extern/aurora b/extern/aurora
index b17da31593..854ce1c178 160000
--- a/extern/aurora
+++ b/extern/aurora
@@ -1 +1 @@
-Subproject commit b17da315932b85d7d708eaf3e44914f70045a44e
+Subproject commit 854ce1c178756ca307137c81afc3cc626fce5fb3
diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h
index 62815fb3b6..525781279b 100644
--- a/include/SSystem/SComponent/c_cc_s.h
+++ b/include/SSystem/SComponent/c_cc_s.h
@@ -15,7 +15,7 @@ public:
     /* 0x0400 */ cCcD_Obj* mpObjTg[0x300];
     /* 0x1000 */ cCcD_Obj* mpObjCo[0x100];
     /* 0x1400 */ cCcD_Obj* mpObj[0x500];
-#if DEBUG
+#if TARGET_PC || DEBUG
     /* 0x2800 */ u32 m_debug_code;
 #endif
     /* 0x2800 */ u16 mObjAtCount;
diff --git a/include/d/d_bright_check.h b/include/d/d_bright_check.h
index d8686944e6..dc9ae941cf 100644
--- a/include/d/d_bright_check.h
+++ b/include/d/d_bright_check.h
@@ -29,6 +29,9 @@ public:
     void _move();
     void modeWait();
     void modeMove();
+    #if TARGET_PC
+    void brightCheckWide();
+    #endif
     void _draw();
 
     void draw() {
diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h
index 810831a830..72f7cb7f42 100644
--- a/include/d/d_file_select.h
+++ b/include/d/d_file_select.h
@@ -367,6 +367,9 @@ public:
     void menuCursorShow();
     void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
     bool yesnoWakuAlpahAnm(u8);
+    #if TARGET_PC
+    void fileSelectWide();
+    #endif
     void _draw();
     void errorMoveAnmInitSet(int, int);
     bool errorMoveAnm();
diff --git a/include/d/d_menu_collect.h b/include/d/d_menu_collect.h
index 01ee32f6d4..587fd5c103 100644
--- a/include/d/d_menu_collect.h
+++ b/include/d/d_menu_collect.h
@@ -29,6 +29,11 @@ public:
 class dMenu_Collect2D_c : public dDlst_base_c {
 public:
     dMenu_Collect2D_c(JKRExpHeap*, STControl*, CSTControl*);
+
+    #if TARGET_PC
+    void menuCollectWide();
+    #endif
+
     void _create();
     void _delete();
     void initialize();
diff --git a/include/d/d_menu_save.h b/include/d/d_menu_save.h
index a6b174bbf4..4a70d1d045 100644
--- a/include/d/d_menu_save.h
+++ b/include/d/d_menu_save.h
@@ -263,6 +263,11 @@ public:
     void setSaveData();
     void setInitSaveData();
     void _draw();
+
+    #if TARGET_PC
+    void menuSaveWide();
+    #endif
+
     void _draw2();
 
     virtual ~dMenu_save_c() {}
diff --git a/include/d/d_name.h b/include/d/d_name.h
index 0d877e6b09..e685871738 100644
--- a/include/d/d_name.h
+++ b/include/d/d_name.h
@@ -110,6 +110,11 @@ public:
     void menuCursorMove();
     void menuCursorMove2();
     void selectCursorPosSet(int);
+
+    #if TARGET_PC
+    void nameWide();
+    #endif
+
     void _draw();
     void screenSet();
     void displayInit();
diff --git a/include/dusk/hotkeys.h b/include/dusk/hotkeys.h
index c40f35925f..6e98d62521 100644
--- a/include/dusk/hotkeys.h
+++ b/include/dusk/hotkeys.h
@@ -3,7 +3,11 @@
 
 namespace dusk::hotkeys {
 
+#if __APPLE__
+constexpr const char* DO_RESET = "Cmd+R";
+#else
 constexpr const char* DO_RESET = "Ctrl+R";
+#endif
 
 constexpr const char* TOGGLE_FULLSCREEN = "F11";
 
diff --git a/include/dusk/settings.h b/include/dusk/settings.h
index cf4d79f6ac..0cb3ba60b7 100644
--- a/include/dusk/settings.h
+++ b/include/dusk/settings.h
@@ -58,6 +58,7 @@ struct UserSettings {
         // Cheats
         ConfigVar<bool> enableFastIronBoots;
         ConfigVar<bool> canTransformAnywhere;
+        ConfigVar<bool> fastSpinner;
 
         // Technical
         ConfigVar<bool> restoreWiiGlitches;
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 3d560efeb6..421e1ae47f 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -8,7 +8,7 @@
 #include <aurora/aurora.h>
 #endif
 
-#if WIDESCREEN_SUPPORT
+#if WIDESCREEN_SUPPORT && !TARGET_PC
 #define FB_WIDTH  (640)
 #define FB_HEIGHT (456)
 #else
@@ -117,6 +117,13 @@ public:
     static void setTickRate(u32 rate) { JFWDisplay::getManager()->setTickRate(rate); }
     static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); }
 
+#if TARGET_PC
+    static f32 hudAspectScaleDown;
+    static f32 hudAspectScaleUp;
+    static f32 ScaleHUDXLeft(f32 baseX) { return getMinXF() + baseX; }
+    static f32 ScaleHUDXRight(f32 baseX) { return -getMinXF() + baseX; }
+#endif
+
     static void setBlureMtx(const Mtx m) {
         cMtx_copy(m, mBlureMtx);
     }
@@ -266,7 +273,12 @@ public:
     #if WIDESCREEN_SUPPORT
     static void setTvSize();
 
+    #if TARGET_PC
+    static void onWide(f32 width, f32 height);
+    #else 
     static void onWide();
+    #endif
+
     static void offWide();
     static u8 isWide();
 
diff --git a/libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp
index 72a48007c0..3d064e33de 100644
--- a/libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp
+++ b/libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp
@@ -242,7 +242,7 @@ void J3DModelLoader::setupBBoardInfo() {
         J3DMaterial* mesh = mpModelData->getJointNodePointer(i)->getMesh();
         if (mesh != NULL) {
             u32 shape_index = mesh->getShape()->getIndex();
-            u16* index_table = JSUConvertOffsetToPtr<u16>(mpShapeBlock,
+            BE(u16)* index_table = JSUConvertOffsetToPtr<BE(u16)>(mpShapeBlock,
                                                           (uintptr_t)mpShapeBlock->mpIndexTable);
             J3DShapeInitData* shape_init_data =
                 JSUConvertOffsetToPtr<J3DShapeInitData>(mpShapeBlock,
diff --git a/libs/JSystem/src/JUtility/JUTException.cpp b/libs/JSystem/src/JUtility/JUTException.cpp
index 509acbfb3e..514ec6dd8a 100644
--- a/libs/JSystem/src/JUtility/JUTException.cpp
+++ b/libs/JSystem/src/JUtility/JUTException.cpp
@@ -101,6 +101,9 @@ JUTException* JUTException::create(JUTDirectPrint* directPrint) {
 OSMessage JUTException::sMessageBuffer[1] = {0};
 
 void* JUTException::run() {
+#ifdef TARGET_PC
+    return NULL;
+#else
     u32 msr = PPCMfmsr();
     msr &= ~0x0900;
     PPCMtmsr(msr);
@@ -132,6 +135,7 @@ void* JUTException::run() {
         sErrorManager->mDirectPrint->changeFrameBuffer(mFrameMemory);
         sErrorManager->printContext(error, context, r24, r23);
     }
+#endif
 }
 
 void* JUTException::sConsoleBuffer;
@@ -145,6 +149,7 @@ u32 JUTException::msr;
 u32 JUTException::fpscr;
 
 void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, u32 param_4) {
+#ifndef TARGET_PC
     msr = PPCMfmsr();
     fpscr = context->fpscr;
     OSFillFPUContext(context);
@@ -165,6 +170,7 @@ void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3,
     OSSendMessage(&sMessageQueue, &exCallbackObject, OS_MESSAGE_BLOCK);
     OSEnableScheduler();
     OSYieldThread();
+#endif
 }
 
 void JUTException::panic_f_va(char const* file, int line, char const* format, va_list args) {
@@ -234,6 +240,7 @@ void JUTException::showFloatSub(int index, f32 value) {
 }
 
 void JUTException::showFloat(OSContext* context) {
+#ifndef TARGET_PC
     if (!sConsole) {
         return;
     }
@@ -251,6 +258,7 @@ void JUTException::showFloat(OSContext* context) {
     sConsole->print(" ");
     showFloatSub(21, context->fpr[21]);
     sConsole->print("\n");
+#endif
 }
 
 bool JUTException::searchPartialModule(u32 address, u32* module_id, u32* section_id,
@@ -333,6 +341,7 @@ void JUTException::showStack(OSContext* context) {
 }
 
 void JUTException::showMainInfo(u16 error, OSContext* context, u32 dsisr, u32 dar) {
+#ifndef TARGET_PC
     if (!sConsole) {
         return;
     }
@@ -391,9 +400,11 @@ void JUTException::showMainInfo(u16 error, OSContext* context, u32 dsisr, u32 da
     }
     sConsole->print_f("SRR0:   %08XH   SRR1:%08XH\n", context->srr0, context->srr1);
     sConsole->print_f("DSISR:  %08XH   DAR: %08XH\n", dsisr, dar);
+#endif
 }
 
 void JUTException::showGPR(OSContext* context) {
+#ifndef TARGET_PC
     if (!sConsole) {
         return;
     }
@@ -404,6 +415,7 @@ void JUTException::showGPR(OSContext* context) {
                           context->gpr[i + 11], i + 22, context->gpr[i + 22]);
     }
     sConsole->print_f("R%02d:%08XH  R%02d:%08XH\n", 10, context->gpr[10], 21, context->gpr[21]);
+#endif
 }
 
 bool JUTException::showMapInfo_subroutine(u32 address, bool begin_with_newline) {
@@ -454,6 +466,7 @@ bool JUTException::showMapInfo_subroutine(u32 address, bool begin_with_newline)
 }
 
 void JUTException::showGPRMap(OSContext* context) {
+#ifndef TARGET_PC
     if (!sConsole) {
         return;
     }
@@ -480,9 +493,11 @@ void JUTException::showGPRMap(OSContext* context) {
     if (!found_address_register) {
         sConsole->print("  no register which seem to address.\n");
     }
+#endif
 }
 
 void JUTException::showSRR0Map(OSContext* context) {
+#ifndef TARGET_PC
     if (!sConsole) {
         return;
     }
@@ -497,6 +512,7 @@ void JUTException::showSRR0Map(OSContext* context) {
         }
         JUTConsoleManager::getManager()->drawDirect(true);
     }
+#endif
 }
 
 void JUTException::printDebugInfo(JUTException::EInfoPage page, OSError error, OSContext* context,
diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc
index 6e76280ff6..1c02cb54f0 100644
--- a/src/d/actor/d_a_alink_effect.inc
+++ b/src/d/actor/d_a_alink_effect.inc
@@ -1562,6 +1562,11 @@ void daAlink_c::setMetamorphoseEffectStartLink() {
         emitter->setGlobalParticleScale(effScale);
     }
     #endif
+
+    #if TARGET_PC
+    static const Vec effWideScale = {mDoGph_gInf_c::getAspect(), 1.0f, 1.0f};
+    emitter->setGlobalParticleScale(effWideScale);
+    #endif
 }
 
 void daAlink_c::setMetamorphoseEffect() {
diff --git a/src/d/actor/d_a_alink_swindow.inc b/src/d/actor/d_a_alink_swindow.inc
index cf3593dfce..81c7a1ca18 100644
--- a/src/d/actor/d_a_alink_swindow.inc
+++ b/src/d/actor/d_a_alink_swindow.inc
@@ -40,6 +40,9 @@ void daAlink_c::setOriginalHeap(JKRExpHeap** i_ppheap, u32 i_size) {
         u32 var_r29 = 0x90;
         u32 var_r28 = 0x10;
         u32 size = ROUND(i_size, 16);
+#if TARGET_PC
+        size *= 2;
+#endif
         JKRHeap* parent = mDoExt_getGameHeap();
 
         JKRExpHeap* heap = JKRExpHeap::create(size + (var_r29 + var_r28), parent, true);
diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp
index f38fe15a3b..43646380b3 100644
--- a/src/d/actor/d_a_player.cpp
+++ b/src/d/actor/d_a_player.cpp
@@ -237,11 +237,7 @@ void* daPy_anmHeap_c::mallocBuffer() {
     return mBuffer;
 }
 
-#if TARGET_PC
 void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType, const char* name) {
-#else
-void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType, const char* name) {
-#endif
     u32 size;
 
     if (i_heapType == 4) {
@@ -255,6 +251,9 @@ void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType, con
     } else {
         size = 0xA0;
     }
+#if TARGET_PC
+    size *= 2;
+#endif
 
     char* tmpWork;
     mDoExt_transAnmBas* tmpTransBas;
diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp
index 36f24ebd72..ac28e46838 100644
--- a/src/d/d_bright_check.cpp
+++ b/src/d/d_bright_check.cpp
@@ -143,7 +143,56 @@ void dBrightCheck_c::modeMove() {
     }
 }
 
+#if TARGET_PC
+void dBrightCheck_c::brightCheckWide() {
+    // Main Canvas
+    mBrightCheck.Scr->scale(mDoGph_gInf_c::hudAspectScaleUp, 1.0f);
+    mBrightCheck.Scr->translate(mDoGph_gInf_c::getMinXF(), 0.0f);
+
+    // Right Square
+    mBrightCheck.Scr->search(MULTI_CHAR('fuchi_1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('big_squa'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Middle Square
+    mBrightCheck.Scr->search(MULTI_CHAR('fuchi_3'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('big_squ1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Left Square
+    mBrightCheck.Scr->search(MULTI_CHAR('fuchi_4'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('big_squ2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Gray Squares
+    mBrightCheck.Scr->search(MULTI_CHAR('gray_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('fuchi_2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Confirm A Button
+    mBrightCheck.Scr->search(MULTI_CHAR('abtn_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('gcabtn_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Text
+    mBrightCheck.Scr->search(MULTI_CHAR('menu_6n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('menu_9n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('menu_10n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('menu_7n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('menu_8n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('fmenu_8n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('fmenu_7n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('fmenu_10'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('fmenu_6n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('fmenu_9n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Spirals
+    mBrightCheck.Scr->search(MULTI_CHAR('t_mo_l_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mBrightCheck.Scr->search(MULTI_CHAR('t_mo_r_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+}
+#endif
+
 void dBrightCheck_c::_draw() {
+    #if TARGET_PC
+    brightCheckWide();
+    #endif
     dComIfGd_set2DOpa(&mBrightCheck);
 }
 
diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp
index 16aafb721f..f63403d886 100644
--- a/src/d/d_file_select.cpp
+++ b/src/d/d_file_select.cpp
@@ -70,7 +70,11 @@ dFs_HIO_c::dFs_HIO_c() {
     select_icon_appear_frames = 5;
     appear_display_wait_frames = 15;
     field_0x000d = 15;
+    #if TARGET_PC
+    card_wait_frames = 0;
+    #else
     card_wait_frames = 90;
+    #endif
     test_frame_counts[0] = 1.11f;
     test_frame_counts[1] = 1.11f;
     test_frame_counts[2] = 1.11f;
@@ -2091,7 +2095,12 @@ void dFile_select_c::yesnoCursorShow() {
         Vec pos = mYnSelPane[field_0x0268]->getGlobalVtxCenter(0, 0);
         mSelIcon->setPos(pos.x, pos.y, mYnSelPane[field_0x0268]->getPanePtr(), true);
         mSelIcon->setAlphaRate(1.0f);
+
+        #if TARGET_PC
+        mSelIcon->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.84f, 0.06f, 0.5f, 0.5f);
+        #else
         mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f);
+        #endif
     }
 }
 
@@ -2243,7 +2252,12 @@ void dFile_select_c::YesNoCancelMove() {
                 mSelIcon->setPos(vtxCenter.x, vtxCenter.y,
                                  m3mSelPane[mSelectMenuNum]->getPanePtr(), true);
                 mSelIcon->setAlphaRate(1.0f);
+
+                #if TARGET_PC
+                mSelIcon->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.84f, 0.06f, 0.5f, 0.5f);
+                #else
                 mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f);
+                #endif
 
                 #if PLATFORM_WII || PLATFORM_SHIELD
                 field_0x4333 = mSelectMenuNum;
@@ -3126,7 +3140,13 @@ void dFile_select_c::screenSet() {
 
     mSelIcon = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL);
     JUT_ASSERT(5209, mSelIcon != NULL);
+
+    #if TARGET_PC
+    mSelIcon->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.94f, 0.03f, 0.7f, 0.7f);
+    #else
     mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f);
+    #endif
+
     Vec vtxCenter;
     vtxCenter = mSelFilePanes[mSelectNum]->getGlobalVtxCenter(false, 0);
     mSelIcon->setPos(vtxCenter.x, vtxCenter.y, mSelFilePanes[mSelectNum]->getPanePtr(), true);
@@ -3257,7 +3277,13 @@ void dFile_select_c::screenSetCopySel() {
 
     mSelIcon2 = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL);
     JUT_ASSERT(5406, mSelIcon2 != NULL);
+
+    #if TARGET_PC
+    mSelIcon2->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.94f, 0.03f, 0.7f, 0.7f);
+    #else
     mSelIcon2->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f);
+    #endif
+
     Vec center = mCpSelPane[0]->getGlobalVtxCenter(false, 0);
     mSelIcon2->setPos(center.x, center.y, mCpSelPane[0]->getPanePtr(), true);
     mSelIcon2->setAlphaRate(0.0f);
@@ -3647,7 +3673,12 @@ void dFile_select_c::selFileCursorShow() {
     Vec local_1c = mSelFilePanes[mSelectNum]->getGlobalVtxCenter(false, 0);
     mSelIcon->setPos(local_1c.x, local_1c.y, mSelFilePanes[mSelectNum]->getPanePtr(), true);
     mSelIcon->setAlphaRate(1.0f);
+
+    #if TARGET_PC
+    mSelIcon->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.94f, 0.03f, 0.7f, 0.7f);
+    #else
     mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f);
+    #endif
 }
 
 void dFile_select_c::menuWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8 param_3) {
@@ -3689,7 +3720,12 @@ void dFile_select_c::menuCursorShow() {
         Vec local_24 = m3mSelPane[mSelectMenuNum]->getGlobalVtxCenter(false, 0);
         mSelIcon->setPos(local_24.x, local_24.y, m3mSelPane[mSelectMenuNum]->getPanePtr(), true);
         mSelIcon->setAlphaRate(1.0f);
+
+        #if TARGET_PC
+        mSelIcon->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.84f, 0.06f, 0.5f, 0.5f);
+        #else
         mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f);
+        #endif
     }
 }
 
@@ -3731,7 +3767,74 @@ bool dFile_select_c::yesnoWakuAlpahAnm(u8 param_1) {
     return rv;
 }
 
+#if TARGET_PC
+void dFile_select_c::fileSelectWide() {
+    mYnSel.ScrYn->scale(mDoGph_gInf_c::hudAspectScaleUp, 1.0f);
+    mYnSel.ScrYn->translate(mDoGph_gInf_c::getMinXF(), 0.0f);
+
+    mYnSel.ScrYn->search(MULTI_CHAR('w_no_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mYnSel.ScrYn->search(MULTI_CHAR('f_no_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mYnSel.ScrYn->search(MULTI_CHAR('w_yes_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mYnSel.ScrYn->search(MULTI_CHAR('f_yes_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    m3mSel.Scr3m->scale(mDoGph_gInf_c::hudAspectScaleUp, 1.0f);
+    m3mSel.Scr3m->translate(mDoGph_gInf_c::getMinXF(), 0.0f);
+
+    m3mSel.Scr3m->search(MULTI_CHAR('w_sta'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    m3mSel.Scr3m->search(MULTI_CHAR('f_sta'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    m3mSel.Scr3m->search(MULTI_CHAR('w_del'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    m3mSel.Scr3m->search(MULTI_CHAR('f_del'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    m3mSel.Scr3m->search(MULTI_CHAR('w_cop_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    m3mSel.Scr3m->search(MULTI_CHAR('f_cop_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    fileSel.Scr->scale(mDoGph_gInf_c::hudAspectScaleUp, 1.0f);
+    fileSel.Scr->translate(mDoGph_gInf_c::getMinXF(), 0.0f);
+
+    fileSel.Scr->search(MULTI_CHAR('t_for'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('t_for1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    fileSel.Scr->search(MULTI_CHAR('w_btn_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    fileSel.Scr->search(MULTI_CHAR('w_n_bk00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_n_bk01'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_n_bk02'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    fileSel.Scr->search(MULTI_CHAR('w_dat_i0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_dat_i1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_dat_i2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    mCpSel.Scr->search(MULTI_CHAR('w_dat_i1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mCpSel.Scr->search(MULTI_CHAR('w_dat_i2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mCpSel.Scr->search(MULTI_CHAR('w_n_bk01'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mCpSel.Scr->search(MULTI_CHAR('w_n_bk02'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    mSelDt.ScrDt->search(MULTI_CHAR('tate_n0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSelDt.ScrDt->search(MULTI_CHAR('tate_n1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSelDt.ScrDt->search(MULTI_CHAR('ken_n0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSelDt.ScrDt->search(MULTI_CHAR('ken_n1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSelDt.ScrDt->search(MULTI_CHAR('fuku_n0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSelDt.ScrDt->search(MULTI_CHAR('fuku_n1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSelDt.ScrDt->search(MULTI_CHAR('fuku_n2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Spirals
+    fileSel.Scr->search(MULTI_CHAR('w_uzu00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu01'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu02'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu03'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu04'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu05'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu06'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu07'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu08'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    fileSel.Scr->search(MULTI_CHAR('w_uzu09'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+}
+#endif
+
 void dFile_select_c::_draw() {
+    #if TARGET_PC
+    fileSelectWide();
+    #endif
+
     if (!mHasDrawn) {
         dComIfGd_set2DOpa(&fileSel);
 
diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp
index 379b55f532..b93ab14211 100644
--- a/src/d/d_k_wmark.cpp
+++ b/src/d/d_k_wmark.cpp
@@ -6,6 +6,7 @@
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_k_wmark.h"
+#include "dusk/memory.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/actor/d_a_player.h"
@@ -33,7 +34,7 @@ int dkWmark_c::create() {
         mColorType = this->parameters;
     }
 
-    mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x880, 0x20);
+    mpHeap = mDoExt_createSolidHeapFromGameToCurrent(HEAP_SIZE(0x880, 0x1100), 0x20);
     if (mpHeap != NULL) {
         JKRHEAP_NAME(mpHeap, "dkWmark_c::mpHeap");
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x23);
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 50f9d716fc..b9262bab23 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -1,6 +1,7 @@
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_kankyo.h"
+#include "dusk/memory.h"
 #ifdef __REVOLUTION_SDK__
 #include <revolution.h>
 #else
@@ -775,7 +776,7 @@ static void dKy_FiveSenses_fullthrottle_dark_static1() {
     particle_size.y = 1.0f;
     particle_size.z = 1.0f;
 
-    #if !PLATFORM_GCN
+    #if !PLATFORM_GCN || TARGET_PC
     particle_size.x *= mDoGph_gInf_c::getScale();
     #endif
 
@@ -1175,7 +1176,7 @@ static void undwater_init() {
     J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Always", 0x1D);
     JUT_ASSERT(1867, modelData2 != NULL);
 
-    g_env_light.undwater_ef_heap = mDoExt_createSolidHeapFromGameToCurrent(0x600, 0x20);
+    g_env_light.undwater_ef_heap = mDoExt_createSolidHeapFromGameToCurrent(HEAP_SIZE(0x600, 0xC00), 0x20);
     JKRHEAP_NAME(g_env_light.undwater_ef_heap, "g_env_light.undwater_ef_heap");
 
     if (g_env_light.undwater_ef_heap != NULL) {
diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp
index c1281a86c2..ed5586e866 100644
--- a/src/d/d_menu_collect.cpp
+++ b/src/d/d_menu_collect.cpp
@@ -95,6 +95,78 @@ dMenu_Collect2D_c::~dMenu_Collect2D_c() {
     }
 }
 
+#if TARGET_PC
+void dMenu_Collect2D_c::menuCollectWide() {
+    // Main Canvas
+    mpScreen->scale(mDoGph_gInf_c::hudAspectScaleUp, 1.0f);
+    mpScreen->translate(mDoGph_gInf_c::getMinXF(), 0.0f);
+
+    // Pieces of Heart
+    mpScreen->search(MULTI_CHAR('heart_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Scents
+    mpScreen->search(MULTI_CHAR('wolf_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Quiver
+    mpScreen->search(MULTI_CHAR('item_0_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Wallet
+    mpScreen->search(MULTI_CHAR('item_1_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Poes
+    mpScreen->search(MULTI_CHAR('item_2_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Fish Bestiary
+    mpScreen->search(MULTI_CHAR('fish_3_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Letters
+    mpScreen->search(MULTI_CHAR('lett_4_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Hidden Skills
+    mpScreen->search(MULTI_CHAR('maki_5_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Green Tunic
+    mpScreen->search(MULTI_CHAR('fuku_n0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Zora Armor
+    mpScreen->search(MULTI_CHAR('fuku_n1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Magic Armor
+    mpScreen->search(MULTI_CHAR('fuku_n2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Ordon Shield
+    mpScreen->search(MULTI_CHAR('tate_n0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Hylian Shield
+    mpScreen->search(MULTI_CHAR('tate_n1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Ordon Sword
+    mpScreen->search(MULTI_CHAR('ken_n0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Master Sword
+    mpScreen->search(MULTI_CHAR('ken_n1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Bugs
+    mpScreen->search(MULTI_CHAR('kabu_6n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // "Collection" Text
+    mpScreen->search(MULTI_CHAR('t_t00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mpScreen->search(MULTI_CHAR('f_t00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // "Save" Text
+    mpScreen->search(MULTI_CHAR('sa_tex_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // "Options" Text
+    mpScreen->search(MULTI_CHAR('op_tex_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Item Name Text
+    mpScreen->search(MULTI_CHAR('itemn_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Item Description Text
+    mpScreen->search(MULTI_CHAR('infotxtn'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+}
+#endif
+
 void dMenu_Collect2D_c::_create() {
     mpHeap->getTotalFreeSize();
     mpScreen = JKR_NEW J2DScreen();
@@ -108,7 +180,17 @@ void dMenu_Collect2D_c::_create() {
         mpButtonAB[i] = NULL;
         mpButtonText[i] = NULL;
     }
+
+    #if TARGET_PC
+    mpScreenIcon->translate(-mDoGph_gInf_c::getMinXF(), 0.0f);
+    #endif
+
     dPaneClass_showNullPane(mpScreenIcon);
+
+    #if TARGET_PC
+    menuCollectWide();
+    #endif
+
     mpDraw2DTop = JKR_NEW dMenu_Collect2DTop_c(this);
     ResTIMG* image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti");
     mpBlackTex = JKR_NEW J2DPicture(image);
@@ -1004,11 +1086,23 @@ void dMenu_Collect2D_c::cursorPosSet() {
     Vec pos = mpSelPm[mCursorX][mCursorY]->getGlobalVtxCenter(false, 0);
     mpDrawCursor->setPos(pos.x, pos.y, mpSelPm[mCursorX][mCursorY]->getPanePtr(), false);
     if (mCursorY == 5) {
+        #if TARGET_PC
+        mpDrawCursor->setParam(1.1f * mDoGph_gInf_c::hudAspectScaleUp, 0.85f, 0.05f, 0.5f, 0.5f);
+        #else
         mpDrawCursor->setParam(1.1f, 0.85f, 0.05f, 0.5f, 0.5f);
+        #endif
     } else if (mCursorX == 6 && mCursorY == 0) {
+        #if TARGET_PC
+        mpDrawCursor->setParam(0.6f * mDoGph_gInf_c::hudAspectScaleUp, 0.85f, 0.03f, 0.6f, 0.6f);
+        #else
         mpDrawCursor->setParam(0.6f, 0.85f, 0.03f, 0.6f, 0.6f);
+        #endif
     } else {
+        #if TARGET_PC
+        mpDrawCursor->setParam(1.0f * mDoGph_gInf_c::hudAspectScaleUp, 1.0f, 0.1f, 0.7f, 0.7f);
+        #else
         mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.7f, 0.7f);
+        #endif
     }
 }
 
@@ -2028,6 +2122,10 @@ void dMenu_Collect2D_c::_move() {
 
 
 void dMenu_Collect2D_c::_draw() {
+    #if TARGET_PC
+    menuCollectWide();
+    #endif
+
     J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort();
     grafPort->setup2D();
     mpScreen->draw(0.0f, 0.0f, grafPort);
@@ -2555,7 +2653,7 @@ f32 dMenu_Collect3D_c::mViewOffsetY = -100.0f;
 
 void dMenu_Collect3D_c::setupItem3D(Mtx param_0) {
 #if TARGET_PC
-    f32 scaleFactor = mDoGph_gInf_c::getWidth() / FB_WIDTH; // TODO: get display pixel density from aurora
+    f32 scaleFactor = mDoGph_gInf_c::getHeight() / FB_HEIGHT;
     GXSetViewport(0.0f, mViewOffsetY * scaleFactor, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), 0.0f, 1.0f);
 #else
     GXSetViewport(0.0f, mViewOffsetY, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f);
diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp
index 97721d9dd2..739dfc7843 100644
--- a/src/d/d_menu_dmap.cpp
+++ b/src/d/d_menu_dmap.cpp
@@ -864,7 +864,16 @@ void dMenu_DmapBg_c::draw() {
     J2DOrthoGraph* grafContext = (J2DOrthoGraph*)dComIfGp_getCurrentGrafPort();
     grafContext->setup2D();
 
+#if TARGET_PC
+    // GXGetScissor uses 11-bit GC register fields (max 2047) which overflow
+    // at window widths > ~1705px, producing garbage values on restore.
+    scissor_left = 0;
+    scissor_top = 0;
+    scissor_width = (u32)mDoGph_gInf_c::getWidth();
+    scissor_height = (u32)mDoGph_gInf_c::getHeight();
+#else
     GXGetScissor(&scissor_left, &scissor_top, &scissor_width, &scissor_height);
+#endif
 #if TARGET_PC
     grafContext->scissor(field_0xd94, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
 #else
@@ -876,8 +885,8 @@ void dMenu_DmapBg_c::draw() {
     dMenu_Dmap_c::myclass->drawFloorScreenBack(mFloorScreen, field_0xd94, field_0xd98, grafContext);
 
 #if TARGET_PC
-    f32 dVar21 = mDoGph_gInf_c::getWidth() / FB_WIDTH;
-    f32 dVar16 = mDoGph_gInf_c::getHeight() / FB_HEIGHT;
+    f32 dVar21 = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth();
+    f32 dVar16 = mDoGph_gInf_c::getHeightF() / mDoGph_gInf_c::getHeight();
 #else
     f32 dVar21 = mDoGph_gInf_c::getWidthF() / FB_WIDTH;
     f32 dVar16 = mDoGph_gInf_c::getHeightF() / FB_HEIGHT;
@@ -890,8 +899,15 @@ void dMenu_DmapBg_c::draw() {
         Mtx mtx;
         Vec local_200 = pane.getGlobalVtx(center_pane, &mtx, 0, false, 0);
         Vec local_20c = pane.getGlobalVtx(center_pane, &mtx, 3, false, 0);
+#if TARGET_PC
+        grafContext->scissor(((local_200.x - mDoGph_gInf_c::getMinXF()) / dVar21),
+                             ((local_200.y - mDoGph_gInf_c::getMinYF()) / dVar16),
+                             ((local_20c.x - local_200.x) / dVar21),
+                             (2.0f + (local_20c.y - local_200.y)) / dVar16);
+#else
         grafContext->scissor(((local_200.x - mDoGph_gInf_c::getMinXF()) / dVar21), ((local_200.y / dVar16) / dVar16),
                              ((local_20c.x - local_200.x) / dVar21), 2.0f + (local_20c.y - local_200.y));
+#endif
         grafContext->setScissor();
 
         f32 dVar17 = field_0xd8c / 255.0f;
@@ -925,10 +941,17 @@ void dMenu_DmapBg_c::draw() {
     Mtx local_110;
     Vec local_218 = pane.getGlobalVtx(center_pane, &local_110, 0, false, 0);
     Vec local_224 = pane.getGlobalVtx(center_pane, &local_110, 3, false, 0);
+#if TARGET_PC
+    f32 local_294 = ((local_218.x - mDoGph_gInf_c::getMinXF()) / dVar21);
+    f32 local_298 = ((local_218.y - mDoGph_gInf_c::getMinYF()) / dVar16);
+    f32 local_29c = ((local_224.x - local_218.x) / dVar21);
+    f32 local_2a0 = (2.0f + (local_224.y - local_218.y)) / dVar16;
+#else
     f32 local_294 = ((local_218.x - mDoGph_gInf_c::getMinXF()) / dVar21);
     f32 local_298 = ((local_218.y / dVar16) / dVar16);
     f32 local_29c = ((local_224.x - local_218.x) / dVar21);
     f32 local_2a0 = 2.0f + (local_224.y - local_218.y);
+#endif
     grafContext->scissor(local_294, local_298, local_29c, local_2a0);
     grafContext->setScissor();
 
diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp
index 189ce57e0f..615323767b 100644
--- a/src/d/d_menu_fishing.cpp
+++ b/src/d/d_menu_fishing.cpp
@@ -114,7 +114,14 @@ void dMenu_Fishing_c::_draw() {
     if (mpArchive) {
         J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort();
         mpBlackTex->setAlpha(0xff);
+
+        #if TARGET_PC
+        mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
+                         mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
+        #else
         mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
+        #endif
+
         mpScreen->draw(0.0f, 0.0f, grafPort);
         mpIconScreen->draw(0.0f, 0.0f, grafPort);
     }
diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp
index 29ec5db854..c9ab812400 100644
--- a/src/d/d_menu_fmap2D.cpp
+++ b/src/d/d_menu_fmap2D.cpp
@@ -359,7 +359,11 @@ void dMenu_Fmap2DBack_c::draw() {
         drawDebugRegionArea();
     }
 
+#if TARGET_PC
+    grafPort->scissor(scissorLeft, scissorTop, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
+#else
     grafPort->scissor(scissorLeft, scissorTop, scissorWidth, scissorHeight);
+#endif
     grafPort->setScissor();
 
     if (isArrowDrawFlag()) {
@@ -1191,7 +1195,7 @@ f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeX() {
 }
 
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeRealX() {
-#if PLATFORM_GCN
+#if PLATFORM_GCN && !TARGET_PC
     return getMapScissorAreaSizeX();
 #else
     return getMapScissorAreaSizeX() * mDoGph_gInf_c::getScale();
diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp
index 82be9287b6..7558fe61b4 100644
--- a/src/d/d_menu_insect.cpp
+++ b/src/d/d_menu_insect.cpp
@@ -161,12 +161,26 @@ void dMenu_Insect_c::_draw() {
     if (mpArchive != NULL) {
         J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort();
         mpBlackTex->setAlpha(0xff);
+
+        #if TARGET_PC
+        mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
+                         mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
+        #else
         mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
+        #endif
+
         mpScreen->draw(0.0f, 0.0f, grafPort);
         mpDrawCursor->draw();
         field_0xfc = mpExpParent->getAlphaRate() * 150.0f;
         mpBlackTex->setAlpha(field_0xfc);
+
+        #if TARGET_PC
+        mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
+                         mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
+        #else
         mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
+        #endif
+
         mpExpScreen->draw(0.0f, 0.0f, grafPort);
         mpSelect_c->setOffsetX(g_drawHIO.mInsectListScreen.mConfirmOptionPosX_4x3);
         mpSelect_c->translate(g_drawHIO.mInsectListScreen.mConfirmOptionPosX_4x3 + 486.0f,
diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp
index 21a3a32fdd..c106b4bd8c 100644
--- a/src/d/d_menu_item_explain.cpp
+++ b/src/d/d_menu_item_explain.cpp
@@ -310,7 +310,12 @@ void dMenu_ItemExplain_c::draw(J2DOrthoGraph* i_graph) {
         mpLabel->scale(g_ringHIO.mItemDescTitleScale, g_ringHIO.mItemDescTitleScale);
         mpLabel->paneTrans(g_ringHIO.mItemDescTitlePosX, g_ringHIO.mItemDescTitlePosY);
         if (mpBackTex != NULL) {
+            #if TARGET_PC
+            mpBackTex->draw(mDoGph_gInf_c::ScaleHUDXLeft(0.0f), 0.0f, mDoGph_gInf_c::getWidthF(),
+                            FB_HEIGHT, false, false, false);
+            #else
             mpBackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, false, false, false);
+            #endif
         }
         if (field_0xc8 != field_0xd0) {
             field_0xd0 = field_0xc8;
diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp
index abe9f864ce..9384bc06b9 100644
--- a/src/d/d_menu_option.cpp
+++ b/src/d/d_menu_option.cpp
@@ -555,13 +555,25 @@ void dMenu_Option_c::_draw() {
         #endif
 
         mpBlackTex->setAlpha(0xff);
+#if TARGET_PC
+        mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
+#else
         mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
+#endif
         mpBackScreen->draw(0.0f, 0.0f, ctx);
         f32 alpha = (f32)g_drawHIO.mOptionScreen.mBackgroundAlpha * (f32)field_0x374;
         mpBlackTex->setAlpha(alpha);
+#if TARGET_PC
+        mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
+#else
         mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
+#endif
         mpScreen->draw(0.0f, 0.0f, ctx);
         mpClipScreen->draw(0.0f, 0.0f, ctx);
+#if TARGET_PC
+        ctx->scissor(0.0f, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
+        ctx->setScissor();
+#endif
         mpShadowScreen->draw(0.0f, 0.0f, ctx);
         if (field_0x3f3 == 1 || field_0x3f3 == 2 || field_0x3f3 == 3) {
             mpTVScreen->draw(0.0f, 0.0f, ctx);
diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp
index ef1fb9d61e..eb7b6a35b8 100644
--- a/src/d/d_menu_save.cpp
+++ b/src/d/d_menu_save.cpp
@@ -56,7 +56,11 @@ static dMs_HIO_c g_msHIO;
 
 dMs_HIO_c::dMs_HIO_c() {
     mDisplayWaitFrames = 15;
+    #if TARGET_PC
+    mCardWaitFrames = 0;
+    #else
     mCardWaitFrames = 90;
+    #endif
     mEffectDispFrames = 5;
     mCharSwitchFrames = 5;
     mSelectIcon = 5;
@@ -384,7 +388,12 @@ void dMenu_save_c::screenSet() {
 
     mSelectedFile = dComIfGs_getDataNum();
     mSelIcon = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL);
+
+    #if TARGET_PC
+    mSelIcon->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.94f, 0.03f, 0.7f, 0.7f);
+    #else
     mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f);
+    #endif
 
     Vec pos;
     pos = mpSelData[mSelectedFile]->getGlobalVtxCenter(false, 0);
@@ -2516,7 +2525,12 @@ void dMenu_save_c::yesnoCursorShow() {
         Vec pos = mpNoYes[mYesNoCursor]->getGlobalVtxCenter(false, 0);
         mSelIcon->setPos(pos.x, pos.y, mpNoYes[mYesNoCursor]->getPanePtr(), true);
         mSelIcon->setAlphaRate(1.0f);
+
+        #if TARGET_PC
+        mSelIcon->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.84f, 0.06f, 0.5f, 0.5f);
+        #else
         mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f);
+        #endif
     }
 }
 
@@ -2664,7 +2678,12 @@ void dMenu_save_c::selFileCursorShow() {
     Vec pos = mpSelData[mSelectedFile]->getGlobalVtxCenter(false, 0);
     mSelIcon->setPos(pos.x, pos.y, mpSelData[mSelectedFile]->getPanePtr(), true);
     mSelIcon->setAlphaRate(1.0f);
+
+    #if TARGET_PC
+    mSelIcon->setParam(0.96f * mDoGph_gInf_c::hudAspectScaleUp, 0.94f, 0.03f, 0.7f, 0.7f);
+    #else
     mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f);
+    #endif
 }
 
 void dMenu_save_c::yesnoWakuAlpahAnmInit(u8 yesnoIdx, u8 startAlpha, u8 endAlpha, u8 anmTimer) {
@@ -2763,6 +2782,43 @@ void dMenu_save_c::_draw() {
     }
 }
 
+#if TARGET_PC
+void dMenu_save_c::menuSaveWide() {
+    mSaveSel.Scr->scale(mDoGph_gInf_c::hudAspectScaleUp, 1.0f);
+    mSaveSel.Scr->translate(mDoGph_gInf_c::getMinXF(), 0.0f);
+
+    mSaveSel.Scr->search(MULTI_CHAR('t_for'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('t_for1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    mSaveSel.Scr->search(MULTI_CHAR('w_btn_n'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    mSaveSel.Scr->search(MULTI_CHAR('w_n_bk00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_n_bk01'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_n_bk02'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    mSaveSel.Scr->search(MULTI_CHAR('w_dat_i0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_dat_i1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_dat_i2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    mSaveSel.Scr->search(MULTI_CHAR('w_no_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('f_no_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_yes_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('f_yes_t'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Spirals
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu01'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu02'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu03'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu04'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu05'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu06'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu07'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu08'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    mSaveSel.Scr->search(MULTI_CHAR('w_uzu09'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+}
+#endif
+
 void dMenu_save_c::_draw2() {
     if (field_0x21a1 == 0) {
         if (mpScrnExplain != NULL) {
@@ -2770,6 +2826,10 @@ void dMenu_save_c::_draw2() {
         }
 
         if (mDisplayMenu) {
+            #if TARGET_PC
+            menuSaveWide();
+            #endif
+
             dComIfGd_set2DOpa(&mSaveSel);
 
             for (int i = 0; i < 3; i++) {
diff --git a/src/d/d_menu_skill.cpp b/src/d/d_menu_skill.cpp
index cc22e136c7..78ab82af94 100644
--- a/src/d/d_menu_skill.cpp
+++ b/src/d/d_menu_skill.cpp
@@ -143,12 +143,26 @@ void dMenu_Skill_c::_draw() {
         J2DGrafContext* context = dComIfGp_getCurrentGrafPort();
         u8 alpha = mpBlackTex->mAlpha;
         mpBlackTex->setAlpha(0xff);
+
+        #if TARGET_PC
+        mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
+                         mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
+        #else
         mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
+        #endif
+
         mpBlackTex->setAlpha(alpha);
         mpMenuScreen->draw(mPosX, 0.0f, context);
         mpDrawCursor->draw();
         if (mProcess == 1 || mProcess == 2 || mProcess == 3) {
+
+            #if TARGET_PC
+            mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
+                             mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
+            #else
             mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
+            #endif
+
             mpLetterScreen->draw(0.0f, 0.0f, context);
             if (mStringID != 0) {
                 mpString->getString(mStringID, (J2DTextBox*)mpTextPane->getPanePtr(), NULL, NULL,
diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp
index 3e173049bd..e9131462c3 100644
--- a/src/d/d_menu_window.cpp
+++ b/src/d/d_menu_window.cpp
@@ -1507,7 +1507,11 @@ void dMw_c::checkMemSize() {
 
         OS_REPORT("memory check ===> diff ==> %d, start ==> %d, now ==> %d\n", diff, mMemSize, now_size);
 
+#if TARGET_PC
+        if (diff > 0x40) {
+#else
         if (diff > 0x20) {
+#endif
             OSReport_Error("memory free error!!\n");
         }
         mMemSize = 0;
diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp
index f222ee752a..58c6e24dc9 100644
--- a/src/d/d_meter2_draw.cpp
+++ b/src/d/d_meter2_draw.cpp
@@ -564,6 +564,7 @@ void dMeter2Draw_c::exec(u32 i_status) {
         {
             mButtonsPosX = g_drawHIO.mMainHUDButtonsPosX;
             mButtonsPosY = g_drawHIO.mMainHUDButtonsPosY;
+
             mpButtonParent->paneTrans(g_drawHIO.mMainHUDButtonsPosX, g_drawHIO.mMainHUDButtonsPosY);
         }
 
@@ -1589,7 +1590,9 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) {
     mpMagicFrameR->move(field_0x59c[i_meterType], field_0x5a8[i_meterType]);
     mpMagicBase->resize(field_0x5b4[i_meterType], field_0x5c0[i_meterType]);
     mpMagicParent->scale(field_0x5cc[i_meterType], field_0x5d8[i_meterType]);
+
     mpMagicParent->paneTrans(field_0x5e4[i_meterType], field_0x5f0[i_meterType]);
+
     mpKanteraScreen->draw(0.0f, 0.0f, graf_ctx);
 }
 
@@ -1854,6 +1857,7 @@ void dMeter2Draw_c::drawLightDrop(u8 i_num, u8 i_needNum, f32 i_posX, f32 i_posY
     mLightDropVesselScale = i_vesselScale;
     mpLightDropParent->scale(mLightDropVesselScale * field_0x6f8,
                              mLightDropVesselScale * field_0x6f8);
+
     mpLightDropParent->paneTrans(i_posX, i_posY);
 }
 
@@ -2001,6 +2005,7 @@ void dMeter2Draw_c::drawRupee(s16 i_rupeeNum) {
 
     mpRupeeKeyParent->scale(g_drawHIO.mRupeeKeyScale * field_0x718,
                             g_drawHIO.mRupeeKeyScale * field_0x718);
+
     mpRupeeKeyParent->paneTrans(g_drawHIO.mRupeeKeyPosX, g_drawHIO.mRupeeKeyPosY);
 
     mpRupeeParent[0]->scale(g_drawHIO.mRupeeScale, g_drawHIO.mRupeeScale);
@@ -2582,6 +2587,7 @@ void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) {
     mpButtonCrossParent->scale(g_drawHIO.mButtonCrossScale, g_drawHIO.mButtonCrossScale);
     mpTextI->scale(g_drawHIO.mButtonCrossTextScale, g_drawHIO.mButtonCrossTextScale);
     mpTextM->scale(g_drawHIO.mButtonCrossTextScale, g_drawHIO.mButtonCrossTextScale);
+
     mpButtonCrossParent->paneTrans(i_posX, i_posY);
 }
 
diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp
index 3e8d2601c1..820e65dc0d 100644
--- a/src/d/d_meter2_info.cpp
+++ b/src/d/d_meter2_info.cpp
@@ -1868,12 +1868,16 @@ f32 dMeter2Info_getWide2DPosX(f32* param_0) {
 }
 
 void dMeter2Info_onWide2D() {
+#if !TARGET_PC
     g_ringHIO.updateOnWide();
+#endif
     g_drawHIO.updateOnWide();
 }
 
 void dMeter2Info_offWide2D() {
+#if !TARGET_PC
     g_ringHIO.updateOffWide();
+#endif
     g_drawHIO.updateOffWide();
 }
 #endif
diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp
index 685f9c580c..94b1c79420 100644
--- a/src/d/d_meter_HIO.cpp
+++ b/src/d/d_meter_HIO.cpp
@@ -2287,7 +2287,18 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
 }
 
 #if WIDESCREEN_SUPPORT
-void dMeter_drawHIO_c::updateOnWide() {}
+void dMeter_drawHIO_c::updateOnWide() {
+#if TARGET_PC
+    g_drawHIO = {}; // this might be a bad idea
+
+    g_drawHIO.mMainHUDButtonsPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mMainHUDButtonsPosX);
+    g_drawHIO.mRupeeKeyPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mRupeeKeyPosX);
+    g_drawHIO.mButtonCrossOFFPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mButtonCrossOFFPosX);
+    g_drawHIO.mButtonCrossONPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mButtonCrossONPosX);
+    g_drawHIO.mLifeGaugePosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mLifeGaugePosX);
+    g_drawHIO.mLanternMeterPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mLanternMeterPosX);
+#endif
+}
 
 void dMeter_drawHIO_c::updateOffWide() {}
 #endif
@@ -3003,7 +3014,7 @@ void dMeter_drawHIO_c::updateFMsgDebug() {
 #endif
 
 dMeter_ringHIO_c::dMeter_ringHIO_c() {
-#if WIDESCREEN_SUPPORT
+#if WIDESCREEN_SUPPORT && !TARGET_PC
     updateOnWide();
 #else
     mRingRadiusH = 175.0f;
diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp
index 7e55d899fd..6b78e2242b 100644
--- a/src/d/d_meter_map.cpp
+++ b/src/d/d_meter_map.cpp
@@ -628,7 +628,13 @@ void dMeterMap_c::draw() {
         #endif
         mMapJ2DPicture->setAlpha(alpha);
 
+        #if TARGET_PC
+        mMapJ2DPicture->draw(mDoGph_gInf_c::ScaleHUDXLeft(drawPosX), drawPosY, sizeX, sizeY, false,
+                             false, false);
+        #else
         mMapJ2DPicture->draw(drawPosX, drawPosY, sizeX, sizeY, false, false, false);
+        #endif
+
         mMapJ2DPicture->calcMtx();
     }
 }
diff --git a/src/d/d_msg_scrn_place.cpp b/src/d/d_msg_scrn_place.cpp
index 881852c259..b2c28efc95 100644
--- a/src/d/d_msg_scrn_place.cpp
+++ b/src/d/d_msg_scrn_place.cpp
@@ -101,13 +101,25 @@ void dMsgScrnPlace_c::exec() {
 
     mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX,
                         g_MsgObject_HIO_c.mStageTitleCharSizeY);
+
+#if TARGET_PC
+    mpFontParent->paneTrans(mDoGph_gInf_c::ScaleHUDXLeft(g_MsgObject_HIO_c.mStageTitleCharPosX),
+                            g_MsgObject_HIO_c.mStageTitleCharPosY - mScaleX);
+#else
     mpFontParent->paneTrans(g_MsgObject_HIO_c.mStageTitleCharPosX,
                             g_MsgObject_HIO_c.mStageTitleCharPosY - mScaleX);
+#endif
 
     mpBaseParent->scale(g_MsgObject_HIO_c.mStageTitleBaseSizeX,
                         g_MsgObject_HIO_c.mStageTitleBaseSizeY);
+
+#if TARGET_PC
+    mpBaseParent->paneTrans(mDoGph_gInf_c::ScaleHUDXLeft(g_MsgObject_HIO_c.mStageTitleBasePosX),
+                            g_MsgObject_HIO_c.mStageTitleBasePosY - mScaleY);
+#else
     mpBaseParent->paneTrans(g_MsgObject_HIO_c.mStageTitleBasePosX,
                             g_MsgObject_HIO_c.mStageTitleBasePosY - mScaleY);
+#endif
 
     if (isTalkNow()) {
         fukiAlpha(1.0f);
diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp
index ee51e2e583..120bcff752 100644
--- a/src/d/d_name.cpp
+++ b/src/d/d_name.cpp
@@ -918,6 +918,10 @@ void dName_c::selectCursorMove() {
                                                                g_nmHIO.mSelCharScale);
     ((J2DTextBox*)mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr())
         ->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF));
+    
+    #if TARGET_PC
+    nameWide();
+    #endif
 
     Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0);
     mSelIcon->setPos(pos.x, pos.y, mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr(), true);
@@ -1281,7 +1285,58 @@ void dName_c::selectCursorPosSet(int row) {
     }
 }
 
+#if TARGET_PC
+void dName_c::nameWide() {
+    //Resize Select Icon
+    mSelIcon->setParam(0.82f * mDoGph_gInf_c::hudAspectScaleUp, 0.77f, 0.05f, 0.4f, 0.4f);
+
+    // List of Characters Box
+    static u64 l_tagName[65] = {
+        MULTI_CHAR('m_00_0'), MULTI_CHAR('m_00_1'), MULTI_CHAR('m_00_2'), MULTI_CHAR('m_00_3'), MULTI_CHAR('m_00_4'), MULTI_CHAR('m_01_0'), MULTI_CHAR('m_01_1'), MULTI_CHAR('m_01_2'), MULTI_CHAR('m_01_3'),
+        MULTI_CHAR('m_01_4'), MULTI_CHAR('m_02_0'), MULTI_CHAR('m_02_1'), MULTI_CHAR('m_02_2'), MULTI_CHAR('m_02_3'), MULTI_CHAR('m_02_4'), MULTI_CHAR('m03_0'),  MULTI_CHAR('m03_1'),  MULTI_CHAR('m03_2'),
+        MULTI_CHAR('m03_3'),  MULTI_CHAR('m03_4'),  MULTI_CHAR('m_04_0'), MULTI_CHAR('m_04_1'), MULTI_CHAR('m_04_2'), MULTI_CHAR('m_04_3'), MULTI_CHAR('m_04_4'), MULTI_CHAR('m_05_0'), MULTI_CHAR('m_05_1'),
+        MULTI_CHAR('m_05_2'), MULTI_CHAR('m_05_3'), MULTI_CHAR('m_05_4'), MULTI_CHAR('m_06_0'), MULTI_CHAR('m_06_1'), MULTI_CHAR('m_06_2'), MULTI_CHAR('m_06_3'), MULTI_CHAR('m_06_4'), MULTI_CHAR('m_07_0'),
+        MULTI_CHAR('m_07_1'), MULTI_CHAR('m_07_2'), MULTI_CHAR('m_07_3'), MULTI_CHAR('m_07_4'), MULTI_CHAR('m_08_0'), MULTI_CHAR('m_08_1'), MULTI_CHAR('m_08_2'), MULTI_CHAR('m_08_3'), MULTI_CHAR('m_08_4'),
+        MULTI_CHAR('m_09_0'), MULTI_CHAR('m_09_1'), MULTI_CHAR('m_09_2'), MULTI_CHAR('m_09_3'), MULTI_CHAR('m_09_4'), MULTI_CHAR('m_10_0'), MULTI_CHAR('m_10_1'), MULTI_CHAR('m_10_2'), MULTI_CHAR('m_10_3'),
+        MULTI_CHAR('m_10_4'), MULTI_CHAR('m_11_0'), MULTI_CHAR('m_11_1'), MULTI_CHAR('m_11_2'), MULTI_CHAR('m_11_3'), MULTI_CHAR('m_11_4'), MULTI_CHAR('m12_0'),  MULTI_CHAR('m12_1'),  MULTI_CHAR('m12_2'),
+        MULTI_CHAR('m12_3'),  MULTI_CHAR('m12_4'),
+    };
+
+    for (u32 i = 0; i < 65; i++) {
+        nameIn.NameInScr->search(l_tagName[i])->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    }
+
+    // "END" Text
+    nameIn.NameInScr->search(MULTI_CHAR('p_end_2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    nameIn.NameInScr->search(MULTI_CHAR('p_end_1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    nameIn.NameInScr->search(MULTI_CHAR('p_end_0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+
+    // Letters being typed
+    static u64 l_nameTagName[8] = {
+        MULTI_CHAR('name_00'), MULTI_CHAR('name_01'), MULTI_CHAR('name_02'), MULTI_CHAR('name_03'), MULTI_CHAR('name_04'), MULTI_CHAR('name_05'), MULTI_CHAR('name_06'), MULTI_CHAR('name_07'),
+    };
+
+    for (u32 i = 0; i < 8; i++) {
+        nameIn.NameInScr->search(l_nameTagName[i])->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    }
+
+    // Underscores when typing below letters
+    static u64 l_nameCurTagName[8] = {
+        MULTI_CHAR('s__n_00'), MULTI_CHAR('s__n_01'), MULTI_CHAR('s__n_02'), MULTI_CHAR('s__n_03'), MULTI_CHAR('s__n_04'), MULTI_CHAR('s__n_05'), MULTI_CHAR('s__n_06'), MULTI_CHAR('s__n_07'),
+    };
+
+    for (u32 i = 0; i < 8; i++) {
+        nameIn.NameInScr->search(l_nameCurTagName[i])
+            ->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f);
+    }
+}
+#endif
+
 void dName_c::_draw() {
+    #if TARGET_PC
+    nameWide();
+    #endif
+
     dComIfGd_set2DOpa(&nameIn);
     dComIfGd_set2DOpa(mSelIcon);
 }
@@ -1484,7 +1539,12 @@ void dName_c::screenSet() {
 
     mSelIcon = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL);
     JUT_ASSERT(0, mSelIcon != NULL);
+
+    #if TARGET_PC
+    mSelIcon->setParam(0.82f * mDoGph_gInf_c::hudAspectScaleUp, 0.77f, 0.05f, 0.4f, 0.4f);
+    #else
     mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f);
+    #endif
 
     Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0);
     mSelIcon->setPos(pos.x, pos.y, mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr(), true);
diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp
index 093aaadddd..37dbeedba2 100644
--- a/src/d/d_ovlp_fade2.cpp
+++ b/src/d/d_ovlp_fade2.cpp
@@ -51,8 +51,14 @@ void dOvlpFd2_dlst_c::draw() {
     GXEnd();
 
     Mtx44 m;
+
+    #if TARGET_PC
+    C_MTXPerspective(m, 60.0f, 1.3571428f, 100.0f, 100000.0f);
+    #else
     C_MTXPerspective(m, 60.0f, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(), 100.0f,
                      100000.0f);
+    #endif
+
     GXSetProjection(m, GX_PERSPECTIVE);
 #ifdef TARGET_PC
     mDoGph_gInf_c::getFrameBufferTexObj()->reset();
diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp
index 70304451fb..d6f432f3ee 100644
--- a/src/d/d_ovlp_fade3.cpp
+++ b/src/d/d_ovlp_fade3.cpp
@@ -64,8 +64,14 @@ void dOvlpFd3_dlst_c::draw() {
     GXEnd();
 
     Mtx44 m;
+
+    #if TARGET_PC
+    C_MTXPerspective(m, 60.0f, 1.3571428f, 100.0f, 100000.0f);
+    #else
     C_MTXPerspective(m, 60.0f, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(), 100.0f,
                      100000.0f);
+    #endif
+
     GXSetProjection(m, GX_PERSPECTIVE);
 #ifdef TARGET_PC
     mDoGph_gInf_c::getFrameBufferTexObj()->reset();
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 057bcdf4ff..f3cdfed17b 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -393,13 +393,7 @@ static void dummy1(dStage_roomControl_c* roomControl) {
 
 JKRExpHeap* dStage_roomControl_c::createMemoryBlock(int i_blockIdx, u32 i_heapSize) {
     #if TARGET_PC
-    // Cave of Ordeals crashes around floor 29 due to no free heap space
-    // Increasing the size here avoids that, though its ugly. maybe TODO a better fix
-    if (strcmp(dComIfGp_getStartStageName(), "D_SB01") == 0) {
-        u32 prev = i_heapSize;
-        i_heapSize *= 2;
-        DuskLog.warn("Doubling heap size for D_SB01... ({}) -> ({})", prev, i_heapSize);
-    }
+    i_heapSize *= 2;
     #endif
 
     if (mMemoryBlock[i_blockIdx] == NULL) {
diff --git a/src/dusk/OSContext.cpp b/src/dusk/OSContext.cpp
index 9aa6932e52..d2bb1803ea 100644
--- a/src/dusk/OSContext.cpp
+++ b/src/dusk/OSContext.cpp
@@ -23,16 +23,11 @@ void OSSetCurrentContext(OSContext* context) {
 }
 
 void OSClearContext(OSContext* context) {
-    if (!context) return;
-    context->mode  = 0;
-    context->state = 0;
+    // No-op on PC
 }
 
 void OSInitContext(OSContext* context, u32 pc, u32 newsp) {
-    if (!context) return;
-    memset(context, 0, sizeof(OSContext));
-    context->srr0 = pc;
-    context->gpr[1] = newsp;
+    // No-op on PC
 }
 
 void OSDumpContext(OSContext* context) {
diff --git a/src/dusk/OSThread.cpp b/src/dusk/OSThread.cpp
index ea9c568eef..af339e8656 100644
--- a/src/dusk/OSThread.cpp
+++ b/src/dusk/OSThread.cpp
@@ -101,7 +101,7 @@ static thread_local OSThread* tls_currentThread = nullptr;
 
 static OSThread  sDefaultThread;
 static u8        sDefaultStack[64 * 1024];
-static u32       sDefaultStackEnd = OS_THREAD_STACK_MAGIC;
+static u8        sDefaultStackEnd = OS_THREAD_STACK_MAGIC;
 
 // Global interrupt mutex (coarse-grained lock replacing interrupt disable)
 // Lazy-initialized to avoid DLL static init crashes
@@ -237,7 +237,7 @@ int OSCreateThread(OSThread* thread, void* (*func)(void*), void* param,
 
     // Stack (stack points to TOP on GameCube)
     thread->stackBase = (u8*)stack;
-    thread->stackEnd  = (u32*)((uintptr_t)stack - stackSize);
+    thread->stackEnd  = (u8*)((uintptr_t)stack - stackSize);
     *thread->stackEnd = OS_THREAD_STACK_MAGIC;
 
     OSClearContext(&thread->context);
@@ -496,7 +496,7 @@ void OSDetachThread(OSThread* thread) {
     OSWakeupThread(&thread->queueJoin);
 }
 
-int OSJoinThread(OSThread* thread, void* val) {
+BOOL OSJoinThread(OSThread* thread, void** val) {
     if (!thread) return 0;
 
     if (!(thread->attr & OS_THREAD_ATTR_DETACH)) {
diff --git a/src/dusk/imgui/ImGuiMenuEnhancements.cpp b/src/dusk/imgui/ImGuiMenuEnhancements.cpp
index a7a1e1d698..e9404e2476 100644
--- a/src/dusk/imgui/ImGuiMenuEnhancements.cpp
+++ b/src/dusk/imgui/ImGuiMenuEnhancements.cpp
@@ -101,6 +101,11 @@ namespace dusk {
                     ImGui::SetTooltip("Allows you to transform even if NPCs are looking");
                 }
 
+                config::ImGuiCheckbox("Fast Spinner", getSettings().game.fastSpinner);
+                if (ImGui::IsItemHovered()) {
+                    ImGui::SetTooltip("Speeds up Spinner movement when holding R.");
+                }
+
                 ImGui::EndMenu();
             }
 
diff --git a/src/dusk/imgui/ImGuiMenuGame.cpp b/src/dusk/imgui/ImGuiMenuGame.cpp
index b2ed26b20a..6ae32ce1a4 100644
--- a/src/dusk/imgui/ImGuiMenuGame.cpp
+++ b/src/dusk/imgui/ImGuiMenuGame.cpp
@@ -12,6 +12,7 @@
 #include "dusk/hotkeys.h"
 #include "dusk/settings.h"
 #include "m_Do/m_Do_controller_pad.h"
+#include "m_Do/m_Do_graphic.h"
 
 namespace dusk {
     void ImGuiMenuGame::ToggleFullscreen() {
@@ -35,6 +36,13 @@ namespace dusk {
                     ToggleFullscreen();
                 }
 
+                if (ImGui::MenuItem("Default Window Size")) {
+                    getSettings().video.enableFullscreen.setValue(false);
+                    VISetWindowFullscreen(false);
+                    VISetWindowSize(FB_WIDTH * 2, FB_HEIGHT * 2);
+                    VICenterWindow();
+                }
+
                 ImGui::EndMenu();
             }
 
diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp
index 278f783dbf..32c6a5beb4 100644
--- a/src/dusk/settings.cpp
+++ b/src/dusk/settings.cpp
@@ -46,6 +46,7 @@ UserSettings g_userSettings = {
         // Cheats
         .enableFastIronBoots {"game.enableFastIronBoots", false},
         .canTransformAnywhere {"game.canTransformAnywhere", false},
+        .fastSpinner {"game.fastSpinner", false},
 
         // Technical
         .restoreWiiGlitches {"game.restoreWiiGlitches", false},
@@ -93,6 +94,7 @@ void registerSettings() {
     Register(g_userSettings.game.noLowHpSound);
     Register(g_userSettings.game.midnasLamentNonStop);
     Register(g_userSettings.game.enableTurboKeybind);
+    Register(g_userSettings.game.fastSpinner);
 }
 
 // Transient settings
diff --git a/src/dusk/stubs.cpp b/src/dusk/stubs.cpp
index 2cb385966e..e655ed6d7d 100644
--- a/src/dusk/stubs.cpp
+++ b/src/dusk/stubs.cpp
@@ -94,7 +94,7 @@ static void ClearMsgQueueMap() {
     map.clear();
 }
 
-void OSInitMessageQueue(OSMessageQueue* mq, void* msgArray, s32 msgCount) {
+void OSInitMessageQueue(OSMessageQueue* mq, OSMessage* msgArray, s32 msgCount) {
     if (!mq) return;
     mq->queueSend.head = mq->queueSend.tail = nullptr;
     mq->queueReceive.head = mq->queueReceive.tail = nullptr;
@@ -128,7 +128,7 @@ int OSSendMessage(OSMessageQueue* mq, void* msg, s32 flags) {
     return 1;
 }
 
-int OSReceiveMessage(OSMessageQueue* mq, void* msg, s32 flags) {
+BOOL OSReceiveMessage(OSMessageQueue* mq, OSMessage* msg, s32 flags) {
     if (!mq) return 0;
 
     PCMessageQueueData& data = GetMsgQueueData(mq);
diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp
index 1cbbb7449f..b1edb7fa23 100644
--- a/src/f_ap/f_ap_game.cpp
+++ b/src/f_ap/f_ap_game.cpp
@@ -738,6 +738,16 @@ void fapGm_Execute() {
             dynamic_cast<daAlink_c*>(link)->handleQuickTransform();
         }
     }
+    
+    if (dusk::getSettings().game.fastSpinner && mDoCPd_c::getHoldR(PAD_1)) {
+        if (const auto link = g_dComIfG_gameInfo.play.getPlayer(0)) {
+            auto spinnerActor = (fopAc_ac_c*)dynamic_cast<daAlink_c*>(link)->getSpinnerActor();
+            if (spinnerActor) {
+                if (spinnerActor->speedF < 60.f)
+                    spinnerActor->speedF += 2.f;
+            }
+        }
+    }
 #endif
 
     fpcM_Management(NULL, fapGm_After);
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 36217076bf..dca07f98ba 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -730,6 +730,9 @@ u8 var_r30 = fopAcM::HeapAdjustEntry;
 #endif
 
     u32 size = i_size & 0xFFFFFF;
+#if TARGET_PC
+    size *= 2;
+#endif
     bool result = fopAcM_entrySolidHeap_(i_actor, i_heapCallback, size);
 #if DEBUG
     fopAcM::HeapDummyCheck = var_r29;
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index a7a09a8d87..5c535c2eb1 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -552,8 +552,16 @@ const tvSize l_tvSize[2] = {
     {808, 448},
 };
 
+#if TARGET_PC
+tvSize pc_tvSize = {608, 448};
+#endif
+
 void mDoGph_gInf_c::setTvSize() {
+#if TARGET_PC
+    const tvSize* tvsize = &pc_tvSize;
+#else
     const tvSize* tvsize = &l_tvSize[mWide];
+#endif
 
     m_width = tvsize->width;
     m_height = tvsize->height;
@@ -572,13 +580,28 @@ void mDoGph_gInf_c::setTvSize() {
     m_aspect = m_widthF / m_heightF;
     m_scale = m_aspect / 1.3571428f;
     m_invScale = 1.0f / m_scale;
+
+#if TARGET_PC
+    hudAspectScaleDown = 1.3571428f / mDoGph_gInf_c::getAspect();
+    hudAspectScaleUp = 1.0f / hudAspectScaleDown;
+#endif
 }
 
+#if TARGET_PC
+void mDoGph_gInf_c::onWide(f32 width, f32 height) {
+    mWide = TRUE;
+    pc_tvSize.width = width;
+    pc_tvSize.height = height;
+    setTvSize();
+    dMeter2Info_onWide2D();
+}
+#else
 void mDoGph_gInf_c::onWide() {
     mWide = TRUE;
     setTvSize();
     dMeter2Info_onWide2D();
 }
+#endif
 
 void mDoGph_gInf_c::offWide() {
     mWide = FALSE;
@@ -686,10 +709,16 @@ void mDoGph_gInf_c::setWideZoomLightProjection(Mtx& m) {
 #endif
 
 #if TARGET_PC
+f32 mDoGph_gInf_c::hudAspectScaleDown = 1.0f;
+f32 mDoGph_gInf_c::hudAspectScaleUp = 1.0f;
+
 void mDoGph_gInf_c::setWindowSize(AuroraWindowSize const& size) {
     JUTVideo::getManager()->setWindowSize(size);
     dComIfGp_setWindow(0, 0.0f, 0.0f, getWidth(), getHeight(), 0.0f, 1.0f, 0, 2);
     mFader->mBox.set(0, 0, getWidth(), getHeight());
+
+    f32 newWidth = (getWidth() / getHeight()) * 448.0f;
+    onWide(newWidth, 448.0f);
 }
 #endif
 
@@ -1285,7 +1314,13 @@ void mDoGph_gInf_c::bloom_c::draw() {
             GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3c);
             for (int texCoord = (int)GX_TEXCOORD1; texCoord < (int)GX_MAX_TEXCOORD; texCoord++) {
                 GXSetTexCoordGen((GXTexCoordID)texCoord, GX_TG_MTX2x4, GX_TG_TEX0, iVar11);
+
+                #if TARGET_PC
+                f32 dVar15 = mBlureSize * ((448.0f / getHeight()) / 6400.0f);
+                #else
                 f32 dVar15 = mBlureSize * (1.0f / 6400.0f);
+                #endif
+
                 mDoMtx_stack_c::transS((dVar15 * cM_scos(sVar10)) * getInvScale(),
                                        dVar15 * cM_ssin(sVar10), 0.0f);
                 GXLoadTexMtxImm(mDoMtx_stack_c::get(), iVar11, GX_MTX2x4);
@@ -2014,7 +2049,13 @@ int mDoGph_Painter() {
 
                 Mtx m2;
                 Mtx44 m;
+
+                #if TARGET_PC
+                C_MTXPerspective(m, AREG_F(8) + 60.0f, 1.3571428f, 1.0f, 100000.0f);
+                #else
                 C_MTXPerspective(m, AREG_F(8) + 60.0f, mDoGph_gInf_c::getAspect(), 1.0f, 100000.0f);
+                #endif
+
                 GXSetProjection(m, GX_PERSPECTIVE);
                 cXyz sp38c(0.0f, 0.0f, AREG_F(7) + -2.0f);
                 cXyz sp398(0.0f, 1.0f, 0.0f);
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index d5258b6f98..fdab588957 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -592,6 +592,7 @@ void myExceptionCallback(u16, OSContext*, u32, u32) {
     VIFlush();
 }
 
+#ifndef TARGET_PC
 static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) {
     JUTException* manager = JUTException::getManager();
     JUTConsole* exConsole = manager->getConsole();
@@ -714,6 +715,7 @@ static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) {
         } while (true);
     } while (true);
 }
+#endif
 
 static void dummy_string() {
     DEAD_STRING("\x1B[32m%-24s = size=%d KB\n\x1B[m");
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 632d696ae9..51f74eef00 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -321,8 +321,8 @@ int game_main(int argc, char* argv[]) {
     config.configPath = configPath;
     config.windowPosX = -1;
     config.windowPosY = -1;
-    config.windowWidth = 608 * 2;
-    config.windowHeight = 448 * 2;
+    config.windowWidth = FB_WIDTH * 2;
+    config.windowHeight = FB_HEIGHT * 2;
     config.desiredBackend = ParseAuroraBackend(parsed_arg_options["backend"].as<std::string>());
     config.logCallback = &aurora_log_callback;
     config.logLevel = (AuroraLogLevel)parsed_arg_options["log-level"].as<uint8_t>();