diff --git a/src/playlist.cpp b/src/playlist.cpp
index 7836082..abe8c7a 100644
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -7,6 +7,9 @@
 #include "xm/CottageFantasy.xm.h"
 #include "xm/RedBlossom.xm.h"
 #include "xm/TheClockOfElery.xm.h"
+#include "xm/ForestAtTwilight.xm.h"
+#include "xm/SpringWaltz.xm.h"
+#include "xm/TheMountainsOfElmindeer.xm.h"
 #include "xm/SummerDreamsDemoTrackv4.xm.h"
 
 #include "scene/tracker/cover.hpp"
@@ -42,6 +45,24 @@ namespace playlist {
       .start = (int)&_binary_xm_TheClockOfElery_xm_start,
       .cover_ix = scene::tracker::cover::clocks,
     },
+    {
+      .artist = "Shiroiii",
+      .title = "Forest At Twilight",
+      .start = (int)&_binary_xm_ForestAtTwilight_xm_start,
+      .cover_ix = scene::tracker::cover::silvertrees,
+    },
+    {
+      .artist = "Shiroiii",
+      .title = "Spring Waltz",
+      .start = (int)&_binary_xm_SpringWaltz_xm_start,
+      .cover_ix = scene::tracker::cover::tree,
+    },
+    {
+      .artist = "Shiroiii",
+      .title = "Mountains of Elmindeer",
+      .start = (int)&_binary_xm_TheMountainsOfElmindeer_xm_start,
+      .cover_ix = scene::tracker::cover::mountain,
+    },
     {
       .artist = "Cai",
       .title = "SummerDreamsDemov4",
diff --git a/src/scene/tracker/metadata.cpp b/src/scene/tracker/metadata.cpp
index 3d35177..83462b2 100644
--- a/src/scene/tracker/metadata.cpp
+++ b/src/scene/tracker/metadata.cpp
@@ -37,14 +37,14 @@ namespace scene::tracker::metadata {
 
     y += glyph::vert_advance + 8;
 
-    const char * title = (const char *)state.xm.header->module_name;
-
+    //const char * title = (const char *)state.xm.header->module_name;
+    const char * title = playlist::playlist[playlist::state.playlist_ix].title;
     transfer_string(writer, title,
                     x, y, 1.0 / 10.0,
                     0xffffff);
   }
 
-  const float border_width = 20 * glyph::hori_advance + 2 * 2;
+  const float border_width = 22 * glyph::hori_advance + 2 * 2;
   const float border_height = 1 * glyph::vert_advance + 2 * 2;
 
   const float outer_top_depth = 1.0 / 20;
diff --git a/src/scene/tracker/tracklist.cpp b/src/scene/tracker/tracklist.cpp
index f33ab7b..22787ec 100644
--- a/src/scene/tracker/tracklist.cpp
+++ b/src/scene/tracker/tracklist.cpp
@@ -23,7 +23,7 @@ namespace scene::tracker::tracklist {
     samples_tab = true;
   }
 
-  const float width = glyph::hori_advance * 20 + 3 * 2;
+  const float width = glyph::hori_advance * 22 + 3 * 2;
   const int line_rows_half = 5;
   const int line_rows = line_rows_half * 2 + 1;
   const float height = (glyph::vert_advance + 1) * line_rows + 3 * 2;
diff --git a/xm/ForestAtTwilight.xm b/xm/ForestAtTwilight.xm
new file mode 100644
index 0000000..2797aa2
Binary files /dev/null and b/xm/ForestAtTwilight.xm differ
diff --git a/xm/ForestAtTwilight.xm.h b/xm/ForestAtTwilight.xm.h
new file mode 100644
index 0000000..7b8d75e
--- /dev/null
+++ b/xm/ForestAtTwilight.xm.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_xm_ForestAtTwilight_xm_start __asm("_binary_xm_ForestAtTwilight_xm_start");
+extern uint32_t _binary_xm_ForestAtTwilight_xm_end __asm("_binary_xm_ForestAtTwilight_xm_end");
+extern uint32_t _binary_xm_ForestAtTwilight_xm_size __asm("_binary_xm_ForestAtTwilight_xm_size");
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/xm/SpringWaltz.xm b/xm/SpringWaltz.xm
new file mode 100644
index 0000000..7127358
Binary files /dev/null and b/xm/SpringWaltz.xm differ
diff --git a/xm/SpringWaltz.xm.h b/xm/SpringWaltz.xm.h
new file mode 100644
index 0000000..b3dcbe7
--- /dev/null
+++ b/xm/SpringWaltz.xm.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_xm_SpringWaltz_xm_start __asm("_binary_xm_SpringWaltz_xm_start");
+extern uint32_t _binary_xm_SpringWaltz_xm_end __asm("_binary_xm_SpringWaltz_xm_end");
+extern uint32_t _binary_xm_SpringWaltz_xm_size __asm("_binary_xm_SpringWaltz_xm_size");
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/xm/TheMountainsOfElmindeer.xm b/xm/TheMountainsOfElmindeer.xm
new file mode 100644
index 0000000..4b28252
Binary files /dev/null and b/xm/TheMountainsOfElmindeer.xm differ
diff --git a/xm/TheMountainsOfElmindeer.xm.h b/xm/TheMountainsOfElmindeer.xm.h
new file mode 100644
index 0000000..12414de
--- /dev/null
+++ b/xm/TheMountainsOfElmindeer.xm.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_xm_TheMountainsOfElmindeer_xm_start __asm("_binary_xm_TheMountainsOfElmindeer_xm_start");
+extern uint32_t _binary_xm_TheMountainsOfElmindeer_xm_end __asm("_binary_xm_TheMountainsOfElmindeer_xm_end");
+extern uint32_t _binary_xm_TheMountainsOfElmindeer_xm_size __asm("_binary_xm_TheMountainsOfElmindeer_xm_size");
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/xm_player.mk b/xm_player.mk
index ab3eb55..12f4698 100644
--- a/xm_player.mk
+++ b/xm_player.mk
@@ -3,6 +3,9 @@ XM_OBJ = \
 	xm/CottageFantasy.xm.o \
 	xm/RedBlossom.xm.o \
 	xm/TheClockOfElery.xm.o \
+	xm/ForestAtTwilight.xm.o \
+	xm/SpringWaltz.xm.o \
+	xm/TheMountainsOfElmindeer.xm.o \
 	xm/SummerDreamsDemoTrackv4.xm.o
 
 TEXTURE_OBJ = \