diff --git a/mods/ra/tilesets/interior.yaml b/mods/ra/tilesets/interior.yaml
index 1e7481a577..cd58f36c46 100644
--- a/mods/ra/tilesets/interior.yaml
+++ b/mods/ra/tilesets/interior.yaml
@@ -3,6 +3,7 @@ General:
 	Id: INTERIOR
 	Extensions: .int, .shp, .tem
 	Palette: interior.pal
+	EditorTemplateOrder: Floor, Wall
 
 Terrain:
 	TerrainType@Clear:
@@ -37,6 +38,7 @@ Templates:
 		Image: clear1
 		Size: 1,1
 		PickAny: True
+		Category: Floor
 		Tiles:
 			0: Clear
 			1: Clear
@@ -59,6 +61,7 @@ Templates:
 		Image: clear1
 		PickAny: True
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 			1: Clear
@@ -80,138 +83,161 @@ Templates:
 		Id: 329
 		Image: wall0001
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@330:
 		Id: 330
 		Image: wall0002
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@331:
 		Id: 331
 		Image: wall0003
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@332:
 		Id: 332
 		Image: wall0004
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@333:
 		Id: 333
 		Image: wall0005
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@334:
 		Id: 334
 		Image: wall0006
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@335:
 		Id: 335
 		Image: wall0007
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@336:
 		Id: 336
 		Image: wall0008
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@337:
 		Id: 337
 		Image: wall0009
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@338:
 		Id: 338
 		Image: wall0010
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@339:
 		Id: 339
 		Image: wall0011
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@340:
 		Id: 340
 		Image: wall0012
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@341:
 		Id: 341
 		Image: wall0013
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@342:
 		Id: 342
 		Image: wall0014
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@343:
 		Id: 343
 		Image: wall0015
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@344:
 		Id: 344
 		Image: wall0016
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@345:
 		Id: 345
 		Image: wall0017
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@346:
 		Id: 346
 		Image: wall0018
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@347:
 		Id: 347
 		Image: wall0019
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@348:
 		Id: 348
 		Image: wall0020
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@349:
 		Id: 349
 		Image: wall0021
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@350:
 		Id: 350
 		Image: wall0022
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@351:
 		Id: 351
 		Image: wall0023
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -220,6 +246,7 @@ Templates:
 		Id: 352
 		Image: wall0024
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -228,6 +255,7 @@ Templates:
 		Id: 353
 		Image: wall0025
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -236,6 +264,7 @@ Templates:
 		Id: 354
 		Image: wall0026
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -244,6 +273,7 @@ Templates:
 		Id: 355
 		Image: wall0027
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -252,6 +282,7 @@ Templates:
 		Id: 356
 		Image: wall0028
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -260,6 +291,7 @@ Templates:
 		Id: 357
 		Image: wall0029
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -268,6 +300,7 @@ Templates:
 		Id: 358
 		Image: wall0030
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -276,6 +309,7 @@ Templates:
 		Id: 359
 		Image: wall0031
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			2: Wall
@@ -284,6 +318,7 @@ Templates:
 		Id: 360
 		Image: wall0032
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			2: Wall
@@ -292,6 +327,7 @@ Templates:
 		Id: 361
 		Image: wall0033
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			2: Wall
@@ -300,6 +336,7 @@ Templates:
 		Id: 362
 		Image: wall0034
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			2: Wall
@@ -308,6 +345,7 @@ Templates:
 		Id: 363
 		Image: wall0035
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			1: Wall
 			2: Wall
@@ -316,6 +354,7 @@ Templates:
 		Id: 364
 		Image: wall0036
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			1: Wall
 			2: Wall
@@ -324,6 +363,7 @@ Templates:
 		Id: 365
 		Image: wall0037
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			1: Wall
 			2: Wall
@@ -332,6 +372,7 @@ Templates:
 		Id: 366
 		Image: wall0038
 		Size: 2,2
