diff --git a/G2MP01.ini b/G2MP01.ini
index 7e329cdf0c..297ef58c47 100644
--- a/G2MP01.ini
+++ b/G2MP01.ini
@@ -6,8 +6,6 @@ Issues="Scanner does not work, music is buggy, scanner mode is buggy"
 #Patch OSYieldThread to take more time - MP2's idle loop is really stupid.
 0x80375c68=400
 [OnFrame]
-#Add memory patches here.
-#0x80000020=twgt:0xE5207C22
-#0x80000008=word:0x01000000
 [ActionReplay]
-#Add decrypted action replay cheats here.
\ No newline at end of file
+[EmuState]
+EmulationStateId = 2
diff --git a/G6QE08.ini b/G6QE08.ini
new file mode 100644
index 0000000000..c3508157bf
--- /dev/null
+++ b/G6QE08.ini
@@ -0,0 +1,7 @@
+# G6QE08 - Megaman Collection
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
diff --git a/GBLP52.ini b/GBLP52.ini
index c1831131c3..3efa2cd3da 100644
--- a/GBLP52.ini
+++ b/GBLP52.ini
@@ -2,6 +2,7 @@
 

 [EmuState]
 #The Emulation State.
-EmulationStateId = 2
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame]

 [ActionReplay]

diff --git a/GG4P08.ini b/GG4P08.ini
index 079ac96cda..7564b69b6f 100644
--- a/GG4P08.ini
+++ b/GG4P08.ini
@@ -2,9 +2,7 @@
 

 [EmuState]
 #The Emulation State.
-EmulationStateId = 2
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame]

-#Add memory patches here.

-

 [ActionReplay]

-#Add decrypted action replay cheats here.

diff --git a/GKAE8P.ini b/GKAE8P.ini
index d63a0d056f..86890d241e 100644
--- a/GKAE8P.ini
+++ b/GKAE8P.ini
@@ -1,6 +1,6 @@
 # GKAE8P - Amazing Island
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/GM2P8P.ini b/GM2P8P.ini
new file mode 100644
index 0000000000..be2453a24a
--- /dev/null
+++ b/GM2P8P.ini
@@ -0,0 +1,7 @@
+# GM2P8P - SUPER MONKEY BALL 2
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
diff --git a/GNHE5d.ini b/GNHE5d.ini
index 6675309068..02c9849e88 100644
--- a/GNHE5d.ini
+++ b/GNHE5d.ini
@@ -3,6 +3,6 @@
 #Values set here will override the main dolphin settings.
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 1
 [OnFrame]
 [ActionReplay]
diff --git a/GPOP8P.ini b/GPOP8P.ini
index e31c2f375c..8f5494d157 100644
--- a/GPOP8P.ini
+++ b/GPOP8P.ini
@@ -3,6 +3,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 2
+EmulationIssues = needs texture cache
 [OnFrame]

 [ActionReplay]

 $ENABLE
diff --git a/GPSP8P.ini b/GPSP8P.ini
index 94df18fb40..8c3252cd5a 100644
--- a/GPSP8P.ini
+++ b/GPSP8P.ini
@@ -1,7 +1,8 @@
 # GPSP8P - PHANTASY STAR ONLINE EPISODE III

 [EmuState]
 #The Emulation State.
-EmulationStateId = 4
+EmulationStateId = 2
+EmulationIssues = needs texture cache
 [OnFrame]
 [ActionReplay]
 $All cards All range: A + R to activate (made by Daco)
@@ -29,3 +30,5 @@ $No texture mode (made by phytress/card gray, imported by daco)
 804565EC 38600010
 804565F0 4E800020
 8011DD70 48338865
+[Wii]
+Widescreen = 0
diff --git a/GPVP01.ini b/GPVP01.ini
new file mode 100644
index 0000000000..9f4b69f456
--- /dev/null
+++ b/GPVP01.ini
@@ -0,0 +1,6 @@
+# GPVP01 - PIKMIN2 for GAMECUBE
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
diff --git a/GSNE8P.ini b/GSNE8P.ini
new file mode 100644
index 0000000000..47dd430bfe
--- /dev/null
+++ b/GSNE8P.ini
@@ -0,0 +1,7 @@
+# GSNE8P - Sonic Adventure 2 Battle
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
diff --git a/GVJP08.ini b/GVJP08.ini
index 25aef43b3a..bf2bf1dcb9 100644
--- a/GVJP08.ini
+++ b/GVJP08.ini
@@ -3,8 +3,6 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 2
+EmulationIssues = 
 [OnFrame]

-#Add memory patches here.

-

 [ActionReplay]

-#Add decrypted action replay cheats here.

diff --git a/GXGE08.ini b/GXGE08.ini
new file mode 100644
index 0000000000..11b141148c
--- /dev/null
+++ b/GXGE08.ini
@@ -0,0 +1,7 @@
+# GXGE08 - MEGAMAN X COLLECTION
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
diff --git a/GZ2P01.ini b/GZ2P01.ini
index 5e7a82c7a4..d5d51a364c 100644
--- a/GZ2P01.ini
+++ b/GZ2P01.ini
@@ -7,91 +7,71 @@
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 2
 Issues="low FPS in big areas, no working sound"
+EmulationIssues = No Sound
 [OnFrame]
 [ActionReplay]
 $(M)
-GKMU-93RZ-82YV6
-ZFPE-UYKV-PX95X
+C435E298 0000FF01
 $Infinite Health
-AUZE-RTDF-QRZHA
-BUPB-PJ7U-J1R82
+00408163 00000050
 $Max Health
