diff --git a/stepmania/Themes/default/Fonts/_16px fonts.ini b/stepmania/Themes/default/Fonts/_16px fonts.ini
index 54142578a9..7ee9169814 100644
--- a/stepmania/Themes/default/Fonts/_16px fonts.ini	
+++ b/stepmania/Themes/default/Fonts/_16px fonts.ini	
@@ -4,4 +4,4 @@
 # Also, themes can create new fonts, and overload this file to
 # have them pulled in for every 16-pixel font.
 [main]
-import=_japanese 16px,_misc 16px,_game chars 16px
+import=_japanese 16px,_korean 16px,_misc 16px,_game chars 16px
diff --git a/stepmania/Themes/default/Fonts/_20px fonts.ini b/stepmania/Themes/default/Fonts/_20px fonts.ini
index 80ae766050..ec67bd3685 100644
--- a/stepmania/Themes/default/Fonts/_20px fonts.ini	
+++ b/stepmania/Themes/default/Fonts/_20px fonts.ini	
@@ -11,5 +11,5 @@
 # The characters in _game chars 16px are actually very large; they'll
 # look fine here, too.
 
-import=_japanese 24px,_game chars 16px
+import=_japanese 24px,_korean 24px,_game chars 16px
 # XXX ,_misc 16px
diff --git a/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png b/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png
index db5c0bb82e..5a1f67c96c 100644
Binary files a/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png and b/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png differ
diff --git a/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png b/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png
deleted file mode 100644
index ca1c638695..0000000000
Binary files a/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png and /dev/null differ
diff --git a/stepmania/Themes/default/Fonts/_korean 16px [jamo 3] 8x8.png b/stepmania/Themes/default/Fonts/_korean 16px [jamo 3] 8x8.png
deleted file mode 100644
index 55dd6fd033..0000000000
Binary files a/stepmania/Themes/default/Fonts/_korean 16px [jamo 3] 8x8.png and /dev/null differ
diff --git a/stepmania/Themes/default/Fonts/_korean 16px.ini b/stepmania/Themes/default/Fonts/_korean 16px.ini
index 5e7f92e69b..b9438fb667 100644
--- a/stepmania/Themes/default/Fonts/_korean 16px.ini	
+++ b/stepmania/Themes/default/Fonts/_korean 16px.ini	
@@ -1,308 +1,17 @@
-#GA to GWAGS
-#U+AC00
+[main]
+Top=8
+Baseline=23
+LineSpacing=20
+
 [jamo 1]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
+Top=8
+Baseline=23
+LineSpacing=20
+DefaultWidth=20
 
