diff --git a/MLEM/Font/GenericFont.cs b/MLEM/Font/GenericFont.cs
index 4fb7197..75de4e9 100644
--- a/MLEM/Font/GenericFont.cs
+++ b/MLEM/Font/GenericFont.cs
@@ -219,37 +219,8 @@ namespace MLEM.Font {
         }
 
         private void DrawString(SpriteBatch batch, CodePointSource text, Vector2 position, Color color, float rotation, Vector2 origin, Vector2 scale, SpriteEffects effects, float layerDepth) {
-            var (flipX, flipY) = (0F, 0F);
-            var flippedV = (effects & SpriteEffects.FlipVertically) != 0;
-            var flippedH = (effects & SpriteEffects.FlipHorizontally) != 0;
-            if (flippedV || flippedH) {
-                var size = this.MeasureString(text, false);
-                if (flippedH) {
-                    origin.X *= -1;
-                    flipX = -size.X;
-                }
-                if (flippedV) {
-                    origin.Y *= -1;
-                    flipY = this.LineHeight - size.Y;
-                }
-            }
-
-            var trans = Matrix.Identity;
-            if (rotation == 0) {
-                trans.M11 = flippedH ? -scale.X : scale.X;
-                trans.M22 = flippedV ? -scale.Y : scale.Y;
-                trans.M41 = (flipX - origin.X) * trans.M11 + position.X;
-                trans.M42 = (flipY - origin.Y) * trans.M22 + position.Y;
-            } else {
-                var sin = (float) Math.Sin(rotation);
-                var cos = (float) Math.Cos(rotation);
-                trans.M11 = (flippedH ? -scale.X : scale.X) * cos;
-                trans.M12 = (flippedH ? -scale.X : scale.X) * sin;
-                trans.M21 = (flippedV ? -scale.Y : scale.Y) * -sin;
-                trans.M22 = (flippedV ? -scale.Y : scale.Y) * cos;
-                trans.M41 = (flipX - origin.X) * trans.M11 + (flipY - origin.Y) * trans.M21 + position.X;
-                trans.M42 = (flipX - origin.X) * trans.M12 + (flipY - origin.Y) * trans.M22 + position.Y;
-            }
+            var flipSize = effects != SpriteEffects.None ? this.MeasureString(text, false) : Vector2.Zero;
+            var trans = this.CalculateStringTransform(position, rotation, origin, scale, flipSize, effects);
 
             var offset = Vector2.Zero;
             var index = 0;
@@ -263,11 +234,11 @@ namespace MLEM.Font {
                     var charSize = this.MeasureString(character);
 
                     var charPos = offset;
-                    if (flippedH)
+                    if ((effects & SpriteEffects.FlipHorizontally) != 0)
                         charPos.X += charSize.X;
-                    if (flippedV)
+                    if ((effects & SpriteEffects.FlipVertically) != 0)
                         charPos.Y += charSize.Y - this.LineHeight;
-                    Vector2.Transform(ref charPos, ref trans, out charPos);
+                    charPos = Vector2.Transform(charPos, trans);
 
                     this.DrawCharacter(batch, codePoint, character, charPos, color, rotation, scale, effects, layerDepth);
                     offset.X += charSize.X;
@@ -396,6 +367,40 @@ namespace MLEM.Font {
             }
         }
 
+        internal Matrix CalculateStringTransform(Vector2 position, float rotation, Vector2 origin, Vector2 scale, Vector2 flipSize, SpriteEffects effects) {
+            var (flipX, flipY) = (0F, 0F);
+            var flippedV = (effects & SpriteEffects.FlipVertically) != 0;
+            var flippedH = (effects & SpriteEffects.FlipHorizontally) != 0;
+            if (flippedV || flippedH) {
+                if (flippedH) {
+                    origin.X *= -1;
+                    flipX = -flipSize.X;
+                }
+                if (flippedV) {
+                    origin.Y *= -1;
+                    flipY = this.LineHeight - flipSize.Y;
+                }
+            }
+
+            var trans = Matrix.Identity;
+            if (rotation == 0) {
+                trans.M11 = flippedH ? -scale.X : scale.X;
+                trans.M22 = flippedV ? -scale.Y : scale.Y;
+                trans.M41 = (flipX - origin.X) * trans.M11 + position.X;
+                trans.M42 = (flipY - origin.Y) * trans.M22 + position.Y;
+            } else {
+                var sin = (float) Math.Sin(rotation);
+                var cos = (float) Math.Cos(rotation);
+                trans.M11 = (flippedH ? -scale.X : scale.X) * cos;
+                trans.M12 = (flippedH ? -scale.X : scale.X) * sin;
+                trans.M21 = (flippedV ? -scale.Y : scale.Y) * -sin;
+                trans.M22 = (flippedV ? -scale.Y : scale.Y) * cos;
+                trans.M41 = (flipX - origin.X) * trans.M11 + (flipY - origin.Y) * trans.M21 + position.X;
+                trans.M42 = (flipX - origin.X) * trans.M12 + (flipY - origin.Y) * trans.M22 + position.Y;
+            }
+            return trans;
+        }
+
         private static bool IsTrailingSpace(CodePointSource s, int index) {
             while (index < s.Length) {
                 var (codePoint, length) = s.GetCodePoint(index);
diff --git a/Sandbox/GameImpl.cs b/Sandbox/GameImpl.cs
index 5deb728..2204287 100644
--- a/Sandbox/GameImpl.cs
+++ b/Sandbox/GameImpl.cs
@@ -11,6 +11,7 @@ using MLEM.Data;
 using MLEM.Data.Content;
 using MLEM.Extended.Font;
 using MLEM.Extensions;
+using MLEM.Font;
 using MLEM.Formatting;
 using MLEM.Formatting.Codes;
 using MLEM.Graphics;
@@ -70,9 +71,7 @@ public class GameImpl : MlemGame {
         //var font = new GenericSpriteFont(LoadContent<SpriteFont>("Fonts/TestFont"));
         //var font = new GenericBitmapFont(LoadContent<BitmapFont>("Fonts/Regular"));
         var font = new GenericStashFont(system.GetFont(32));
-        /*
         var spriteFont = new GenericSpriteFont(MlemGame.LoadContent<SpriteFont>("Fonts/TestFont"));
-        */
         this.UiSystem.Style = new UntexturedStyle(this.SpriteBatch) {
             Font = font,
             TextScale = 0.5F,
@@ -258,7 +257,7 @@ public class GameImpl : MlemGame {
         }).SetData("Ref", "Main");
         this.UiSystem.Add("SpillTest", spillPanel);
 
-        /* var regularFont = spriteFont.Font;
+         var regularFont = spriteFont.Font;
          var genericFont = spriteFont;
 
          var index = 0;
@@ -294,7 +293,7 @@ public class GameImpl : MlemGame {
                  genericFont.DrawString(this.SpriteBatch, testString, pos, Color.Green, rotation, origin, scale, effects, 0);
              }
              this.SpriteBatch.End();
-         };*/
+         };
 
         /*var viewport = new BoxingViewportAdapter(this.Window, this.GraphicsDevice, 1280, 720);
         var newPanel = new Panel(Anchor.TopLeft, new Vector2(200, 100), new Vector2(10, 10));