diff --git a/stepmania/Data/Translation.dat b/stepmania/Data/Translation.dat
index 949a30b53b..26ad55dcc2 100644
--- a/stepmania/Data/Translation.dat
+++ b/stepmania/Data/Translation.dat
@@ -346,35 +346,38 @@ ArtistFrom: (Nobuo Uematsu)|(Uematsu Nobuo)
 ArtistTo: 植松伸夫
 
 [Courses]
-TitleFrom: (Kidou)|(Demon Road)|(Road of Oni)|(Oni Michi)
+TitleFrom: .*(Kidou).*|(Demon Road)|(Road of Oni)|(Oni Michi)
 TitleTo: 鬼道
 *
-TitleFrom: (Kidou 2)|(Demon Road 2)|(Road of Oni 2)|(Oni Michi 2)
+TitleFrom: .*(Kidou 2).*|(Demon Road 2)|(Road of Oni 2)|(Oni Michi 2)
 TitleTo: 鬼道 弐
 *
 TitleFrom: Love
 TitleTo: Love ♡
 *
-TitleFrom: Love Love
+TitleFrom: (Love Love)|(Love)|(.*Love Heart)
 TitleTo: Love ♡
 *
-TitleFrom: (2 ?MB)|(Road of 2 ?MB)
+TitleFrom: (2 ?MB)|(.*Road of 2 ?MB)
 TitleTo: 2MB道
 *
-TitleFrom: Dancemania( Oni)?
+TitleFrom: (.*)Dancemania( Oni)?
 TitleTo: Dancemania 鬼
 *
-TitleFrom: (TaQ( Oni)?)|(Road of TaQ)
+TitleFrom: (TaQ( Oni)?)|(.*Road of TaQ)
 TitleTo: TaQ 道
 *
-TitleFrom: (Legend Road)|(Road of Legend)
+TitleFrom: (Legend Road)|(Road of Legend)|.*(Legendary Road)
 TitleTo: 伝説道
 *
-TitleFrom: (Slow Demon Road)|(Road of Slow)
+TitleFrom: (.*Slow Demon Road)|(Road of Slow)
 TitleTo: 鬼の遅道
 *
 # "Road of True"?  Maybe "Truth"?
-TitleFrom: (True Demon Road)|(Road of Tru.*)
+TitleFrom: (.*True Demon Road)|(Road of Tru.*)
 TitleTo: 真鬼道
 *
-
+#DWInsanity's Ayumi Platinum Course
+TitleFrom: Ayumi( Platinum)?
+TitleTo: あゆみ Platinum
+*
diff --git a/stepmania/Themes/default/Fonts/_korean 16px.ini b/stepmania/Themes/default/Fonts/_korean 16px.ini
index 6e947ab6cf..04ccbb1257 100644
--- a/stepmania/Themes/default/Fonts/_korean 16px.ini	
+++ b/stepmania/Themes/default/Fonts/_korean 16px.ini	
@@ -1,18 +1,3 @@
-[main]
-Top=8
-Baseline=23
-LineSpacing=20
-
-# Korean Unicode Range: 0x1100 to 0x11FF (jamo)
-range korean-jamo=0
-
-# All characters on this page have a width of 20 pixels; it's a strictly
-# monospaced font.
-DefaultWidth=20
-
-# Smaller center dot.
-251=10
-
 #GA to GWAGS
 [jamo 1]
 Top=5
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index fb70e9c63d..0544d90568 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -150,7 +150,7 @@ JoinMessageP2Y=336
 GuideX=320
 GuideY=374
 HelpText=Press &DOWN; on the pad to join.  Press &LEFT; &RIGHT; to change styles, then press START
-TimerSeconds=40
+TimerSeconds=30
 NextScreen=ScreenSelectGroup
 ScrollingListX=320
 ScrollingListY=250
diff --git a/stepmania/src/FontCharmaps.cpp b/stepmania/src/FontCharmaps.cpp
index 596baffbde..e0bece3ac7 100644
--- a/stepmania/src/FontCharmaps.cpp
+++ b/stepmania/src/FontCharmaps.cpp
@@ -146,6 +146,7 @@ static void Init()
 	charmaps["iso-8859-1"] = map_iso_8859_1;
 	charmaps["cp1252"] = map_cp1252;
 	charmaps["iso-8859-2"] = map_iso_8859_2;
+	charmaps["korean-jamo"] = map_korean_jamo;
 }
 
 const wchar_t *FontCharmaps::get_char_map(CString name)
diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp
index 8ecd6793ad..73bba5c756 100644
--- a/stepmania/src/ScreenCredits.cpp
+++ b/stepmania/src/ScreenCredits.cpp
@@ -131,6 +131,7 @@ const CreditLine CREDIT_LINES[] =
 	{0,"DDRManiaX"},
 	{0,"NMR"},
 	{0,"Random Hajile"},
+	{0,"Chocobo Ghost"},
 	{0,"Lagged"},
 	{0,"The Melting Pot"},
 	{0,"DDRJamz Global BBS"},
@@ -144,7 +145,6 @@ const CreditLine CREDIT_LINES[] =
 	{0,"AngelTK (Kenny Lai)"},
 	{0,"Illusionz - Issaquah, WA"},
 	{0,"Quarters - Kirkland, WA"},
-	{0,"Segapark - Bournemouth, UK"},
 	{0,"Pier Amusements - Bournemouth, UK"},
 	{0,"Westcliff Amusements - Bournemouth, UK"},
 	{0,"Naoki"},
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 9ceeb15757..31f2d8766a 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -2174,6 +2174,10 @@ SOURCE=.\UnlockSystem.h
 # End Group
 # Begin Source File
 
+SOURCE=.\cursor1.cur
+# End Source File
+# Begin Source File
+
 SOURCE=.\error.bmp
 # End Source File
 # Begin Source File
diff --git a/stepmania/src/resource.h b/stepmania/src/resource.h
index 2dd9b7b30c..3b65955aca 100644
--- a/stepmania/src/resource.h
+++ b/stepmania/src/resource.h
@@ -9,7 +9,6 @@
 #define BITMAP_CRASH                    121
 #define IDD_DIALOG1                     126
 #define IDD_DIALOG2                     127
-#define IDC_CURSOR1                     128
 #define BITMAP_ERROR                    129
 #define IDD_DISASM_CRASH                199
 #define IDC_SHOCKWAVEFLASH1             1000