-line 0=가감갠갰걀걐걠거
-line 1=각갑갡갱걁걑걡걱
-line 2=갂값갢갲걂걒걢걲
-line 3=갃갓갣갳걃걓걣걳
-line 4=간갔갤갴걄걔걤건
-line 5=갅강갥갵걅걕걥걵
-line 6=갆갖갦갶걆걖걦걶
-line 7=갇갗갧갷걇걗걧걷
-
-#U+AC80
-[jamo 2]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=검겐겠결곀곐고곰
-line 1=겁겑겡겱곁곑곡곱
-line 2=겂겒겢겲곂곒곢곲
-line 3=것겓겣겳곃곓곣곳
-line 4=겄겔겤겴계곔곤곴
-line 5=겅겕겥겵곅곕곥공
-line 6=겆겖겦겶곆곖곦곶
-line 7=겇겗겧겷곇곗곧곷
-
-#U+AC08
-[jamo 3]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=갈갘갨갸걈걘걨걸
-line 1=갉같갩갹걉걙걩걹
-line 2=갊갚갪갺걊걚걪걺
-line 3=갋갛갫갻걋걛걫걻
-line 4=갌개갬갼걌걜걬걼
-line 5=갍객갭갽걍걝걭걽
-line 6=갎갞갮갾걎걞걮걾
-line 7=갏갟갯갿걏걟걯걿
-
-#U+AC88
-[jamo 4]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=겈겘겨겸곈곘골곸
-line 1=겉겙격겹곉곙곩곹
-line 2=겊겚겪겺곊곚곪곺
-line 3=겋겛겫겻곋곛곫곻
-line 4=게겜견겼곌곜곬과
-line 5=겍겝겭경곍곝곭곽
-line 6=겎겞겮겾곎곞곮곾
-line 7=겏겟겯겿곏곟곯곿
-
-#JUN to JJAED
-#U+C900
-[jamo 5]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=준줐줠줰쥀쥐쥠쥰
-line 1=줁중줡줱쥁쥑쥡쥱
-line 2=줂줒줢줲쥂쥒쥢쥲
-line 3=줃줓줣줳쥃쥓쥣쥳
-line 4=줄줔줤줴쥄쥔쥤쥴
-line 5=줅줕줥줵쥅쥕쥥쥵
-line 6=줆줖줦줶쥆쥖쥦쥶
-line 7=줇줗줧줷쥇쥗쥧쥷
-
-#U+C980
-[jamo 6]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=즀즐즠즰지짐짠짰
-line 1=즁즑즡즱직집짡짱
-line 2=즂즒즢즲짂짒짢짲
-line 3=즃즓즣즳짃짓짣짳
-line 4=즄즔즤즴진짔짤짴
-line 5=즅즕즥즵짅징짥짵
-line 6=즆즖즦즶짆짖짦짶
-line 7=즇즗즧즷짇짗짧짷
-
-#U+C908
-[jamo 7]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=줈줘줨줸쥈쥘쥨쥸
-line 1=줉줙줩줹쥉쥙쥩쥹
-line 2=줊줚줪줺쥊쥚쥪쥺
-line 3=줋줛줫줻쥋쥛쥫쥻
-line 4=줌줜줬줼쥌쥜쥬쥼
-line 5=줍줝줭줽쥍쥝쥭쥽
-line 6=줎줞줮줾쥎쥞쥮쥾
-line 7=줏줟줯줿쥏쥟쥯쥿
-
-#U+C988
-[jamo 8]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=즈즘즨즸질짘짨째
-line 1=즉즙즩즹짉짙짩짹
-line 2=즊즚즪즺짊짚짪짺
-line 3=즋즛즫즻짋짛짫짻
-line 4=즌즜즬즼짌짜짬짼
-line 5=즍증즭즽짍짝짭짽
-line 6=즎즞즮즾짎짞짮짾
-line 7=즏즟즯즿짏짟짯짿
-
-#YEOSS to WEC
-#U+C600
-[jamo 9]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=였옐옠옰와왐왠왰
-line 1=영옑옡옱왁왑왡왱
-line 2=옂옒옢옲왂왒왢왲
-line 3=옃옓옣옳왃왓왣왳
-line 4=옄옔오옴완왔왤왴
-line 5=옅옕옥옵왅왕왥왵
-line 6=옆옖옦옶왆왖왦왶
-line 7=옇옗옧옷왇왗왧왷
-
-#U+C680
-[jamo 10]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=욀욐욠우움원웠웰
-line 1=욁욑욡욱웁웑웡웱
-line 2=욂욒욢욲웂웒웢웲
-line 3=욃욓욣욳웃웓웣웳
-line 4=욄요욤운웄월웤웴
-line 5=욅욕욥욵웅웕웥웵
-line 6=욆욖욦욶웆웖웦웶
-line 7=욇욗욧욷웇웗웧웷
-
-#U+C608
-[jamo 11]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=예옘온옸왈왘왨외
-line 1=옉옙옩옹왉왙왩왹
-line 2=옊옚옪옺왊왚왪왺
-line 3=옋옛옫옻왋왛왫왻
-line 4=옌옜올옼왌왜왬왼
-line 5=옍옝옭옽왍왝왭왽
-line 6=옎옞옮옾왎왞왮왾
-line 7=옏옟옯옿왏왟왯왿
-
-#U+C688
-[jamo 12]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=욈욘욨울웈웘웨웸
-line 1=욉욙용욹웉웙웩웹
-line 2=욊욚욪욺웊웚웪웺
-line 3=욋욛욫욻웋웛웫웻
-line 4=욌욜욬욼워웜웬웼
-line 5=욍욝욭욽웍웝웭웽
-line 6=욎욞욮욾웎웞웮웾
-line 7=욏욟욯욿웏웟웯웿
-
-#MIL to BOLB
-#U+C000
-[jamo 13]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=밀밐밠배뱀뱐뱠뱰
-line 1=밁밑밡백뱁뱑뱡뱱
-line 2=밂밒밢밲뱂뱒뱢뱲
-line 3=밃밓밣밳뱃뱓뱣뱳
-line 4=밄바밤밴뱄뱔뱤뱴
-line 5=밅박밥밵뱅뱕뱥뱵
-line 6=밆밖밦밶뱆뱖뱦뱶
-line 7=밇밗밧밷뱇뱗뱧뱷
-
-#U+C080
-[jamo 14]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=벀벐베벰변볐볠볰
-line 1=벁벑벡벱볁병볡볱
-line 2=벂벒벢벲볂볒볢볲
-line 3=벃벓벣벳볃볓볣볳
-line 4=버범벤벴별볔볤보
-line 5=벅법벥벵볅볕볥복
-line 6=벆벖벦벶볆볖볦볶
-line 7=벇벗벧벷볇볗볧볷
-
-
-#U+C008
-[jamo 15]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=밈반밨밸뱈뱘뱨뱸
-line 1=밉밙방밹뱉뱙뱩뱹
-line 2=밊밚밪밺뱊뱚뱪뱺
-line 3=밋받밫밻뱋뱛뱫뱻
-line 4=밌발밬밼뱌뱜뱬뱼
-line 5=밍밝밭밽뱍뱝뱭뱽
-line 6=밎밞밮밾뱎뱞뱮뱾
-line 7=및밟밯밿뱏뱟뱯뱿
-
-
-
-#U+C088
-[jamo 16]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=번벘벨벸볈볘볨본
-line 1=벉벙벩벹볉볙볩볹
-line 2=벊벚벪벺볊볚볪볺
-line 3=벋벛벫벻볋볛볫볻
-line 4=벌벜벬벼볌볜볬볼
-line 5=벍벝벭벽볍볝볭볽
-line 6=벎벞벮벾볎볞볮볾
-line 7=벏벟벯벿볏볟볯볿
-
-#WEK TO JYAE
-#U+C700
-[jamo 17]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=윀윐유윰은읐읠읰
-line 1=윁윑육윱읁응읡읱
-line 2=윂윒윢윲읂읒읢읲
-line 3=윃윓윣윳읃읓읣읳
-line 4=위윔윤윴을읔읤이
-line 5=윅윕윥융읅읕읥익
-line 6=윆윖윦윶읆읖읦읶
-line 7=윇윗윧윷읇읗읧읷
-
-#U+C780
-[jamo 18]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=잀자잠잰쟀쟐쟠쟰
-line 1=잁작잡잱쟁쟑쟡쟱
-line 2=잂잒잢잲쟂쟒쟢쟲
-line 3=잃잓잣잳쟃쟓쟣쟳
-line 4=임잔잤잴쟄쟔쟤쟴
-line 5=입잕장잵쟅쟕쟥쟵
-line 6=잆잖잦잶쟆쟖쟦쟶
-line 7=잇잗잧잷쟇쟗쟧쟷
-
-#U+C708
-[jamo 19]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=윈윘율윸읈의읨인
-line 1=윉윙윩윹읉읙읩읹
-line 2=윊윚윪윺읊읚읪읺
-line 3=윋윛윫윻읋읛읫읻
-line 4=윌윜윬으음읜읬일
-line 5=윍윝윭윽읍읝읭읽
-line 6=윎윞윮윾읎읞읮읾
-line 7=윏윟윯윿읏읟읯읿
-
-#U+C788
-[jamo 20]
-Top=25
-Baseline=32
-LineSpacing=28
-DefaultWidth=39
-line 0=있잘잨잸쟈쟘쟨쟸
-line 1=잉잙잩잹쟉쟙쟩쟹
-line 2=잊잚잪잺쟊쟚쟪쟺
-line 3=잋잛잫잻쟋쟛쟫쟻
-line 4=잌잜재잼쟌쟜쟬쟼
-line 5=잍잝잭잽쟍쟝쟭쟽
-line 6=잎잞잮잾쟎쟞쟮쟾
-line 7=잏잟잯잿쟏쟟쟯쟿
\ No newline at end of file
+line 0=경고굴기길나놀는
+line 1=단도랑래레련를리
+line 2=머바박배뱩뱻벗사
+line 3=스승써야어옝위유
+line 4=윤이자잦잭준지직
+line 5=초캉커팍혁혠화
diff --git a/stepmania/Themes/default/Fonts/_korean 24px [jamo 1] 8x8.png b/stepmania/Themes/default/Fonts/_korean 24px [jamo 1] 8x8.png
new file mode 100644
index 0000000000..471a4a6ba7
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_korean 24px [jamo 1] 8x8.png differ
diff --git a/stepmania/Themes/default/Fonts/_korean 24px.ini b/stepmania/Themes/default/Fonts/_korean 24px.ini
new file mode 100644
index 0000000000..4194492268
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_korean 24px.ini	
@@ -0,0 +1,17 @@
+[main]
+Top=5
+Baseline=26
+LineSpacing=28
+
+[jamo 1]
+Top=5
+Baseline=26
+LineSpacing=28
+DefaultWidth=28
+
+line 0=경고굴기길나놀는
+line 1=단도랑래레련를리
+line 2=머바박배뱩뱻벗사
+line 3=스승써야어옝위유
+line 4=윤이자잦잭준지직
+line 5=초캉커팍혁혠화