diff --git a/src/Drawer2D.c b/src/Drawer2D.c
index 5d0837425..71fa9ef22 100644
--- a/src/Drawer2D.c
+++ b/src/Drawer2D.c
@@ -589,32 +589,32 @@ Size2D Drawer2D_MeasureText(struct DrawTextArgs* args) {
 }
 
 void Drawer2D_DrawClippedText(Bitmap* bmp, struct DrawTextArgs* args, int x, int y, int maxWidth) {
-	String str; char strBuffer[512];
+	char strBuffer[512];
 	struct DrawTextArgs part;
 	int i, width;
 
 	width = Drawer2D_TextWidth(args);
 	/* No clipping needed */
 	if (width <= maxWidth) { Drawer2D_DrawText(bmp, args, x, y); return; }
-
-	String_InitArray(str, strBuffer);
-	String_Copy(&str, &args->text);
-	String_Append(&str, '.');
-
 	part = *args;
-	for (i = str.length - 2; i > 0; i--) {
-		str.buffer[i] = '.';
 
+	String_InitArray(part.text, strBuffer);
+	String_Copy(&part.text, &args->text);
+	String_Append(&part.text, '.');
+	
+	for (i = part.text.length - 2; i > 0; i--) {
+		part.text.buffer[i] = '.';
 		/* skip over trailing spaces */
-		if (str.buffer[i - 1] == ' ') continue;
-		part.text = String_UNSAFE_Substring(&str, 0, i + 2);
-		width = Drawer2D_TextWidth(&part);
+		if (part.text.buffer[i - 1] == ' ') continue;
+
+		part.text.length = i + 2;
+		width            = Drawer2D_TextWidth(&part);
 		if (width <= maxWidth) { Drawer2D_DrawText(bmp, &part, x, y); return; }
 
-		/* If down to <= 2 chars, try omit trailing .. */
+		/* If down to <= 2 chars, try omitting the .. */
 		if (i > 2) continue;
-		part.text = String_UNSAFE_Substring(&str, 0, i);
-		width = Drawer2D_TextWidth(&part);
+		part.text.length = i;
+		width            = Drawer2D_TextWidth(&part);
 		if (width <= maxWidth) { Drawer2D_DrawText(bmp, &part, x, y); return; }
 	}
 }
diff --git a/src/Launcher.c b/src/Launcher.c
index 2d86f5ced..9e9988461 100644
--- a/src/Launcher.c
+++ b/src/Launcher.c
@@ -386,10 +386,8 @@ static void Launcher_LoadTextures(Bitmap* bmp) {
 						bmp, 1 * tileSize, 0, tileSize, tileSize,
 						TILESIZE, TILESIZE);
 
-	Gradient_Tint(&dirtBmp, 128, 64,
-				  0, 0, TILESIZE, TILESIZE);
-	Gradient_Tint(&stoneBmp, 96, 96,
-				  0, 0, TILESIZE, TILESIZE);
+	Gradient_Tint(&dirtBmp, 128, 64, 0, 0, TILESIZE, TILESIZE);
+	Gradient_Tint(&stoneBmp, 96, 96, 0, 0, TILESIZE, TILESIZE);
 }
 
 static ReturnCode Launcher_ProcessZipEntry(const String* path, struct Stream* data, struct ZipState* s) {
diff --git a/src/Menus.c b/src/Menus.c
index 239a86996..16bf23057 100644
--- a/src/Menus.c
+++ b/src/Menus.c
@@ -175,7 +175,7 @@ static void Menu_Label(void* s, int i, struct TextWidget* label, const String* t
 	Widget_SetLocation(menu->widgets[i], horAnchor, verAnchor, x, y);
 }
 
-static void Menu_Input(void* s, int i, struct MenuInputWidget* input, int width, const String* text, const FontDesc* font, struct InputValidator* v, int horAnchor, int verAnchor, int x, int y) {
+static void Menu_Input(void* s, int i, struct MenuInputWidget* input, int width, const String* text, FontDesc* font, struct InputValidator* v, int horAnchor, int verAnchor, int x, int y) {
 	struct Menu* menu = (struct Menu*)s;
 	MenuInputWidget_Create(input, width, 30, text, font, v);
 
diff --git a/src/Screens.c b/src/Screens.c
index f2a4f935e..83778fba0 100644
--- a/src/Screens.c
+++ b/src/Screens.c
@@ -137,7 +137,7 @@ static void InventoryScreen_Init(void* screen) {
 	Drawer2D_MakeFont(&s->font, 16, FONT_STYLE_NORMAL);
 
 	TableWidget_Create(&s->table);
-	s->table.font = s->font;
+	s->table.font = &s->font;
 	s->table.elementsPerRow = Game_PureClassic ? 9 : 10;
 	Elem_Init(&s->table);
 
diff --git a/src/Widgets.c b/src/Widgets.c
index 222a1590f..3f80b3597 100644
--- a/src/Widgets.c
+++ b/src/Widgets.c
@@ -595,7 +595,7 @@ void TableWidget_MakeDescTex(struct TableWidget* w, BlockID block) {
 	String_InitArray(desc, descBuffer);
 	TableWidget_MakeBlockDesc(&desc, block);
 	
-	DrawTextArgs_Make(&args, &desc, &w->font, true);
+	DrawTextArgs_Make(&args, &desc, w->font, true);
 	Drawer2D_MakeTextTexture(&w->descTex, &args, 0, 0);
 	TableWidget_UpdateDescTexPos(w);
 }
@@ -889,7 +889,7 @@ static void InputWidget_CalculateLineSizes(struct InputWidget* w) {
 		w->lineSizes[y] = Size2D_Empty;
 	}
 	w->lineSizes[0].Width = w->prefixWidth;
-	DrawTextArgs_MakeEmpty(&args, &w->font, true);
+	DrawTextArgs_MakeEmpty(&args, w->font, true);
 
 	String_InitArray(line, lineBuffer);
 	for (y = 0; y < w->GetMaxLines(); y++) {
@@ -934,7 +934,7 @@ static void InputWidget_UpdateCaret(struct InputWidget* w) {
 	if (w->caretPos >= maxChars) w->caretPos = -1;
 	WordWrap_GetCoords(w->caretPos, w->lines, w->GetMaxLines(), &w->caretX, &w->caretY);
 
-	DrawTextArgs_MakeEmpty(&args, &w->font, false);
+	DrawTextArgs_MakeEmpty(&args, w->font, false);
 	w->caretAccumulator = 0;
 	w->caretTex.Width   = w->caretWidth;
 
@@ -1234,7 +1234,7 @@ static bool InputWidget_MouseDown(void* widget, int x, int y, MouseButton button
 	if (button != MOUSE_LEFT) return true;
 	x -= w->inputTex.X; y -= w->inputTex.Y;
 
-	DrawTextArgs_MakeEmpty(&args, &w->font, true);
+	DrawTextArgs_MakeEmpty(&args, w->font, true);
 	charHeight = w->caretTex.Height;
 	String_InitArray(line, lineBuffer);
 
@@ -1265,13 +1265,13 @@ static bool InputWidget_MouseDown(void* widget, int x, int y, MouseButton button
 	return true;
 }
 
-CC_NOINLINE static void InputWidget_Create(struct InputWidget* w, const FontDesc* font, STRING_REF const String* prefix) {
+CC_NOINLINE static void InputWidget_Create(struct InputWidget* w, FontDesc* font, STRING_REF const String* prefix) {
 	static const String caret = String_FromConst("_");
 	struct DrawTextArgs args;
 	Size2D size;
 	Widget_Reset(w);
 
-	w->font           = *font;
+	w->font           = font;
 	w->prefix         = *prefix;
 	w->caretPos       = -1;
 	w->OnPressedEnter = InputWidget_OnPressedEnter;
@@ -1424,10 +1424,10 @@ static void MenuInputWidget_RemakeTexture(void* widget) {
 	int hintX, hintWidth;
 	Bitmap bmp;
 
-	DrawTextArgs_Make(&args, &w->base.lines[0], &w->base.font, false);
+	DrawTextArgs_Make(&args, &w->base.lines[0], w->base.font, false);
 	size.Width   = Drawer2D_TextWidth(&args);
 	/* Text may be empty, but don't want 0 height if so */
-	size.Height  = Drawer2D_FontHeight(&w->base.font, false);
+	size.Height  = Drawer2D_FontHeight(w->base.font, false);
 	w->base.caretAccumulator = 0.0;
 
 	String_InitArray(range, rangeBuffer);
@@ -1488,7 +1488,7 @@ static struct WidgetVTABLE MenuInputWidget_VTABLE = {
 	InputWidget_MouseDown, Widget_Mouse,           Widget_MouseMove,     Widget_MouseScroll,
 	InputWidget_Reposition,
 };
-void MenuInputWidget_Create(struct MenuInputWidget* w, int width, int height, const String* text, const FontDesc* font, struct InputValidator* validator) {
+void MenuInputWidget_Create(struct MenuInputWidget* w, int width, int height, const String* text, FontDesc* font, struct InputValidator* validator) {
 	InputWidget_Create(&w->base, font, &String_Empty);
 	w->base.VTABLE = &MenuInputWidget_VTABLE;
 
@@ -1527,7 +1527,7 @@ static void ChatInputWidget_RemakeTexture(void* widget) {
 	}
 	Bitmap_AllocateClearedPow2(&bmp, size.Width, size.Height);
 
-	DrawTextArgs_MakeEmpty(&args, &w->font, true);
+	DrawTextArgs_MakeEmpty(&args, w->font, true);
 	if (w->prefix.length) {
 		args.text = w->prefix;
 		Drawer2D_DrawText(&bmp, &args, 0, 0);
@@ -1741,7 +1741,7 @@ static struct WidgetVTABLE ChatInputWidget_VTABLE = {
 	InputWidget_MouseDown,   Widget_Mouse,           Widget_MouseMove,     Widget_MouseScroll,
 	InputWidget_Reposition,
 };
-void ChatInputWidget_Create(struct ChatInputWidget* w, const FontDesc* font) {
+void ChatInputWidget_Create(struct ChatInputWidget* w, FontDesc* font) {
 	static const String prefix = String_FromConst("> ");
 
 	InputWidget_Create(&w->base, font, &prefix);
@@ -1779,9 +1779,9 @@ static void PlayerListWidget_DrawName(struct Texture* tex, struct PlayerListWidg
 		tmp = *name;
 	}
 
-	DrawTextArgs_Make(&args, &tmp, &w->font, !w->classic);
+	DrawTextArgs_Make(&args, &tmp, w->font, !w->classic);
 	Drawer2D_MakeTextTexture(tex, &args, 0, 0);
-	Drawer2D_ReducePadding_Tex(tex, w->font.Size, 3);
+	Drawer2D_ReducePadding_Tex(tex, w->font->Size, 3);
 }
 
 static int PlayerListWidget_HighlightedName(struct PlayerListWidget* w, int x, int y) {
@@ -2083,7 +2083,7 @@ static void PlayerListWidget_Init(void* widget) {
 	}
 
 	PlayerListWidget_SortAndReposition(w); 
-	TextWidget_Create(&w->title, &title, &w->font);
+	TextWidget_Create(&w->title, &title, w->font);
 	Widget_SetLocation(&w->title, ANCHOR_CENTRE, ANCHOR_MIN, 0, 0);
 
 	Event_RegisterInt(&TabListEvents.Added,   w, PlayerListWidget_TabEntryAdded);
@@ -2139,14 +2139,14 @@ static struct WidgetVTABLE PlayerListWidget_VTABLE = {
 	Widget_Mouse,          Widget_Mouse,            Widget_MouseMove,      Widget_MouseScroll,
 	PlayerListWidget_Reposition,
 };
-void PlayerListWidget_Create(struct PlayerListWidget* w, const FontDesc* font, bool classic) {
+void PlayerListWidget_Create(struct PlayerListWidget* w, FontDesc* font, bool classic) {
 	Widget_Reset(w);
 	w->VTABLE     = &PlayerListWidget_VTABLE;
 	w->horAnchor  = ANCHOR_CENTRE;
 	w->verAnchor  = ANCHOR_CENTRE;
 
 	w->namesCount = 0;
-	w->font       = *font;
+	w->font       = font;
 	w->classic    = classic;
 	w->elementOffset = classic ? 0 : 10;
 }
@@ -2398,7 +2398,7 @@ static bool TextGroupWidget_GetUrl(struct TextGroupWidget* w, String* text, int
 	for (i = 0, x = 0; i < portionsCount; i++) {
 		bit = portions[i];
 		args.text = String_UNSAFE_Substring(&line, bit.LineBeg, bit.LineLen);
-		args.font = w->font;
+		args.font = *w->font;
 
 		width = Drawer2D_TextWidth(&args);
 		if ((bit.Len & TEXTGROUPWIDGET_URL) && mouseX >= x && mouseX < x + width) {
@@ -2494,14 +2494,14 @@ void TextGroupWidget_Redraw(struct TextGroupWidget* w, int index) {
 
 	text = TextGroupWidget_UNSAFE_Get(w, index);
 	if (!Drawer2D_IsEmptyText(&text)) {
-		DrawTextArgs_Make(&args, &text, &w->font, true);
+		DrawTextArgs_Make(&args, &text, w->font, true);
 
 		if (w->underlineUrls && TextGroupWidget_MightHaveUrls(w)) {
 			TextGroupWidget_DrawAdvanced(w, &tex, &args, index, &text);
 		} else {
 			Drawer2D_MakeTextTexture(&tex, &args, 0, 0);
 		}
-		Drawer2D_ReducePadding_Tex(&tex, w->font.Size, 3);
+		Drawer2D_ReducePadding_Tex(&tex, w->font->Size, 3);
 	} else {
 		tex.Height = w->placeholderHeight[index] ? w->defaultHeight : 0;
 	}
@@ -2517,8 +2517,8 @@ static void TextGroupWidget_Init(void* widget) {
 	struct TextGroupWidget* w = (struct TextGroupWidget*)widget;
 	int i, height;
 	
-	height = Drawer2D_FontHeight(&w->font, true);
-	Drawer2D_ReducePadding_Height(&height, w->font.Size, 3);
+	height = Drawer2D_FontHeight(w->font, true);
+	Drawer2D_ReducePadding_Height(&height, w->font->Size, 3);
 	w->defaultHeight = height;
 
 	for (i = 0; i < w->lines; i++) {
@@ -2554,12 +2554,12 @@ static struct WidgetVTABLE TextGroupWidget_VTABLE = {
 	Widget_Mouse,         Widget_Mouse,           Widget_MouseMove,     Widget_MouseScroll,
 	TextGroupWidget_Reposition,
 };
-void TextGroupWidget_Create(struct TextGroupWidget* w, int lines, const FontDesc* font, STRING_REF struct Texture* textures, TextGroupWidget_Get getLine) {
+void TextGroupWidget_Create(struct TextGroupWidget* w, int lines, FontDesc* font, struct Texture* textures, TextGroupWidget_Get getLine) {
 	Widget_Reset(w);
 	w->VTABLE = &TextGroupWidget_VTABLE;
 
 	w->lines    = lines;
-	w->font     = *font;
+	w->font     = font;
 	w->textures = textures;
 	w->GetLine  = getLine;
 }
@@ -2649,7 +2649,7 @@ static Size2D SpecialInputWidget_MeasureTitles(struct SpecialInputWidget* w) {
 	Size2D size = { 0, 0 };
 	int i;
 
-	DrawTextArgs_MakeEmpty(&args, &w->font, false);
+	DrawTextArgs_MakeEmpty(&args, w->font, false);
 	for (i = 0; i < Array_Elems(w->tabs); i++) {
 		args.text = w->tabs[i].title;
 
@@ -2671,7 +2671,7 @@ static void SpecialInputWidget_DrawTitles(struct SpecialInputWidget* w, Bitmap*
 	Size2D size;
 	int i, x = 0;
 
-	DrawTextArgs_MakeEmpty(&args, &w->font, false);
+	DrawTextArgs_MakeEmpty(&args, w->font, false);
 	for (i = 0; i < Array_Elems(w->tabs); i++) {
 		args.text = w->tabs[i].title;
 		col  = i == w->selectedIndex ? col_selected : col_inactive;
@@ -2689,7 +2689,7 @@ static Size2D SpecialInputWidget_MeasureContent(struct SpecialInputWidget* w, st
 	int i, rows;
 	
 	int maxWidth = 0;
-	DrawTextArgs_MakeEmpty(&args, &w->font, false);
+	DrawTextArgs_MakeEmpty(&args, w->font, false);
 	args.text.length = tab->charsPerItem;
 
 	for (i = 0; i < tab->contents.length; i += tab->charsPerItem) {
@@ -2712,7 +2712,7 @@ static void SpecialInputWidget_DrawContent(struct SpecialInputWidget* w, struct
 	int i, x, y, item;	
 
 	int wrap = tab->itemsPerRow;
-	DrawTextArgs_MakeEmpty(&args, &w->font, false);
+	DrawTextArgs_MakeEmpty(&args, w->font, false);
 	args.text.length = tab->charsPerItem;
 
 	for (i = 0; i < tab->contents.length; i += tab->charsPerItem) {
@@ -2807,10 +2807,10 @@ static struct WidgetVTABLE SpecialInputWidget_VTABLE = {
 	SpecialInputWidget_MouseDown, Widget_Mouse,              Widget_MouseMove,        Widget_MouseScroll,
 	Widget_CalcPosition,
 };
-void SpecialInputWidget_Create(struct SpecialInputWidget* w, const FontDesc* font, struct InputWidget* target) {
+void SpecialInputWidget_Create(struct SpecialInputWidget* w, FontDesc* font, struct InputWidget* target) {
 	Widget_Reset(w);
 	w->VTABLE    = &SpecialInputWidget_VTABLE;
 	w->verAnchor = ANCHOR_MAX;
-	w->font      = *font;
+	w->font      = font;
 	w->target = target;
 }
diff --git a/src/Widgets.h b/src/Widgets.h
index 15590ab78..9ea7a273a 100644
--- a/src/Widgets.h
+++ b/src/Widgets.h
@@ -70,7 +70,7 @@ struct TableWidget {
 	Widget_Layout
 	int elementsCount, elementsPerRow, rowsCount;
 	int lastCreatedIndex;
-	FontDesc font;
+	FontDesc* font;
 	int selectedIndex, cellSize;
 	float selBlockExpand;
 	GfxResourceID vb;
@@ -94,7 +94,7 @@ CC_NOINLINE void TableWidget_MakeDescTex(struct TableWidget* w, BlockID block);
 #define INPUTWIDGET_LEN STRING_SIZE
 struct InputWidget {
 	Widget_Layout
-	FontDesc font;		
+	FontDesc* font;
 	int (*GetMaxLines)(void);
 	void (*RemakeTexture)(void* elem);  /* Remakes the raw texture containing all the chat lines. Also updates dimensions. */
 	void (*OnPressedEnter)(void* elem); /* Invoked when the user presses enter. */
@@ -169,7 +169,7 @@ struct MenuInputWidget {
 	struct InputValidator validator;
 	char _textBuffer[INPUTWIDGET_LEN];
 };
-CC_NOINLINE void MenuInputWidget_Create(struct MenuInputWidget* w, int width, int height, const String* text, const FontDesc* font, struct InputValidator* v);
+CC_NOINLINE void MenuInputWidget_Create(struct MenuInputWidget* w, int width, int height, const String* text, FontDesc* font, struct InputValidator* v);
 
 
 struct ChatInputWidget {
@@ -180,7 +180,7 @@ struct ChatInputWidget {
 	char _origBuffer[INPUTWIDGET_MAX_LINES * INPUTWIDGET_LEN];	
 };
 
-CC_NOINLINE void ChatInputWidget_Create(struct ChatInputWidget* w, const FontDesc* font);
+CC_NOINLINE void ChatInputWidget_Create(struct ChatInputWidget* w, FontDesc* font);
 
 
 /* Retrieves the text for the i'th line in the group */
@@ -192,7 +192,7 @@ typedef String (*TextGroupWidget_Get)(void* obj, int i);
 struct TextGroupWidget {
 	Widget_Layout
 	int lines, defaultHeight;
-	FontDesc font;
+	FontDesc* font;
 	bool placeholderHeight[TEXTGROUPWIDGET_MAX_LINES];
 	bool underlineUrls;
 	struct Texture* textures;
@@ -200,7 +200,7 @@ struct TextGroupWidget {
 	void* getLineObj;
 };
 
-CC_NOINLINE void TextGroupWidget_Create(struct TextGroupWidget* w, int lines, const FontDesc* font, STRING_REF struct Texture* textures, TextGroupWidget_Get getLine);
+CC_NOINLINE void TextGroupWidget_Create(struct TextGroupWidget* w, int lines, FontDesc* font, struct Texture* textures, TextGroupWidget_Get getLine);
 /* Sets whether the given line has non-zero height when that line has no text in it. */
 /* By default, all lines are placeholder lines. */
 CC_NOINLINE void TextGroupWidget_SetUsePlaceHolder(struct TextGroupWidget* w, int index, bool placeHolder);
@@ -224,7 +224,7 @@ static String TextGroupWidget_UNSAFE_Get(struct TextGroupWidget* w, int i) { ret
 
 struct PlayerListWidget {
 	Widget_Layout
-	FontDesc font;
+	FontDesc* font;
 	int namesCount, elementOffset;
 	int xMin, xMax, yHeight;
 	bool classic;
@@ -232,7 +232,7 @@ struct PlayerListWidget {
 	uint16_t ids[TABLIST_MAX_NAMES * 2];
 	struct Texture textures[TABLIST_MAX_NAMES * 2];
 };
-CC_NOINLINE void PlayerListWidget_Create(struct PlayerListWidget* w, const FontDesc* font, bool classic);
+CC_NOINLINE void PlayerListWidget_Create(struct PlayerListWidget* w, FontDesc* font, bool classic);
 CC_NOINLINE void PlayerListWidget_GetNameUnder(struct PlayerListWidget* w, int mouseX, int mouseY, String* name);
 
 
@@ -250,13 +250,13 @@ struct SpecialInputWidget {
 	bool pendingRedraw;
 	struct InputWidget* target;
 	struct Texture tex;
-	FontDesc font;
+	FontDesc* font;
 	struct SpecialInputTab tabs[5];
 	String colString;
 	char _colBuffer[DRAWER2D_MAX_COLS * 4];
 };
 
-CC_NOINLINE void SpecialInputWidget_Create(struct SpecialInputWidget* w, const FontDesc* font, struct InputWidget* target);
+CC_NOINLINE void SpecialInputWidget_Create(struct SpecialInputWidget* w, FontDesc* font, struct InputWidget* target);
 CC_NOINLINE void SpecialInputWidget_UpdateCols(struct SpecialInputWidget* w);
 CC_NOINLINE void SpecialInputWidget_SetActive(struct SpecialInputWidget* w, bool active);
 #endif