diff --git a/data/tracks/development/border-testtrack/border-testtrack-trk.ac b/data/tracks/development/border-testtrack/border-testtrack-trk.ac
index 8d780932b..1d265e452 100644
--- a/data/tracks/development/border-testtrack/border-testtrack-trk.ac
+++ b/data/tracks/development/border-testtrack/border-testtrack-trk.ac
@@ -342,7 +342,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB0"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 145.5 1 -210.5
 145.5 0 -210.5
@@ -534,7 +534,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB0"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 145.5 1 -220.5
 145.5 0 -220.5
@@ -2720,7 +2720,7 @@ name "TKMN9"
 kids 4
 OBJECT poly
 name "t0RB9"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 145.5 0 -210.5
 145.5 1 -210.5
@@ -2770,7 +2770,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB9"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 145.5 1 -210.5
 145.5 1 -210
@@ -2820,7 +2820,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB9"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 145.5 0 -220.5
 145.5 1 -220.5
@@ -2884,7 +2884,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB9"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 145.5 1 -221
 145.5 1 -220.5
@@ -2937,7 +2937,7 @@ name "TKMN12"
 kids 6
 OBJECT poly
 name "t0RB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 155.5 0 -210.5
 155.5 2 -210.5
@@ -2987,7 +2987,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 155.5 2 -210.5
 155.5 2 -210
@@ -3037,7 +3037,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 155.5 2 -210.5
 155.5 0 -210.5
@@ -3115,7 +3115,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 155.5 0 -220.5
 155.5 2 -220.5
@@ -3193,7 +3193,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 155.5 2 -221
 155.5 2 -220.5
@@ -3243,7 +3243,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 155.5 2 -220.5
 155.5 0 -220.5
@@ -3396,7 +3396,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB15"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 185.5 1 -210.5
 185.5 0 -210.5
@@ -3588,7 +3588,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB15"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 185.5 1 -220.5
 185.5 0 -220.5
@@ -5807,7 +5807,7 @@ name "TKMN21"
 kids 4
 OBJECT poly
 name "t0RB21"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 185.5 0 -210.5
 185.5 1 -210.5
@@ -5857,7 +5857,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB21"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 185.5 1 -210.5
 185.5 1 -210
@@ -5907,7 +5907,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB21"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 185.5 0 -220.5
 185.5 1 -220.5
@@ -5971,7 +5971,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB21"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 185.5 1 -221
 185.5 1 -220.5
@@ -6024,7 +6024,7 @@ name "TKMN24"
 kids 6
 OBJECT poly
 name "t0RB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 195.5 0 -210.5
 195.5 2 -210.5
@@ -6074,7 +6074,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 195.5 2 -210.5
 195.5 2 -210
@@ -6124,7 +6124,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 195.5 2 -210.5
 195.5 0 -210.5
@@ -6202,7 +6202,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 195.5 0 -220.5
 195.5 2 -220.5
@@ -6280,7 +6280,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 195.5 2 -221
 195.5 2 -220.5
@@ -6330,7 +6330,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 195.5 2 -220.5
 195.5 0 -220.5
@@ -6383,7 +6383,7 @@ name "TKMN27"
 kids 6
 OBJECT poly
 name "t0RB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 0 -210.5
 205.5 1 -210.5
@@ -6433,7 +6433,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 1 -210.5
 205.5 1 -210
@@ -6483,7 +6483,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 1 -210
 205.5 0 -210
@@ -6533,7 +6533,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 0 -221
 205.5 1 -221
@@ -6583,7 +6583,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 1 -221
 205.5 1 -220.5
@@ -6633,7 +6633,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 1 -220.5
 205.5 0 -220.5
@@ -6686,7 +6686,7 @@ name "TKMN30"
 kids 8
 OBJECT poly
 name "t0RB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 215.5 0 -210.5
 215.5 1 -210.5
@@ -6736,7 +6736,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 215.5 1 -210.5
 215.5 1 -209.5
@@ -6786,7 +6786,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 215.5 1 -210.5
 215.5 0 -210.5
@@ -6914,7 +6914,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 215.5 0 -220.5
 215.5 1 -220.5
@@ -6992,7 +6992,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 215.5 1 -221.5
 215.5 1 -220.5
@@ -7042,7 +7042,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 215.5 1 -220.5
 215.5 0 -220.5
@@ -8772,7 +8772,7 @@ name "TKMN33"
 kids 8
 OBJECT poly
 name "t0RB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 225.5 0 -210.5
 225.5 1 -210.5
