diff --git a/Source/Core/DiscIO/Src/WiiWad.cpp b/Source/Core/DiscIO/Src/WiiWad.cpp
@@ -45,12 +45,12 @@ class CBlobBigEndianReader
 
 WiiWAD::WiiWAD(const std::string& _rName)
 {
-    DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
-    if (pReader == NULL || File::IsDirectory(_rName))
+	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
+	if (pReader == NULL || File::IsDirectory(_rName))
 	{
 		m_Valid = false;
-        if(pReader) delete pReader;
-        return;
+		if(pReader) delete pReader;
+		return;
 	}
 
 	m_Valid = ParseWAD(*pReader);
@@ -71,87 +71,87 @@ WiiWAD::~WiiWAD()
 
 u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset)
 {
-    if (_Size > 0)
-    {
-        u8* pTmpBuffer = new u8[_Size];
-        _dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
+	if (_Size > 0)
+	{
+		u8* pTmpBuffer = new u8[_Size];
+		_dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
 
-        if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
-        {
+		if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
+		{
 			ERROR_LOG(DISCIO, "WiiWAD: Could not read from file");
-            PanicAlertT("WiiWAD: Could not read from file");
-        }
-        return pTmpBuffer;
-    }
+			PanicAlertT("WiiWAD: Could not read from file");
+		}
+		return pTmpBuffer;
+	}
 	return NULL;
 }
 
 
 bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
 {
-    CBlobBigEndianReader ReaderBig(_rReader);
+	CBlobBigEndianReader ReaderBig(_rReader);
 
-    // get header size	
+	// get header size	
 	u32 HeaderSize = ReaderBig.Read32(0);
-    if (HeaderSize != 0x20) 
-    {
-        _dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
-        return false;
-    }    
-
-    // get header 
-    u8 Header[0x20];
-    _rReader.Read(0, HeaderSize, Header);
+	if (HeaderSize != 0x20) 
+	{
+		_dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
+		return false;
+	}
+
+	// get header 
+	u8 Header[0x20];
+	_rReader.Read(0, HeaderSize, Header);
 	u32 HeaderType = ReaderBig.Read32(0x4);
-    if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
-        return false;
-
-    m_CertificateChainSize    = ReaderBig.Read32(0x8);
-    u32 Reserved              = ReaderBig.Read32(0xC);
-    m_TicketSize              = ReaderBig.Read32(0x10);
-    m_TMDSize                 = ReaderBig.Read32(0x14);
-    m_DataAppSize             = ReaderBig.Read32(0x18);
-    m_FooterSize              = ReaderBig.Read32(0x1C);
+	if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
+		return false;
+
+	m_CertificateChainSize    = ReaderBig.Read32(0x8);
+	u32 Reserved              = ReaderBig.Read32(0xC);
+	m_TicketSize              = ReaderBig.Read32(0x10);
+	m_TMDSize                 = ReaderBig.Read32(0x14);
+	m_DataAppSize             = ReaderBig.Read32(0x18);
+	m_FooterSize              = ReaderBig.Read32(0x1C);
 #if MAX_LOGLEVEL >= DEBUG_LEVEL
     _dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");
 #else
     (void)Reserved;
 #endif
 
-    u32 Offset = 0x40;
-    m_pCertificateChain   = CreateWADEntry(_rReader, m_CertificateChainSize, Offset);  Offset += ROUND_UP(m_CertificateChainSize, 0x40);
-    m_pTicket             = CreateWADEntry(_rReader, m_TicketSize, Offset);            Offset += ROUND_UP(m_TicketSize, 0x40);
-    m_pTMD                = CreateWADEntry(_rReader, m_TMDSize, Offset);               Offset += ROUND_UP(m_TMDSize, 0x40);
-    m_pDataApp            = CreateWADEntry(_rReader, m_DataAppSize, Offset);           Offset += ROUND_UP(m_DataAppSize, 0x40);
-    m_pFooter             = CreateWADEntry(_rReader, m_FooterSize, Offset);            Offset += ROUND_UP(m_FooterSize, 0x40);
+	u32 Offset = 0x40;
+	m_pCertificateChain   = CreateWADEntry(_rReader, m_CertificateChainSize, Offset);  Offset += ROUND_UP(m_CertificateChainSize, 0x40);
+	m_pTicket             = CreateWADEntry(_rReader, m_TicketSize, Offset);            Offset += ROUND_UP(m_TicketSize, 0x40);
+	m_pTMD                = CreateWADEntry(_rReader, m_TMDSize, Offset);               Offset += ROUND_UP(m_TMDSize, 0x40);
+	m_pDataApp            = CreateWADEntry(_rReader, m_DataAppSize, Offset);           Offset += ROUND_UP(m_DataAppSize, 0x40);
+	m_pFooter             = CreateWADEntry(_rReader, m_FooterSize, Offset);            Offset += ROUND_UP(m_FooterSize, 0x40);
 
 	return true;
 }
 
 bool WiiWAD::IsWiiWAD(const std::string& _rName)
 {
-    DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
-    if (pReader == NULL)
-        return false;
-
-    CBlobBigEndianReader Reader(*pReader);
-    bool Result = false;
-
-    // check for wii wad
-    if (Reader.Read32(0x00) == 0x20)
-    {
-        u32 WADTYpe = Reader.Read32(0x04);
-        switch(WADTYpe)
-        {
-        case 0x49730000:
-        case 0x69620000:
-            Result = true;
-        }
-    }
-
-    delete pReader;
-
-    return Result;
+	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
+	if (pReader == NULL)
+		return false;
+
+	CBlobBigEndianReader Reader(*pReader);
+	bool Result = false;
+
+	// check for wii wad
+	if (Reader.Read32(0x00) == 0x20)
+	{
+		u32 WADTYpe = Reader.Read32(0x04);
+		switch(WADTYpe)
+		{
+		case 0x49730000:
+		case 0x69620000:
+			Result = true;
+		}
+	}
+
+	delete pReader;
+
+	return Result;
 }
 
 

diff --git a/Source/Core/DiscIO/Src/WiiWad.h b/Source/Core/DiscIO/Src/WiiWad.h
@@ -33,7 +33,7 @@ class WiiWAD
 {
 public:
 
-    WiiWAD(const std::string& _rName);
+	WiiWAD(const std::string& _rName);
 
 	~WiiWAD();
 
@@ -50,7 +50,7 @@ class WiiWAD
 	u8* GetDataApp() const { return m_pDataApp; }
 	u8* GetFooter() const { return m_pFooter; }
 
-    static bool IsWiiWAD(const std::string& _rName);
+	static bool IsWiiWAD(const std::string& _rName);
 
 private:
 

diff --git a/Source/Core/InputCommon/Src/X11InputBase.cpp b/Source/Core/InputCommon/Src/X11InputBase.cpp