diff --git a/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs
index 4f432b26a..6d3058e0c 100644
--- a/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs
+++ b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs
@@ -69,11 +69,9 @@ namespace Artemis.Modules.Effects.TypeWave
             if (_waves.Count == 0)
                 return null;
 
-            var bitmap = new Bitmap(21, 6);
+            var bitmap = MainModel.ActiveKeyboard.KeyboardBitmap();
             using (var g = Graphics.FromImage(bitmap))
             {
-                // TODO: Might implement a user-defined background color, but looks ugly most of the time
-                //g.Clear(Color.FromArgb(100, 255, 0, 255));
                 g.Clear(Color.Transparent);
                 g.SmoothingMode = SmoothingMode.HighQuality;