@@ -8822,7 +8822,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 225.5 1 -210.5
 225.5 1 -210
@@ -8872,7 +8872,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 10
 225.5 1 -210
 225.5 0 -210
@@ -9112,7 +9112,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 10
 225.5 0 -221
 225.5 1 -221
@@ -9176,7 +9176,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 225.5 1 -221
 225.5 1 -220.5
@@ -9226,7 +9226,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 225.5 1 -220.5
 225.5 0 -220.5
@@ -9667,7 +9667,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB36"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 12
 255.5 2 -210.5
 255.5 0 -210.5
@@ -9957,7 +9957,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB36"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 255.5 2 -220.5
 255.5 0 -220.5
@@ -10010,7 +10010,7 @@ name "TKMN42"
 kids 4
 OBJECT poly
 name "t0RB42"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 255.5 0 -210.5
 255.5 2 -210.5
@@ -10060,7 +10060,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB42"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 255.5 2 -210.5
 255.5 2 -210
@@ -10110,7 +10110,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB42"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 12
 255.5 0 -220.5
 255.5 2 -220.5
@@ -10188,7 +10188,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB42"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 255.5 2 -221
 255.5 2 -220.5
@@ -10241,7 +10241,7 @@ name "TKMN45"
 kids 8
 OBJECT poly
 name "t0RB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 265.5 0 -210.5
 265.5 1.5 -210.5
@@ -10291,7 +10291,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 265.5 1.5 -210.5
 265.5 1.5 -209.5
@@ -10341,7 +10341,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 265.5 1.5 -210.5
 265.5 0 -210.5
@@ -10469,7 +10469,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 265.5 0 -220.5
 265.5 1.5 -220.5
@@ -10547,7 +10547,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 265.5 1.5 -221.5
 265.5 1.5 -220.5
@@ -10597,7 +10597,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 265.5 1.5 -220.5
 265.5 0 -220.5
@@ -10932,7 +10932,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0RB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 275.5 0 -210.5
 275.5 1 -210.5
@@ -10982,7 +10982,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 275.5 1 -210.5
 275.5 1 -210
@@ -11032,7 +11032,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 275.5 1 -210
 275.5 0 -210
@@ -11146,7 +11146,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 275.5 0 -221
 275.5 1 -221
@@ -11210,7 +11210,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 275.5 1 -221
 275.5 1 -220.5
@@ -11260,7 +11260,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 275.5 1 -220.5
 275.5 0 -220.5
diff --git a/data/tracks/development/border-testtrack/border-testtrack.ac b/data/tracks/development/border-testtrack/border-testtrack.ac
index bfe438e97..bb69cdd0a 100644
--- a/data/tracks/development/border-testtrack/border-testtrack.ac
+++ b/data/tracks/development/border-testtrack/border-testtrack.ac
@@ -342,7 +342,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB0"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 145.5 1 -210.5
 145.5 0 -210.5
@@ -534,7 +534,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB0"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 145.5 1 -220.5
 145.5 0 -220.5
@@ -2720,7 +2720,7 @@ name "TKMN9"
 kids 4
 OBJECT poly
 name "t0RB9"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 145.5 0 -210.5
 145.5 1 -210.5
@@ -2770,7 +2770,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB9"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 145.5 1 -210.5
 145.5 1 -210
@@ -2820,7 +2820,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB9"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 145.5 0 -220.5
 145.5 1 -220.5
@@ -2884,7 +2884,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB9"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 145.5 1 -221
 145.5 1 -220.5
@@ -2937,7 +2937,7 @@ name "TKMN12"
 kids 6
 OBJECT poly
 name "t0RB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 155.5 0 -210.5
 155.5 2 -210.5
@@ -2987,7 +2987,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 155.5 2 -210.5
 155.5 2 -210
@@ -3037,7 +3037,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 155.5 2 -210.5
 155.5 0 -210.5
@@ -3115,7 +3115,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 155.5 0 -220.5
 155.5 2 -220.5
@@ -3193,7 +3193,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 155.5 2 -221
 155.5 2 -220.5
@@ -3243,7 +3243,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB12"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 155.5 2 -220.5
 155.5 0 -220.5
@@ -3396,7 +3396,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB15"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 185.5 1 -210.5
 185.5 0 -210.5
@@ -3588,7 +3588,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB15"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 185.5 1 -220.5
 185.5 0 -220.5
@@ -5807,7 +5807,7 @@ name "TKMN21"
 kids 4
 OBJECT poly
 name "t0RB21"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 185.5 0 -210.5
 185.5 1 -210.5
