diff --git a/Source/Project64-core/N64System/N64DiskClass.cpp b/Source/Project64-core/N64System/N64DiskClass.cpp
index 662b44d18..6960cb11d 100644
--- a/Source/Project64-core/N64System/N64DiskClass.cpp
+++ b/Source/Project64-core/N64System/N64DiskClass.cpp
@@ -19,17 +19,17 @@
 #include <memory>
 
 CN64Disk::CN64Disk() :
-m_DiskImage(NULL),
-m_DiskImageBase(NULL),
-m_DiskHeader(NULL),
-m_DiskHeaderBase(NULL),
-m_ErrorMsg(EMPTY_STRING),
-m_DiskBufAddress(0),
-m_DiskSysAddress(0),
-m_DiskIDAddress(0),
-m_DiskRomAddress(0),
-m_DiskRamAddress(0),
-m_isShadowDisk(false)
+    m_DiskImage(NULL),
+    m_DiskImageBase(NULL),
+    m_DiskHeader(NULL),
+    m_DiskHeaderBase(NULL),
+    m_ErrorMsg(EMPTY_STRING),
+    m_DiskBufAddress(0),
+    m_DiskSysAddress(0),
+    m_DiskIDAddress(0),
+    m_DiskRomAddress(0),
+    m_DiskRamAddress(0),
+    m_isShadowDisk(false)
 {
 }
 
@@ -221,9 +221,14 @@ void CN64Disk::SaveDiskSettingID(bool temp)
 
     switch (GetCountry())
     {
-    case Germany: case french:  case Italian:
-    case Europe:  case Spanish: case Australia:
-    case X_PAL:   case Y_PAL:
+    case Country_Germany:
+    case Country_French:
+    case Country_Italian:
+    case Country_Europe:
+    case Country_Spanish:
+    case Country_Australia:
+    case Country_EuropeanX_PAL:
+    case Country_EuropeanY_PAL:
         g_Settings->SaveDword(Game_SystemType, SYSTEM_PAL);
         break;
     default:
@@ -790,7 +795,7 @@ bool CN64Disk::IsSysSectorGood(uint32_t block, uint32_t sectorsize)
         //Always 0xFFFFFFFF
         if (*(uint32_t*)&m_DiskImage[(block * 0x4D08) + 0x18] != 0xFFFFFFFF)
             return false;
-        
+
         uint8_t alt = 0xC;  //Retail
         if ((block & 2) != 0)
             alt = 0xA;      //Development
@@ -945,7 +950,7 @@ uint16_t CN64Disk::LBAToPhys(uint32_t lba)
     uint16_t vzone_lba = 0;
     if (vzone != 0)
         vzone_lba = VZONE_LBA_TBL[m_DiskType][vzone - 1];
-    
+
     //Calculate Physical Track
     uint16_t track = (lba - vzone_lba) >> 1;
 
diff --git a/Source/Project64-core/N64System/N64RomClass.cpp b/Source/Project64-core/N64System/N64RomClass.cpp
index 2bead72cb..f7ff26dc6 100644
--- a/Source/Project64-core/N64System/N64RomClass.cpp
+++ b/Source/Project64-core/N64System/N64RomClass.cpp
@@ -324,11 +324,11 @@ void CN64Rom::CalculateRomCrc()
     uint32_t v0, v1;
     uint32_t length = 0x00100000;
 
-    // CIC_NUS_6101	at=0x5D588B65 , s6=0x3F
-    // CIC_NUS_6102	at=0x5D588B65 , s6=0x3F
-    // CIC_NUS_6103	at=0x6C078965 , s6=0x78
-    // CIC_NUS_6105	at=0x5d588b65 , s6=0x91
-    // CIC_NUS_6106	at=0x6C078965 , s6=0x85
+    // CIC_NUS_6101 at=0x5D588B65 , s6=0x3F
+    // CIC_NUS_6102 at=0x5D588B65 , s6=0x3F
+    // CIC_NUS_6103 at=0x6C078965 , s6=0x78
+    // CIC_NUS_6105 at=0x5d588b65 , s6=0x91
+    // CIC_NUS_6106 at=0x6C078965 , s6=0x85
 
     // 64DD IPL (JPN) at=0x02E90EDD , s6=0xdd
     // 64DD IPL (USA) at=0x02E90EDD , s6=0xde
@@ -445,12 +445,12 @@ bool CN64Rom::IsLoadedRomDDIPL()
 {
     switch (CicChipID())
     {
-        case CIC_NUS_8303:
-        case CIC_NUS_DDUS:
-        case CIC_NUS_DDTL:
-            return true;
-        default:
-            return false;
+    case CIC_NUS_8303:
+    case CIC_NUS_DDUS:
+    case CIC_NUS_DDTL:
+        return true;
+    default:
+        return false;
     }
 }
 
diff --git a/Source/Project64-core/N64System/N64RomClass.h b/Source/Project64-core/N64System/N64RomClass.h
index 2babcc04f..2bb8e01e2 100644
--- a/Source/Project64-core/N64System/N64RomClass.h
+++ b/Source/Project64-core/N64System/N64RomClass.h
@@ -28,7 +28,7 @@ public:
     void SaveRomSettingID(bool temp);
     void ClearRomSettingID();
     CICChip CicChipID();
-    uint8_t *  GetRomAddress() { return m_ROMImage; }
+    uint8_t * GetRomAddress() { return m_ROMImage; }
     uint32_t GetRomSize() const { return m_RomFileSize; }
     const std::string & GetRomMD5() const { return m_MD5; }
     const std::string & GetRomName() const { return m_RomName; }
diff --git a/Source/Project64-core/N64System/N64Types.h b/Source/Project64-core/N64System/N64Types.h
index 268ad5b15..96e1a30b5 100644
--- a/Source/Project64-core/N64System/N64Types.h
+++ b/Source/Project64-core/N64System/N64Types.h
@@ -77,9 +77,27 @@ enum CICChip
 
 enum Country
 {
-    NTSC_BETA = 0x37, X_NTSC = 0x41, Germany = 0x44, USA = 0x45, french = 0x46, Italian = 0x49,
-    Japan = 0x4A, Europe = 0x50, Spanish = 0x53, Australia = 0x55, X_PAL = 0x58, Y_PAL = 0x59,
-    UnknownCountry = 0
+    Country_NTSC_BETA = 0x37,
+    Country_Asian_NTSC = 0x41,
+    Country_Brazilian = 0x42,
+    Country_Chinese = 0x43,
+    Country_Germany = 0x44,
+    Country_NorthAmerica = 0x45,
+    Country_French = 0x46,
+    Country_Gateway64_NTSC = 0x47,
+    Country_Dutch = 0x48,
+    Country_Italian = 0x49,
+    Country_Japan = 0x4A,
+    Country_Korean = 0x4B,
+    Country_Gateway64_PAL = 0x4C,
+    Country_Canadian = 0x4E,
+    Country_Europe = 0x50,
+    Country_Spanish = 0x53,
+    Country_Australia = 0x55,
+    Country_Scandinavian = 0x57,
+    Country_EuropeanX_PAL = 0x58,
+    Country_EuropeanY_PAL = 0x59,
+    Country_Unknown = 0
 };
 
 enum PROFILE_TIMERS