-R3H6-Y2JE-XP961
-D7HR-M8D2-G13R2
+00408161 00000064
 $Infinite Rupees
-T4W1-XEC4-67PUZ
-14VE-K0Y5-KE8MB
+02408164 000003E8
 $Infinite Oxygen
-2CP2-3C3E-6551Z
-M43A-WVVR-VF00A
+0240DF42 00000258
 $Infinite Slingshot Pellets
-ZAWP-7BBP-MWPQ7
-7BP2-MA3Q-J63RC
+00408254 00000032
 $Infinite Bombs
-AGGP-BNZV-KH7RH
-47GT-1UQ6-7D1ZR
+0040824D 0000001E
 $Infinite Arrows
-7FEW-GAK4-WY16R
-TQ7X-AN0G-1R3D9
+0040824C 0000001E
 $Infinite Lantern Oil
-C1CN-MRHN-CRQH1
-PBGR-Z1QJ-YNGPV
+02408168 00005460
 $Have All Swords/Shields/Tunics
-1N19-DJDH-1E1RV
-D2C9-YB3Y-5VU99
+04408230 FFFFFFFF
 $All Hidden Skills Learned
-UEAT-TPFF-UGX8Y
-GK8K-4JB1-GR6QV
-71QK-9V25-X6A5H
+00408979 0000000F
+0040897A 000000F0
 $Have Dungeon Map/Compass/Boss Key
-7VNW-7RUD-9KYWY
-GWXG-CK3U-59F9P
-2ZT3-UBRM-03KF6
+28408AD5 00000007
+00408AD5 00000007
 $Infinite Small Keys
-5MRG-RU3M-EZ4DF
-BQJQ-X9QA-9U9GW
+00408AD4 00000005
 $Rupees Never Increase or Decrease
-42MX-0ERR-V61WU
-FACA-PBHC-7D95F
+04222F00 60000000
 $Have All Letters
-UJN1-NYMK-XXGH3
-CD9W-8BVM-A0T0Z
-QWBB-G8D2-5A60U
-CCKA-YQX0-RZ43K
-Z1ZF-KYWF-UFFZT
-7A8F-63JK-DN1RY
+0240827E 0000FFFF
+0440828C 01020304
+04408290 05060708
+04408294 090A0B0C
+04408298 0D0E0F10
 $Have All Golden Bugs
-9WQC-VJM8-A7D2W
-T9Y4-QMQN-N9892
+00408245 000002FF
 $Have Giant Wallet
-ZY26-V51M-ZNJEQ
-WB4T-TFVC-8CR7Z
+00408179 00000002
 $R+D-Pad Left/Right Controls Fog
-3H3D-Y9P4-NFVT1
-Z4AA-7M5Y-GKV8F
-40Q9-YX89-JRFU2
-0AJB-RGR4-184YR
-N4YF-JKB3-Y5MP8
+0A3DF2BA 00000022
+8440DEBC 00000005
+0A3DF2BA 00000021
+8440DEBC FFFFFFFB
 $R+D-Pad Left/Right Controls Time
-9872-GWYG-JKPR6
-Z4AA-7M5Y-GKV8F
-QVE9-QFUB-35D7B
-0AJB-RGR4-184YR
-JH64-GE4G-M2UA8
-#EASY VESSEL OF LIGHT
+0A3DF2BA 00000022
+84408194 00003000
+0A3DF2BA 00000021
+84408194 FFFFCFFF
 $One Tear Fills 1st Vessel of Light
-CXA2-TW5A-8UF62
-EKJZ-BAU5-83FYC
-GVN5-JCT8-EY8XY
-VP61-73M8-2F098
+0776EB53 15008000
+5776EB54 1475A9C0
+28408274 0000000F
+00408274 0000000F
 $One Tear Fills 2nd Vessel of Light
-CXA2-TW5A-8UF62
-5X40-TMYU-B6PRG
-K1YE-HRZX-3E4ED
-KX7E-CJEQ-5C4ER
+0776EB53 15008000
+1776EB55 1475A9C0
+28408275 0000000F
+00408275 0000000F
 $One Tear Fills 3rd Vessel of Light
-CXA2-TW5A-8UF62
-41VF-EUVP-CY77Z
-MUQN-K0ZJ-B4RVY
-ZBKG-N0G1-N92DF
-
+0776EB53 15008000
+D776EB56 1475A9C0
+28408276 0000000F
+00408276 0000000F
diff --git a/GZLP01.ini b/GZLP01.ini
index 37c4d80536..a5d542b03b 100644
--- a/GZLP01.ini
+++ b/GZLP01.ini
@@ -1,6 +1,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 2
+EmulationIssues = No Sound
 [OnLoad]
 #Add memory patches to be loaded once on boot here.
 [OnFrame]
diff --git a/RSTP64.ini b/RSTP64.ini
new file mode 100644
index 0000000000..f86237cb1c
--- /dev/null
+++ b/RSTP64.ini
@@ -0,0 +1,6 @@
+# RSTP64 - Star Wars:  The Force Unleashed
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
diff --git a/UGPP01.ini b/UGPP01.ini
index ba603f6629..3da03be77a 100644
--- a/UGPP01.ini
+++ b/UGPP01.ini
@@ -1,6 +1,6 @@
 # UGPP01 - GAME BOY PLAYER
 [EmuState]
-EmulationStateId = 0
+EmulationStateId = 1
 Issues="The game needs the GBA Player hardware attachment"
 [OnFrame]
-[ActionReplay]
\ No newline at end of file
+[ActionReplay]