@@ -5857,7 +5857,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB21"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 185.5 1 -210.5
 185.5 1 -210
@@ -5907,7 +5907,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB21"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 185.5 0 -220.5
 185.5 1 -220.5
@@ -5971,7 +5971,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB21"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 185.5 1 -221
 185.5 1 -220.5
@@ -6024,7 +6024,7 @@ name "TKMN24"
 kids 6
 OBJECT poly
 name "t0RB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 195.5 0 -210.5
 195.5 2 -210.5
@@ -6074,7 +6074,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 195.5 2 -210.5
 195.5 2 -210
@@ -6124,7 +6124,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 195.5 2 -210.5
 195.5 0 -210.5
@@ -6202,7 +6202,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 195.5 0 -220.5
 195.5 2 -220.5
@@ -6280,7 +6280,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 195.5 2 -221
 195.5 2 -220.5
@@ -6330,7 +6330,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB24"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 195.5 2 -220.5
 195.5 0 -220.5
@@ -6383,7 +6383,7 @@ name "TKMN27"
 kids 6
 OBJECT poly
 name "t0RB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 0 -210.5
 205.5 1 -210.5
@@ -6433,7 +6433,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 1 -210.5
 205.5 1 -210
@@ -6483,7 +6483,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 1 -210
 205.5 0 -210
@@ -6533,7 +6533,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 0 -221
 205.5 1 -221
@@ -6583,7 +6583,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 1 -221
 205.5 1 -220.5
@@ -6633,7 +6633,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB27"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 205.5 1 -220.5
 205.5 0 -220.5
@@ -6686,7 +6686,7 @@ name "TKMN30"
 kids 8
 OBJECT poly
 name "t0RB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 215.5 0 -210.5
 215.5 1 -210.5
@@ -6736,7 +6736,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 215.5 1 -210.5
 215.5 1 -209.5
@@ -6786,7 +6786,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 215.5 1 -210.5
 215.5 0 -210.5
@@ -6914,7 +6914,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 215.5 0 -220.5
 215.5 1 -220.5
@@ -6992,7 +6992,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 215.5 1 -221.5
 215.5 1 -220.5
@@ -7042,7 +7042,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB30"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 215.5 1 -220.5
 215.5 0 -220.5
@@ -8772,7 +8772,7 @@ name "TKMN33"
 kids 8
 OBJECT poly
 name "t0RB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 225.5 0 -210.5
 225.5 1 -210.5
@@ -8822,7 +8822,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 225.5 1 -210.5
 225.5 1 -210
@@ -8872,7 +8872,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 10
 225.5 1 -210
 225.5 0 -210
@@ -9112,7 +9112,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 10
 225.5 0 -221
 225.5 1 -221
@@ -9176,7 +9176,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 225.5 1 -221
 225.5 1 -220.5
@@ -9226,7 +9226,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB33"
-texture "tr-concrete_nmm.png"
+texture "test-wall-3.png"
 numvert 8
 225.5 1 -220.5
 225.5 0 -220.5
@@ -9667,7 +9667,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB36"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 12
 255.5 2 -210.5
 255.5 0 -210.5
@@ -9957,7 +9957,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB36"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 255.5 2 -220.5
 255.5 0 -220.5
@@ -10010,7 +10010,7 @@ name "TKMN42"
 kids 4
 OBJECT poly
 name "t0RB42"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 255.5 0 -210.5
 255.5 2 -210.5
@@ -10060,7 +10060,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB42"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 255.5 2 -210.5
 255.5 2 -210
@@ -10110,7 +10110,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB42"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 12
 255.5 0 -220.5
 255.5 2 -220.5
@@ -10188,7 +10188,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB42"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 255.5 2 -221
 255.5 2 -220.5
@@ -10241,7 +10241,7 @@ name "TKMN45"
 kids 8
 OBJECT poly
 name "t0RB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 265.5 0 -210.5
 265.5 1.5 -210.5
@@ -10291,7 +10291,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 265.5 1.5 -210.5
 265.5 1.5 -209.5
@@ -10341,7 +10341,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 265.5 1.5 -210.5
 265.5 0 -210.5
@@ -10469,7 +10469,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 12
 265.5 0 -220.5
 265.5 1.5 -220.5
@@ -10547,7 +10547,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 265.5 1.5 -221.5
 265.5 1.5 -220.5
@@ -10597,7 +10597,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB45"
-texture "tr-stone-wall2.png"
+texture "test-wall-2.png"
 numvert 8
 265.5 1.5 -220.5
 265.5 0 -220.5
