diff --git a/Source/Plugins/InputPluginCommon/Src/IniFile.cpp b/Source/Plugins/InputPluginCommon/Src/IniFile.cpp
index 903b9d3eef..0f10b25452 100644
--- a/Source/Plugins/InputPluginCommon/Src/IniFile.cpp
+++ b/Source/Plugins/InputPluginCommon/Src/IniFile.cpp
@@ -66,7 +66,15 @@ void IniFile::Save( std::ostream& file )
 		Section::const_iterator si = i->second.begin(),
 			se = i->second.end();
 		for ( ; si != se; ++si )
-			file << si->first << " = " << si->second << '\n';
+		{
+			file << si->first << " = ";
+			// if value has quotes or whitespace, surround it with quotes
+			if (si->second.find_first_of("\"\t ") != std::string::npos)
+				file << '"' << si->second << '"';
+			else
+				file << si->second;
+			file << '\n';
+		}
 	}
 }
 
@@ -103,7 +111,13 @@ void IniFile::Load( std::istream& file )
 					std::istringstream ss(line);
 					std::string key; std::getline( ss, key, '=' );
 					std::string val; std::getline( ss, val );
-					(*section)[ TrimChars(key,space) ] = TrimChars(val,space);
+					val = TrimChars(val,space);
+					// handle quote surrounded values
+					if (val.length() > 1)
+						if ('"' == val[0])
+							val = val.substr(1, val.length()-2);
+
+					(*section)[ TrimChars(key,space) ] = val;
 					break;
 				}
 			}
diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/Attachment/Drums.cpp b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/Attachment/Drums.cpp
index 1d5580560b..e3f0acb22c 100644
--- a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/Attachment/Drums.cpp
+++ b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/Attachment/Drums.cpp
@@ -20,16 +20,16 @@ static const u8 drums_id[] = { 0x01, 0x00, 0xa4, 0x20, 0x01, 0x03 };
 const u16 drum_pad_bitmasks[] =
 {
 	DRUMS_RED,
+	DRUMS_YELLOW,
 	DRUMS_BLUE,
 	DRUMS_GREEN,
-	DRUMS_YELLOW,
 	DRUMS_ORANGE,
 	DRUMS_BASS,
 };
 
 const char* drum_pad_names[] =
 {
-	"Red","Blue","Green","Yellow","Orange","Bass"
+	"Red","Yellow","Blue","Green","Orange","Bass"
 };
 
 const u16 drum_button_bitmasks[] =