diff --git a/System/Libraries/Graphics2D.HC b/System/Libraries/Graphics2D.HC
index 9cda988..3b93b44 100644
--- a/System/Libraries/Graphics2D.HC
+++ b/System/Libraries/Graphics2D.HC
@@ -1,3 +1,5 @@
+JsonObject* Fonts = Json.CreateObject(adam_task);
+
 #define C2D_MAGIC 0xDEDEDEDEDEDEDEDE
 
 class @context2d
@@ -1124,8 +1126,9 @@ I64 Print2D(Context2D* ctx, BitmapFont* font, I64 x, I64 y,
     return retval;
 }
 
-U0 Text2D(Context2D* ctx, stbtt_fontinfo* font, I64 x, I64 y, I64 size, U32 color, U8* text)
+U0 Text2D(Context2D* ctx, U8* font_name, I64 x, I64 y, I64 size, U32 color, U8* text)
 {
+    stbtt_fontinfo* font = Fonts->@(font_name);
     if (!ctx || !ctx->width || !ctx->height || !font || !size || !text || !StrLen(text)) {
         return;
     }
diff --git a/System/MakeSystem.HC b/System/MakeSystem.HC
index af7970d..8df45de 100644
--- a/System/MakeSystem.HC
+++ b/System/MakeSystem.HC
@@ -58,10 +58,10 @@ load_elf("M:/build/bin/tlse");
 #include "Libraries/BitmapFont";
 #include "Libraries/Display";
 #include "Libraries/FileSystem";
+#include "Libraries/Json";
 #include "Libraries/Graphics2D";
 #include "Libraries/Animation2D";
 #include "Libraries/Image";
-#include "Libraries/Json";
 #include "Libraries/Rsa";
 #include "Libraries/Sha256";
 #include "Libraries/System";