@@ -10932,7 +10932,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0RB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 275.5 0 -210.5
 275.5 1 -210.5
@@ -10982,7 +10982,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1RB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 275.5 1 -210.5
 275.5 1 -210
@@ -11032,7 +11032,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2RB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 275.5 1 -210
 275.5 0 -210
@@ -11146,7 +11146,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t0LB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 10
 275.5 0 -221
 275.5 1 -221
@@ -11210,7 +11210,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t1LB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 275.5 1 -221
 275.5 1 -220.5
@@ -11260,7 +11260,7 @@ refs 3
 kids 0
 OBJECT poly
 name "t2LB48"
-texture "tr-wall_nmm.png"
+texture "test-wall-1.png"
 numvert 8
 275.5 1 -220.5
 275.5 0 -220.5
diff --git a/data/tracks/development/border-testtrack/border-testtrack.prj.xml b/data/tracks/development/border-testtrack/border-testtrack.prj.xml
index 0fa9a1e22..e294cf98f 100644
--- a/data/tracks/development/border-testtrack/border-testtrack.prj.xml
+++ b/data/tracks/development/border-testtrack/border-testtrack.prj.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<java version="18.0.1.1" class="java.beans.XMLDecoder">
+<java version="17.0.2" class="java.beans.XMLDecoder">
  <object class="utils.Properties">
   <void property="currentA">
    <double>-6.28318530717961</double>
@@ -8,7 +8,7 @@
    <double>2.9531932455029164E-12</double>
   </void>
   <void property="currentY">
-   <double>6.679101716144942E-13</double>
+   <double>9.521272659185342E-13</double>
   </void>
   <void property="path">
    <string>C:\Users\Bob\speed-dreams-code\data\tracks\development\border-testtrack</string>
diff --git a/data/tracks/development/border-testtrack/border-testtrack.xml b/data/tracks/development/border-testtrack/border-testtrack.xml
index d428f9bb1..c9f1ded45 100644
--- a/data/tracks/development/border-testtrack/border-testtrack.xml
+++ b/data/tracks/development/border-testtrack/border-testtrack.xml
@@ -2,7 +2,7 @@
 <!--
 file                : border-testtrack.xml
 auto generated      : by sd2-trackeditor
-version             : 1.2.52
+version             : 1.4.58
 copyright           : (C) 2005 by Charalampos Alexopoulos
 -->
 <!--
@@ -19,7 +19,55 @@ the Free Software Foundation; either version 2 of the License, or
 
 <params name="border-testtrack" type="param" mode="mw">
   <section name="Track Lights" />
-  <section name="Surfaces">&default-surfaces;</section>
+  <section name="Surfaces">
+    &default-surfaces;
+    <section name="test-wall-1">
+      <attnum name="color R1" val="0.1" />
+      <attnum name="color G1" val="0.1" />
+      <attnum name="color B1" val="0.1" />
+      <attnum name="color R2" val="0.2" />
+      <attnum name="color G2" val="0.2" />
+      <attnum name="color B2" val="0.2" />
+      <attstr name="texture name" val="test-wall-1.png" />
+      <attstr name="texture type" val="continuous" />
+      <attnum name="texture size" unit="m" val="3.0" />
+      <attnum name="texture mipmap" unit="m" val="0.0" />
+      <attnum name="friction" val="0.05" />
+      <attnum name="bump size" unit="m" val="2.0" />
+    </section>
+    <section name="test-wall-2">
+      <attnum name="color R1" val="0.1" />
+      <attnum name="color G1" val="0.1" />
+      <attnum name="color B1" val="0.1" />
+      <attnum name="color R2" val="0.2" />
+      <attnum name="color G2" val="0.2" />
+      <attnum name="color B2" val="0.2" />
+      <attstr name="texture name" val="test-wall-2.png" />
+      <attstr name="texture type" val="continuous" />
+      <attnum name="texture size" unit="m" val="3.0" />
+      <attnum name="texture mipmap" unit="m" val="0.0" />
+      <attnum name="friction" val="0.1" />
+      <attnum name="bump size" unit="m" val="2.0" />
+    </section>
+    <section name="test-wall-3">
+      <attnum name="color R1" val="0.3" />
+      <attnum name="color G1" val="0.3" />
+      <attnum name="color B1" val="0.3" />
+      <attnum name="color R2" val="0.4" />
+      <attnum name="color G2" val="0.4" />
+      <attnum name="color B2" val="0.4" />
+      <attstr name="texture name" val="test-wall-3.png" />
+      <attstr name="texture type" val="continuous" />
+      <attnum name="texture size" unit="m" val="15.0" />
+      <attnum name="texture mipmap" unit="m" val="0.0" />
+      <attnum name="friction" val="0.8" />
+      <attnum name="rolling resistance" val="0.015" />
+      <attstr name="bump name" val="bump-as.png" />
+      <attnum name="bump size" unit="m" val="2.0" />
+      <attnum name="roughness" unit="m" val="0.001" />
+      <attnum name="roughness wavelength" unit="m" val="0.05" />
+    </section>
+  </section>
   <section name="Objects">&default-objects;</section>
   <section name="Header">
     <attstr name="name" val="Border Test Track" />