+		Category: Wall
 		Tiles:
 			1: Wall
 			2: Wall
@@ -340,6 +381,7 @@ Templates:
 		Id: 367
 		Image: wall0039
 		Size: 2,3
+		Category: Wall
 		Tiles:
 			0: Wall
 			2: Wall
@@ -349,6 +391,7 @@ Templates:
 		Id: 368
 		Image: wall0040
 		Size: 2,3
+		Category: Wall
 		Tiles:
 			0: Wall
 			2: Wall
@@ -358,6 +401,7 @@ Templates:
 		Id: 369
 		Image: wall0041
 		Size: 2,3
+		Category: Wall
 		Tiles:
 			1: Wall
 			2: Wall
@@ -367,6 +411,7 @@ Templates:
 		Id: 370
 		Image: wall0042
 		Size: 2,3
+		Category: Wall
 		Tiles:
 			1: Wall
 			2: Wall
@@ -376,6 +421,7 @@ Templates:
 		Id: 371
 		Image: wall0043
 		Size: 3,2
+		Category: Wall
 		Tiles:
 			1: Wall
 			3: Wall
@@ -385,6 +431,7 @@ Templates:
 		Id: 372
 		Image: wall0044
 		Size: 3,2
+		Category: Wall
 		Tiles:
 			1: Wall
 			3: Wall
@@ -394,6 +441,7 @@ Templates:
 		Id: 373
 		Image: wall0045
 		Size: 3,2
+		Category: Wall
 		Tiles:
 			1: Wall
 			3: Wall
@@ -403,6 +451,7 @@ Templates:
 		Id: 374
 		Image: wall0046
 		Size: 3,2
+		Category: Wall
 		Tiles:
 			1: Wall
 			3: Wall
@@ -412,6 +461,7 @@ Templates:
 		Id: 375
 		Image: wall0047
 		Size: 3,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -421,6 +471,7 @@ Templates:
 		Id: 376
 		Image: wall0048
 		Size: 3,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -430,6 +481,7 @@ Templates:
 		Id: 377
 		Image: wall0049
 		Size: 3,3
+		Category: Wall
 		Tiles:
 			1: Wall
 			3: Wall
@@ -440,54 +492,63 @@ Templates:
 		Id: 268
 		Image: flor0001
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@269:
 		Id: 269
 		Image: flor0002
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@270:
 		Id: 270
 		Image: flor0003
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@271:
 		Id: 271
 		Image: flor0004
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@272:
 		Id: 272
 		Image: flor0005
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@273:
 		Id: 273
 		Image: flor0006
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@274:
 		Id: 274
 		Image: flor0007
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@384:
 		Id: 384
 		Image: xtra0001
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Wall
 	Template@385:
 		Id: 385
 		Image: xtra0002
 		Size: 2,1
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Clear
@@ -495,12 +556,14 @@ Templates:
 		Id: 386
 		Image: xtra0003
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@387:
 		Id: 387
 		Image: xtra0004
 		Size: 1,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Clear
@@ -508,12 +571,14 @@ Templates:
 		Id: 388
 		Image: xtra0005
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@389:
 		Id: 389
 		Image: xtra0006
 		Size: 2,1
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Clear
@@ -521,12 +586,14 @@ Templates:
 		Id: 390
 		Image: xtra0007
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@391:
 		Id: 391
 		Image: xtra0008
 		Size: 1,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Clear
@@ -534,24 +601,28 @@ Templates:
 		Id: 392
 		Image: xtra0009
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@393:
 		Id: 393
 		Image: xtra0010
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@394:
 		Id: 394
 		Image: xtra0011
 		Size: 1,1
+		Category: Wall
 		Tiles:
 			0: Wall
 	Template@395:
 		Id: 395
 		Image: xtra0012
 		Size: 1,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Clear
@@ -559,6 +630,7 @@ Templates:
 		Id: 396
 		Image: xtra0013
 		Size: 1,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Clear
