diff --git a/Assets/common/font13.bin b/Assets/fonts/font13.bin
similarity index 100%
rename from Assets/common/font13.bin
rename to Assets/fonts/font13.bin
diff --git a/Assets/common/font_default.ttf b/Assets/fonts/font_ascii.ttf
similarity index 100%
rename from Assets/common/font_default.ttf
rename to Assets/fonts/font_ascii.ttf
diff --git a/Assets/common/font_default_full.ttf b/Assets/fonts/font_full.ttf
similarity index 100%
rename from Assets/common/font_default_full.ttf
rename to Assets/fonts/font_full.ttf
diff --git a/Assets/common/font_mono.ttf b/Assets/fonts/font_mono_ascii.ttf
similarity index 100%
rename from Assets/common/font_mono.ttf
rename to Assets/fonts/font_mono_ascii.ttf
diff --git a/Assets/common/font_mono_full.ttf b/Assets/fonts/font_mono_full.ttf
similarity index 100%
rename from Assets/common/font_mono_full.ttf
rename to Assets/fonts/font_mono_full.ttf
diff --git a/Sources/arm/App.hx b/Sources/arm/App.hx
index ea1ddfd2..229207c0 100644
--- a/Sources/arm/App.hx
+++ b/Sources/arm/App.hx
@@ -97,7 +97,7 @@ class App {
 		Krom.setSaveAndQuitCallback(saveAndQuitCallback);
 		#end
 
-		Data.getFont("font_default.ttf", function(f: Font) {
+		Data.getFont("font_ascii.ttf", function(f: Font) {
 			Data.getImage("color_wheel.k", function(image: Image) {
 				font = f;
 				theme = zui.Themes.dark;
diff --git a/Sources/arm/ui/TabScript.hx b/Sources/arm/ui/TabScript.hx
index 612d0036..40e8e914 100644
--- a/Sources/arm/ui/TabScript.hx
+++ b/Sources/arm/ui/TabScript.hx
@@ -52,7 +52,7 @@ class TabScript {
 
 			var _font = ui.ops.font;
 			var _fontSize = ui.fontSize;
-			Data.getFont("font_mono.ttf", function(f: kha.Font) { ui.ops.font = f; }); // Sync
+			Data.getFont("font_mono_ascii.ttf", function(f: kha.Font) { ui.ops.font = f; }); // Sync
 			ui.fontSize = 15;
 			Ext.textArea(ui, hscript);
 			ui.ops.font = _font;
diff --git a/khafile.js b/khafile.js
index dbd2fdc2..b5731e64 100644
--- a/khafile.js
+++ b/khafile.js
@@ -7,6 +7,7 @@ project.addLibrary("iron");
 project.addLibrary("zui");
 project.addShaders("Shaders/common/*.glsl", { noembed: false});
 project.addAssets("Assets/common/*", { notinlist: true, destination: "data/{name}" });
+project.addAssets("Assets/fonts/*", { notinlist: true, destination: "data/{name}" });
 project.addAssets("Assets/licenses/*", { notinlist: true, destination: "data/licenses/{name}" });
 project.addAssets("Assets/plugins/*", { notinlist: true, destination: "data/plugins/{name}" });
 project.addAssets("Assets/themes/*", { notinlist: true, destination: "data/themes/{name}" });