@@ -34,6 +82,7 @@ the Free Software Foundation; either version 2 of the License, or
     <section name="Turn Marks" />
     <section name="Terrain Generation">
       <section name="Object Maps" />
+      <section name="Objects" />
     </section>
     <section name="Environment Mapping" />
   </section>
@@ -193,7 +242,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="wall" />
+          <attstr name="surface" val="test-wall-1" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -204,7 +253,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="wall" />
+          <attstr name="surface" val="test-wall-1" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -222,7 +271,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="2.0" />
-          <attstr name="surface" val="wall2" />
+          <attstr name="surface" val="test-wall-2" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -233,7 +282,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="2.0" />
-          <attstr name="surface" val="wall2" />
+          <attstr name="surface" val="test-wall-2" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -309,7 +358,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="wall" />
+          <attstr name="surface" val="test-wall-1" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -320,7 +369,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="wall" />
+          <attstr name="surface" val="test-wall-1" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -338,7 +387,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="2.0" />
-          <attstr name="surface" val="wall2" />
+          <attstr name="surface" val="test-wall-2" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -349,7 +398,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="2.0" />
-          <attstr name="surface" val="wall2" />
+          <attstr name="surface" val="test-wall-2" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -367,7 +416,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="concrete" />
+          <attstr name="surface" val="test-wall-3" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -378,7 +427,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="concrete" />
+          <attstr name="surface" val="test-wall-3" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -396,7 +445,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="1.0" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="wall2" />
+          <attstr name="surface" val="test-wall-2" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -407,7 +456,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="1.0" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="wall2" />
+          <attstr name="surface" val="test-wall-2" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -425,7 +474,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="concrete" />
+          <attstr name="surface" val="test-wall-3" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -436,7 +485,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="concrete" />
+          <attstr name="surface" val="test-wall-3" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -500,7 +549,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="2.0" />
-          <attstr name="surface" val="wall" />
+          <attstr name="surface" val="test-wall-1" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -511,7 +560,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="2.0" />
-          <attstr name="surface" val="wall" />
+          <attstr name="surface" val="test-wall-1" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -529,7 +578,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="1.0" />
           <attnum name="height" unit="m" val="1.5" />
-          <attstr name="surface" val="wall2" />
+          <attstr name="surface" val="test-wall-2" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -540,7 +589,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="1.0" />
           <attnum name="height" unit="m" val="1.5" />
-          <attstr name="surface" val="wall2" />
+          <attstr name="surface" val="test-wall-2" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
@@ -558,7 +607,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Left Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="wall" />
+          <attstr name="surface" val="test-wall-1" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of left part-->
@@ -569,7 +618,7 @@ the Free Software Foundation; either version 2 of the License, or
         <section name="Right Border">
           <attnum name="width" unit="m" val="0.5" />
           <attnum name="height" unit="m" val="1.0" />
-          <attstr name="surface" val="wall" />
+          <attstr name="surface" val="test-wall-1" />
           <attstr name="style" val="wall" />
         </section>
         <!--End of right part-->
diff --git a/data/tracks/development/border-testtrack/test-wall-1.png b/data/tracks/development/border-testtrack/test-wall-1.png
new file mode 100644
index 000000000..a4b4fa3d0
Binary files /dev/null and b/data/tracks/development/border-testtrack/test-wall-1.png differ
diff --git a/data/tracks/development/border-testtrack/test-wall-2.png b/data/tracks/development/border-testtrack/test-wall-2.png
new file mode 100644
index 000000000..2a09ab85e
Binary files /dev/null and b/data/tracks/development/border-testtrack/test-wall-2.png differ
diff --git a/data/tracks/development/border-testtrack/test-wall-3.png b/data/tracks/development/border-testtrack/test-wall-3.png
new file mode 100644
index 000000000..49213d7f5
Binary files /dev/null and b/data/tracks/development/border-testtrack/test-wall-3.png differ