@@ -566,6 +638,7 @@ Templates:
 		Id: 397
 		Image: xtra0014
 		Size: 3,2
+		Category: Wall
 		Tiles:
 			0: Clear
 			1: Wall
@@ -577,6 +650,7 @@ Templates:
 		Id: 398
 		Image: xtra0015
 		Size: 3,2
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -588,6 +662,7 @@ Templates:
 		Id: 399
 		Image: xtra0016
 		Size: 2,4
+		Category: Wall
 		Tiles:
 			0: Wall
 			1: Wall
@@ -601,246 +676,287 @@ Templates:
 		Id: 318
 		Image: strp0001
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@319:
 		Id: 319
 		Image: strp0002
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@320:
 		Id: 320
 		Image: strp0003
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@321:
 		Id: 321
 		Image: strp0004
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@322:
 		Id: 322
 		Image: strp0005
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@323:
 		Id: 323
 		Image: strp0006
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@324:
 		Id: 324
 		Image: strp0007
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@325:
 		Id: 325
 		Image: strp0008
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@326:
 		Id: 326
 		Image: strp0009
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@327:
 		Id: 327
 		Image: strp0010
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@328:
 		Id: 328
 		Image: strp0011
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@253:
 		Id: 253
 		Image: arro0001
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@254:
 		Id: 254
 		Image: arro0002
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@256:
 		Id: 256
 		Image: arro0004
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@257:
 		Id: 257
 		Image: arro0005
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@258:
 		Id: 258
 		Image: arro0006
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@259:
 		Id: 259
 		Image: arro0007
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@260:
 		Id: 260
 		Image: arro0008
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@261:
 		Id: 261
 		Image: arro0009
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@262:
 		Id: 262
 		Image: arro0010
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@263:
 		Id: 263
 		Image: arro0011
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@264:
 		Id: 264
 		Image: arro0012
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@265:
 		Id: 265
 		Image: arro0013
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@266:
 		Id: 266
 		Image: arro0014
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@267:
 		Id: 267
 		Image: arro0015
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@275:
 		Id: 275
 		Image: gflr0001
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@276:
 		Id: 276
 		Image: gflr0002
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@277:
 		Id: 277
 		Image: gflr0003
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@278:
 		Id: 278
 		Image: gflr0004
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@279:
 		Id: 279
 		Image: gflr0005
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@280:
 		Id: 280
 		Image: gstr0001
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@281:
 		Id: 281
 		Image: gstr0002
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@282:
 		Id: 282
 		Image: gstr0003
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@283:
 		Id: 283
 		Image: gstr0004
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@284:
 		Id: 284
 		Image: gstr0005
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@285:
 		Id: 285
 		Image: gstr0006
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@286:
 		Id: 286
 		Image: gstr0007
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@287:
 		Id: 287
 		Image: gstr0008
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@288:
 		Id: 288
 		Image: gstr0009
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@289:
 		Id: 289
 		Image: gstr0010
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 	Template@290:
 		Id: 290
 		Image: gstr0011
 		Size: 1,1
+		Category: Floor
 		Tiles:
 			0: Clear
 
diff --git a/mods/ts/tilesets/interior.yaml b/mods/ts/tilesets/interior.yaml
index 6a59d411dd..3c6184d0b9 100644
--- a/mods/ts/tilesets/interior.yaml
+++ b/mods/ts/tilesets/interior.yaml
@@ -3,6 +3,7 @@ General:
 	Id: INTERIOR
 	Extensions: .tem, .shp
 	Palette: isotem.pal
+	EditorTemplateOrder: Placeholder
 
 Terrain:
 	TerrainType@Clear:
@@ -16,6 +17,7 @@ Templates:
 		Id: 255
 		Image: clear01
 		Size: 1,1
+		Category: Placeholder
 		Tiles:
 			0: Clear