diff --git a/mods/ra/maps/map/map.bin b/mods/ra/maps/boomer-test-map/map.bin
similarity index 100%
rename from mods/ra/maps/map/map.bin
rename to mods/ra/maps/boomer-test-map/map.bin
diff --git a/mods/ra/maps/boomer-test-map/map.uid b/mods/ra/maps/boomer-test-map/map.uid
new file mode 100644
index 0000000000..65ee953911
--- /dev/null
+++ b/mods/ra/maps/boomer-test-map/map.uid
@@ -0,0 +1 @@
+31c663cec5eca92bed049fe4079ec1fed1ca3855
\ No newline at end of file
diff --git a/mods/ra/maps/map/map.yaml b/mods/ra/maps/boomer-test-map/map.yaml
similarity index 89%
rename from mods/ra/maps/map/map.yaml
rename to mods/ra/maps/boomer-test-map/map.yaml
index a6734a115b..8e9ca42a71 100644
--- a/mods/ra/maps/map/map.yaml
+++ b/mods/ra/maps/boomer-test-map/map.yaml
@@ -25,6 +25,8 @@ Players:
 		Race: allies
 		OwnsWorld: True
 		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
 
 Actors:
 	Actor0: mine
diff --git a/mods/ra/maps/central-conflict/map.uid b/mods/ra/maps/central-conflict/map.uid
index 49251872e4..f49540adcd 100644
--- a/mods/ra/maps/central-conflict/map.uid
+++ b/mods/ra/maps/central-conflict/map.uid
@@ -1 +1 @@
-254edf0f33aa9286ab006abced55bdc66f29e1be
\ No newline at end of file
+a30fbc315ac88a5d55e5d29cd2f44b60551ce7ae
\ No newline at end of file
diff --git a/mods/ra/maps/central-conflict/map.yaml b/mods/ra/maps/central-conflict/map.yaml
index a107e3d14d..4c4a884d91 100644
--- a/mods/ra/maps/central-conflict/map.yaml
+++ b/mods/ra/maps/central-conflict/map.yaml
@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 2
+MapFormat: 3
 
 Title: Central Conflict
 
@@ -27,484 +27,292 @@ Players:
 		Color2: 255,44,28,24
 
 Actors:
-	ActorReference@Actor0:
-		Id: Actor0
-		Type: tc05
+	Actor0: tc05
 		Location: 73,64
 		Owner: Neutral
-	ActorReference@Actor1:
-		Id: Actor1
-		Type: tc05
+	Actor1: tc05
 		Location: 59,60
 		Owner: Neutral
-	ActorReference@Actor2:
-		Id: Actor2
-		Type: t01
+	Actor2: t01
 		Location: 63,61
 		Owner: Neutral
-	ActorReference@Actor3:
-		Id: Actor3
-		Type: t01
+	Actor3: t01
 		Location: 62,61
 		Owner: Neutral
-	ActorReference@Actor4:
-		Id: Actor4
-		Type: t02
+	Actor4: t02
 		Location: 66,61
 		Owner: Neutral
-	ActorReference@Actor5:
-		Id: Actor5
-		Type: tc05
+	Actor5: tc05
 		Location: 67,61
 		Owner: Neutral
-	ActorReference@Actor6:
-		Id: Actor6
-		Type: tc05
+	Actor6: tc05
 		Location: 64,48
 		Owner: Neutral
-	ActorReference@Actor7:
-		Id: Actor7
-		Type: tc03
+	Actor7: tc03
 		Location: 58,50
 		Owner: Neutral
-	ActorReference@Actor8:
-		Id: Actor8
-		Type: tc02
+	Actor8: tc02
 		Location: 64,51
 		Owner: Neutral
-	ActorReference@Actor9:
-		Id: Actor9
-		Type: tc02
+	Actor9: tc02
 		Location: 28,21
 		Owner: Neutral
-	ActorReference@Actor10:
-		Id: Actor10
-		Type: tc02
+	Actor10: tc02
 		Location: 28,26
 		Owner: Neutral
-	ActorReference@Actor11:
-		Id: Actor11
-		Type: tc02
+	Actor11: tc02
 		Location: 26,25
 		Owner: Neutral
-	ActorReference@Actor12:
-		Id: Actor12
-		Type: tc03
+	Actor12: tc03
 		Location: 39,22
 		Owner: Neutral
-	ActorReference@Actor13:
-		Id: Actor13
-		Type: tc05
+	Actor13: tc05
 		Location: 40,25
 		Owner: Neutral
-	ActorReference@Actor14:
-		Id: Actor14
-		Type: t01
+	Actor14: t01
 		Location: 66,28
 		Owner: Neutral
-	ActorReference@Actor15:
-		Id: Actor15
-		Type: t01
+	Actor15: t01
 		Location: 77,29
 		Owner: Neutral
-	ActorReference@Actor16:
-		Id: Actor16
-		Type: t01
+	Actor16: t01
 		Location: 77,32
 		Owner: Neutral
-	ActorReference@Actor17:
-		Id: Actor17
-		Type: t02
+	Actor17: t02
 		Location: 80,31
 		Owner: Neutral
-	ActorReference@Actor18:
-		Id: Actor18
-		Type: tc05
+	Actor18: tc05
 		Location: 83,31
 		Owner: Neutral
-	ActorReference@Actor19:
-		Id: Actor19
-		Type: tc05
+	Actor19: tc05
 		Location: 91,38
 		Owner: Neutral
-	ActorReference@Actor20:
-		Id: Actor20
-		Type: t08
+	Actor20: t08
 		Location: 90,42
 		Owner: Neutral
-	ActorReference@Actor21:
-		Id: Actor21
-		Type: t08
+	Actor21: t08
 		Location: 81,37
 		Owner: Neutral
-	ActorReference@Actor22:
-		Id: Actor22
-		Type: t10
+	Actor22: t10
 		Location: 104,49
 		Owner: Neutral
-	ActorReference@Actor23:
-		Id: Actor23
-		Type: t12
+	Actor23: t12
 		Location: 103,47
 		Owner: Neutral
-	ActorReference@Actor24:
-		Id: Actor24
-		Type: t12
+	Actor24: t12
 		Location: 98,48
 		Owner: Neutral
-	ActorReference@Actor25:
-		Id: Actor25
-		Type: t12
+	Actor25: t12
 		Location: 55,65
 		Owner: Neutral
-	ActorReference@Actor26:
-		Id: Actor26
-		Type: t14
+	Actor26: t14
 		Location: 50,82
 		Owner: Neutral
-	ActorReference@Actor27:
-		Id: Actor27
-		Type: t01
+	Actor27: t01
 		Location: 68,93
 		Owner: Neutral
-	ActorReference@Actor28:
-		Id: Actor28
-		Type: tc02
+	Actor28: tc02
 		Location: 64,107
 		Owner: Neutral
-	ActorReference@Actor29:
-		Id: Actor29
-		Type: tc01
+	Actor29: tc01
 		Location: 60,102
 		Owner: Neutral
-	ActorReference@Actor30:
-		Id: Actor30
-		Type: t17
+	Actor30: t17
 		Location: 60,106
 		Owner: Neutral
-	ActorReference@Actor31:
-		Id: Actor31
-		Type: tc01
+	Actor31: tc01
 		Location: 82,97
 		Owner: Neutral
-	ActorReference@Actor32:
-		Id: Actor32
-		Type: tc02
+	Actor32: tc02
 		Location: 81,102
 		Owner: Neutral
-	ActorReference@Actor33:
-		Id: Actor33
-		Type: t02
+	Actor33: t02
 		Location: 73,97
 		Owner: Neutral
-	ActorReference@Actor34:
-		Id: Actor34
-		Type: tc03
+	Actor34: tc03
 		Location: 104,100
 		Owner: Neutral
-	ActorReference@Actor35:
-		Id: Actor35
-		Type: tc05
+	Actor35: tc05
 		Location: 109,109
 		Owner: Neutral
-	ActorReference@Actor36:
-		Id: Actor36
-		Type: tc04
+	Actor36: tc04
 		Location: 103,109
 		Owner: Neutral
-	ActorReference@Actor37:
-		Id: Actor37
-		Type: t01
+	Actor37: t01
 		Location: 47,99
 		Owner: Neutral
-	ActorReference@Actor38:
-		Id: Actor38
-		Type: tc04
+	Actor38: tc04
 		Location: 39,99
 		Owner: Neutral
-	ActorReference@Actor39:
-		Id: Actor39
-		Type: tc01
+	Actor39: tc01
 		Location: 33,86
 		Owner: Neutral
-	ActorReference@Actor40:
-		Id: Actor40
-		Type: tc01
+	Actor40: tc01
 		Location: 35,88
 		Owner: Neutral
-	ActorReference@Actor41:
-		Id: Actor41
-		Type: tc05
+	Actor41: tc05
 		Location: 45,82
 		Owner: Neutral
-	ActorReference@Actor42:
-		Id: Actor42
-		Type: tc03
+	Actor42: tc03
 		Location: 44,84
 		Owner: Neutral
-	ActorReference@Actor43:
-		Id: Actor43
-		Type: tc04
+	Actor43: tc04
 		Location: 27,71
 		Owner: Neutral
-	ActorReference@Actor44:
-		Id: Actor44
-		Type: tc05
+	Actor44: tc05
 		Location: 27,57
 		Owner: Neutral
-	ActorReference@Actor45:
-		Id: Actor45
-		Type: t01
+	Actor45: t01
 		Location: 37,62
 		Owner: Neutral
-	ActorReference@Actor46:
-		Id: Actor46
-		Type: t03
+	Actor46: t03
 		Location: 32,57
 		Owner: Neutral
-	ActorReference@Actor47:
-		Id: Actor47
-		Type: t06
+	Actor47: t06
 		Location: 27,44
 		Owner: Neutral
-	ActorReference@Actor48:
-		Id: Actor48
-		Type: t06
+	Actor48: t06
 		Location: 29,47
 		Owner: Neutral
-	ActorReference@Actor49:
-		Id: Actor49
-		Type: t06
+	Actor49: t06
 		Location: 25,47
 		Owner: Neutral
-	ActorReference@Actor50:
-		Id: Actor50
-		Type: t08
+	Actor50: t08
 		Location: 47,52
 		Owner: Neutral
-	ActorReference@Actor51:
-		Id: Actor51
-		Type: t10
+	Actor51: t10
 		Location: 50,51
 		Owner: Neutral
-	ActorReference@Actor52:
-		Id: Actor52
-		Type: tc05
+	Actor52: tc05
 		Location: 49,48
 		Owner: Neutral
-	ActorReference@Actor53:
-		Id: Actor53
-		Type: t01
+	Actor53: t01
 		Location: 54,42
 		Owner: Neutral
-	ActorReference@Actor54:
-		Id: Actor54
-		Type: t05
+	Actor54: t05
 		Location: 53,39
 		Owner: Neutral
-	ActorReference@Actor55:
-		Id: Actor55
-		Type: tc05
+	Actor55: tc05
 		Location: 35,40
 		Owner: Neutral
-	ActorReference@Actor56:
-		Id: Actor56
-		Type: t01
+	Actor56: t01
 		Location: 37,36
 		Owner: Neutral
-	ActorReference@Actor57:
-		Id: Actor57
-		Type: t01
+	Actor57: t01
 		Location: 36,25
 		Owner: Neutral
-	ActorReference@Actor58:
-		Id: Actor58
-		Type: t01
+	Actor58: t01
 		Location: 89,68
 		Owner: Neutral
-	ActorReference@Actor59:
-		Id: Actor59
-		Type: t02
+	Actor59: t02
 		Location: 96,70
 		Owner: Neutral
-	ActorReference@Actor60:
-		Id: Actor60
-		Type: tc05
+	Actor60: tc05
 		Location: 101,69
 		Owner: Neutral
-	ActorReference@Actor61:
-		Id: Actor61
-		Type: tc05
+	Actor61: tc05
 		Location: 94,80
 		Owner: Neutral
-	ActorReference@Actor62:
-		Id: Actor62
-		Type: t01
+	Actor62: t01
 		Location: 92,88
 		Owner: Neutral
-	ActorReference@Actor63:
-		Id: Actor63
-		Type: t02
+	Actor63: t02
 		Location: 93,89
 		Owner: Neutral
-	ActorReference@Actor64:
-		Id: Actor64
-		Type: t02
+	Actor64: t02
 		Location: 16,16
 		Owner: Neutral
-	ActorReference@Actor65:
-		Id: Actor65
-		Type: t05
+	Actor65: t05
 		Location: 60,27
 		Owner: Neutral
-	ActorReference@Actor66:
-		Id: Actor66
-		Type: t05
+	Actor66: t05
 		Location: 48,27
 		Owner: Neutral
-	ActorReference@Actor67:
-		Id: Actor67
-		Type: tc05
+	Actor67: tc05
 		Location: 99,31
 		Owner: Neutral
-	ActorReference@Actor68:
-		Id: Actor68
-		Type: tc05
+	Actor68: tc05
 		Location: 92,26
 		Owner: Neutral
-	ActorReference@Actor69:
-		Id: Actor69
-		Type: tc05
+	Actor69: tc05
 		Location: 78,75
 		Owner: Neutral
-	ActorReference@Actor70:
-		Id: Actor70
-		Type: tc04
+	Actor70: tc04
 		Location: 62,93
 		Owner: Neutral
-	ActorReference@Actor71:
-		Id: Actor71
-		Type: tc01
+	Actor71: tc01
 		Location: 67,90
 		Owner: Neutral
-	ActorReference@Actor72:
-		Id: Actor72
-		Type: tc04
+	Actor72: tc04
 		Location: 24,24
 		Owner: Neutral
-	ActorReference@Actor73:
-		Id: Actor73
-		Type: tc05
+	Actor73: tc05
 		Location: 88,58
 		Owner: Neutral
-	ActorReference@Actor74:
-		Id: Actor74
-		Type: tc05
+	Actor74: tc05
 		Location: 99,102
 		Owner: Neutral
-	ActorReference@Actor75:
-		Id: Actor75
-		Type: tc04
+	Actor75: tc04
 		Location: 25,100
 		Owner: Neutral
-	ActorReference@Actor76:
-		Id: Actor76
-		Type: tc03
+	Actor76: tc03
 		Location: 48,103
 		Owner: Neutral
-	ActorReference@Actor77:
-		Id: Actor77
-		Type: tc02
+	Actor77: tc02
 		Location: 48,94
 		Owner: Neutral
-	ActorReference@Actor78:
-		Id: Actor78
-		Type: tc01
+	Actor78: tc01
 		Location: 71,31
 		Owner: Neutral
-	ActorReference@Actor79:
-		Id: Actor79
-		Type: t17
+	Actor79: t17
 		Location: 70,31
 		Owner: Neutral
-	ActorReference@Actor80:
-		Id: Actor80
-		Type: tc02
+	Actor80: tc02
 		Location: 73,32
 		Owner: Neutral
-	ActorReference@Actor81:
-		Id: Actor81
-		Type: mine
+	Actor81: mine
 		Location: 46,22
 		Owner: Neutral
-	ActorReference@Actor82:
-		Id: Actor82
-		Type: mine
+	Actor82: mine
 		Location: 73,27
 		Owner: Neutral
-	ActorReference@Actor83:
-		Id: Actor83
-		Type: mine
+	Actor83: mine
 		Location: 36,45
 		Owner: Neutral
-	ActorReference@Actor84:
-		Id: Actor84
-		Type: mine
+	Actor84: mine
 		Location: 33,77
 		Owner: Neutral
-	ActorReference@Actor85:
-		Id: Actor85
-		Type: mine
+	Actor85: mine
 		Location: 104,82
 		Owner: Neutral
-	ActorReference@Actor86:
-		Id: Actor86
-		Type: mine
+	Actor86: mine
 		Location: 109,104
 		Owner: Neutral
-	ActorReference@Actor87:
-		Id: Actor87
-		Type: mine
+	Actor87: mine
 		Location: 18,109
 		Owner: Neutral
-	ActorReference@Actor88:
-		Id: Actor88
-		Type: mine
+	Actor88: mine
 		Location: 58,61
 		Owner: Neutral
-	ActorReference@Actor89:
-		Id: Actor89
-		Type: mine
+	Actor89: mine
 		Location: 78,65
 		Owner: Neutral
-	ActorReference@Actor90:
-		Id: Actor90
-		Type: mine
+	Actor90: mine
 		Location: 82,76
 		Owner: Neutral
-	ActorReference@Actor91:
-		Id: Actor91
-		Type: mine
+	Actor91: mine
 		Location: 76,89
 		Owner: Neutral
-	ActorReference@Actor92:
-		Id: Actor92
-		Type: mine
+	Actor92: mine
 		Location: 53,91
 		Owner: Neutral
-	ActorReference@Actor93:
-		Id: Actor93
-		Type: mine
+	Actor93: mine
 		Location: 50,74
 		Owner: Neutral
-	ActorReference@Actor94:
-		Id: Actor94
-		Type: mine
+	Actor94: mine
 		Location: 101,26
 		Owner: Neutral
-	ActorReference@Actor95:
-		Id: Actor95
-		Type: mine
+	Actor95: mine
 		Location: 95,34
 		Owner: Neutral
 
diff --git a/mods/ra/maps/scm01ea/map.bin b/mods/ra/maps/coastal-influence/map.bin
similarity index 100%
rename from mods/ra/maps/scm01ea/map.bin
rename to mods/ra/maps/coastal-influence/map.bin
diff --git a/mods/ra/maps/coastal-influence/map.uid b/mods/ra/maps/coastal-influence/map.uid
new file mode 100644
index 0000000000..1e53ebce64
--- /dev/null
+++ b/mods/ra/maps/coastal-influence/map.uid
@@ -0,0 +1 @@
+90262aa06f76ec4368cc0d180798449ab73cfe62
\ No newline at end of file
diff --git a/mods/ra/maps/coastal-influence/map.yaml b/mods/ra/maps/coastal-influence/map.yaml
new file mode 100644
index 0000000000..c5f243b973
--- /dev/null
+++ b/mods/ra/maps/coastal-influence/map.yaml
@@ -0,0 +1,275 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Coastal Influence
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 13,18
+
+BottomRight: 107,112
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: t08
+		Location: 105,86
+		Owner: Neutral
+	Actor1: t17
+		Location: 106,85
+		Owner: Neutral
+	Actor2: t12
+		Location: 94,82
+		Owner: Neutral
+	Actor3: tc03
+		Location: 87,87
+		Owner: Neutral
+	Actor4: tc04
+		Location: 91,82
+		Owner: Neutral
+	Actor5: tc05
+		Location: 93,83
+		Owner: Neutral
+	Actor6: tc05
+		Location: 93,97
+		Owner: Neutral
+	Actor7: tc03
+		Location: 32,66
+		Owner: Neutral
+	Actor8: t01
+		Location: 14,30
+		Owner: Neutral
+	Actor9: tc05
+		Location: 33,31
+		Owner: Neutral
+	Actor10: tc02
+		Location: 90,30
+		Owner: Neutral
+	Actor11: tc01
+		Location: 91,28
+		Owner: Neutral
+	Actor12: tc04
+		Location: 38,69
+		Owner: Neutral
+	Actor13: t02
+		Location: 32,84
+		Owner: Neutral
+	Actor14: t01
+		Location: 28,89
+		Owner: Neutral
+	Actor15: tc04
+		Location: 13,40
+		Owner: Neutral
+	Actor16: tc01
+		Location: 18,40
+		Owner: Neutral
+	Actor17: tc03
+		Location: 30,45
+		Owner: Neutral
+	Actor18: tc05
+		Location: 26,53
+		Owner: Neutral
+	Actor19: t03
+		Location: 26,72
+		Owner: Neutral
+	Actor20: t12
+		Location: 34,77
+		Owner: Neutral
+	Actor21: tc04
+		Location: 45,75
+		Owner: Neutral
+	Actor22: tc03
+		Location: 15,20
+		Owner: Neutral
+	Actor23: tc02
+		Location: 22,18
+		Owner: Neutral
+	Actor24: t07
+		Location: 93,28
+		Owner: Neutral
+	Actor25: t10
+		Location: 68,37
+		Owner: Neutral
+	Actor26: tc03
+		Location: 97,46
+		Owner: Neutral
+	Actor27: t01
+		Location: 47,98
+		Owner: Neutral
+	Actor28: tc03
+		Location: 28,99
+		Owner: Neutral
+	Actor29: tc04
+		Location: 28,94
+		Owner: Neutral
+	Actor30: tc02
+		Location: 18,106
+		Owner: Neutral
+	Actor31: tc01
+		Location: 81,107
+		Owner: Neutral
+	Actor32: t16
+		Location: 105,109
+		Owner: Neutral
+	Actor33: tc02
+		Location: 105,110
+		Owner: Neutral
+	Actor34: tc04
+		Location: 13,96
+		Owner: Neutral
+	Actor35: tc04
+		Location: 15,73
+		Owner: Neutral
+	Actor36: tc01
+		Location: 16,74
+		Owner: Neutral
+	Actor37: t16
+		Location: 16,72
+		Owner: Neutral
+	Actor38: t16
+		Location: 61,54
+		Owner: Neutral
+	Actor39: tc02
+		Location: 84,54
+		Owner: Neutral
+	Actor40: tc04
+		Location: 104,53
+		Owner: Neutral
+	Actor41: tc04
+		Location: 14,86
+		Owner: Neutral
+	Actor42: tc01
+		Location: 13,88
+		Owner: Neutral
+	Actor43: tc04
+		Location: 15,34
+		Owner: Neutral
+	Actor44: tc05
+		Location: 84,40
+		Owner: Neutral
+	Actor45: tc04
+		Location: 80,48
+		Owner: Neutral
+	Actor46: tc03
+		Location: 87,45
+		Owner: Neutral
+	Actor47: tc02
+		Location: 78,42
+		Owner: Neutral
+	Actor48: tc04
+		Location: 25,46
+		Owner: Neutral
+	Actor49: tc05
+		Location: 33,46
+		Owner: Neutral
+	Actor50: tc04
+		Location: 43,62
+		Owner: Neutral
+	Actor51: tc05
+		Location: 44,63
+		Owner: Neutral
+	Actor52: tc03
+		Location: 41,64
+		Owner: Neutral
+	Actor53: tc05
+		Location: 104,71
+		Owner: Neutral
+	Actor54: t01
+		Location: 106,73
+		Owner: Neutral
+	Actor55: t03
+		Location: 104,72
+		Owner: Neutral
+	Actor56: t12
+		Location: 50,78
+		Owner: Neutral
+	Actor57: tc02
+		Location: 48,79
+		Owner: Neutral
+	Actor58: tc02
+		Location: 103,25
+		Owner: Neutral
+	Actor59: tc01
+		Location: 96,17
+		Owner: Neutral
+	Actor60: tc03
+		Location: 85,95
+		Owner: Neutral
+	Actor61: tc04
+		Location: 87,73
+		Owner: Neutral
+	Actor62: t01
+		Location: 78,64
+		Owner: Neutral
+	Actor63: t15
+		Location: 73,66
+		Owner: Neutral
+	Actor64: tc01
+		Location: 67,61
+		Owner: Neutral
+	Actor65: t01
+		Location: 21,45
+		Owner: Neutral
+	Actor66: mine
+		Location: 50,94
+		Owner: Neutral
+	Actor67: mine
+		Location: 102,57
+		Owner: Neutral
+	Actor68: mine
+		Location: 97,107
+		Owner: Neutral
+	Actor69: mine
+		Location: 100,21
+		Owner: Neutral
+	Actor70: mine
+		Location: 37,22
+		Owner: Neutral
+	Actor71: mine
+		Location: 21,70
+		Owner: Neutral
+	Actor72: mine
+		Location: 19,90
+		Owner: Neutral
+	Actor73: mine
+		Location: 53,55
+		Owner: Neutral
+	Actor74: t01
+		Location: 54,24
+		Owner: Neutral
+	Actor75: t03
+		Location: 78,21
+		Owner: Neutral
+	Actor76: tc01
+		Location: 55,35
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 24,26
+	spawn1: 101,35
+	spawn2: 100,92
+	spawn3: 25,102
+	spawn4: 61,83
+	spawn5: 63,44
+	spawn6: 19,52
+	spawn7: 95,65
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/crossing/map.bin b/mods/ra/maps/crossing-the-river/map.bin
similarity index 100%
rename from mods/ra/maps/crossing/map.bin
rename to mods/ra/maps/crossing-the-river/map.bin
diff --git a/mods/ra/maps/crossing-the-river/map.uid b/mods/ra/maps/crossing-the-river/map.uid
new file mode 100644
index 0000000000..69062e1616
--- /dev/null
+++ b/mods/ra/maps/crossing-the-river/map.uid
@@ -0,0 +1 @@
+b5e01a3c3664941c877ebbd01be963085d922f60
\ No newline at end of file
diff --git a/mods/ra/maps/crossing-the-river/map.yaml b/mods/ra/maps/crossing-the-river/map.yaml
new file mode 100644
index 0000000000..225f8324ea
--- /dev/null
+++ b/mods/ra/maps/crossing-the-river/map.yaml
@@ -0,0 +1,202 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Crossing the River
+
+Author: Westwood Studios
+
+PlayerCount: 4
+
+Tileset: TEMPERAT
+
+MapSize: 128,128
+
+TopLeft: 32,32
+
+BottomRight: 96,96
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: v12
+		Location: 90,32
+		Owner: Neutral
+	Actor1: mine
+		Location: 41,71
+		Owner: Neutral
+	Actor2: mine
+		Location: 36,63
+		Owner: Neutral
+	Actor3: tc05
+		Location: 37,66
+		Owner: Neutral
+	Actor4: t15
+		Location: 41,65
+		Owner: Neutral
+	Actor5: tc04
+		Location: 87,64
+		Owner: Neutral
+	Actor6: tc01
+		Location: 91,66
+		Owner: Neutral
+	Actor7: t02
+		Location: 92,65
+		Owner: Neutral
+	Actor8: mine
+		Location: 92,63
+		Owner: Neutral
+	Actor9: mine
+		Location: 87,69
+		Owner: Neutral
+	Actor10: t03
+		Location: 38,91
+		Owner: Neutral
+	Actor11: t10
+		Location: 40,93
+		Owner: Neutral
+	Actor12: mine
+		Location: 36,83
+		Owner: Neutral
+	Actor13: mine
+		Location: 53,78
+		Owner: Neutral
+	Actor14: mine
+		Location: 48,88
+		Owner: Neutral
+	Actor15: t10
+		Location: 73,83
+		Owner: Neutral
+	Actor16: t03
+		Location: 72,82
+		Owner: Neutral
+	Actor17: t13
+		Location: 70,83
+		Owner: Neutral
+	Actor18: mine
+		Location: 34,34
+		Owner: Neutral
+	Actor19: mine
+		Location: 93,93
+		Owner: Neutral
+	Actor20: tc02
+		Location: 77,91
+		Owner: Neutral
+	Actor21: t01
+		Location: 80,92
+		Owner: Neutral
+	Actor22: t06
+		Location: 82,94
+		Owner: Neutral
+	Actor23: t06
+		Location: 83,93
+		Owner: Neutral
+	Actor24: tc03
+		Location: 49,32
+		Owner: Neutral
+	Actor25: t08
+		Location: 51,32
+		Owner: Neutral
+	Actor26: t08
+		Location: 48,33
+		Owner: Neutral
+	Actor27: t08
+		Location: 47,32
+		Owner: Neutral
+	Actor28: t05
+		Location: 46,32
+		Owner: Neutral
+	Actor29: t02
+		Location: 51,34
+		Owner: Neutral
+	Actor30: t10
+		Location: 39,42
+		Owner: Neutral
+	Actor31: t11
+		Location: 37,44
+		Owner: Neutral
+	Actor32: t12
+		Location: 37,42
+		Owner: Neutral
+	Actor33: t12
+		Location: 39,43
+		Owner: Neutral
+	Actor34: t13
+		Location: 43,41
+		Owner: Neutral
+	Actor35: t15
+		Location: 35,43
+		Owner: Neutral
+	Actor36: t03
+		Location: 34,44
+		Owner: Neutral
+	Actor37: t03
+		Location: 42,40
+		Owner: Neutral
+	Actor38: t13
+		Location: 88,34
+		Owner: Neutral
+	Actor39: mine
+		Location: 93,45
+		Owner: Neutral
+	Actor40: mine
+		Location: 75,46
+		Owner: Neutral
+	Actor41: mine
+		Location: 85,55
+		Owner: Neutral
+	Actor42: t13
+		Location: 86,43
+		Owner: Neutral
+	Actor43: t10
+		Location: 87,45
+		Owner: Neutral
+	Actor44: tc04
+		Location: 79,45
+		Owner: Neutral
+	Actor45: t07
+		Location: 81,49
+		Owner: Neutral
+	Actor46: t08
+		Location: 80,51
+		Owner: Neutral
+	Actor47: t08
+		Location: 78,52
+		Owner: Neutral
+	Actor48: tc02
+		Location: 72,51
+		Owner: Neutral
+	Actor49: tc01
+		Location: 48,75
+		Owner: Neutral
+	Actor50: t17
+		Location: 43,77
+		Owner: Neutral
+	Actor51: t03
+		Location: 45,75
+		Owner: Neutral
+	Actor52: t12
+		Location: 45,80
+		Owner: Neutral
+	Actor53: t12
+		Location: 47,81
+		Owner: Neutral
+
+Waypoints:
+	wp0: 44,55
+	spawn5: 91,76
+	wp2: 87,83
+	wp1: 46,48
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/crossing/map.uid b/mods/ra/maps/crossing/map.uid
deleted file mode 100644
index c56c39f555..0000000000
--- a/mods/ra/maps/crossing/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-e4ec6fc0236cc1c163d006cefed738f44b672505
\ No newline at end of file
diff --git a/mods/ra/maps/crossing/map.yaml b/mods/ra/maps/crossing/map.yaml
deleted file mode 100644
index 75d8130264..0000000000
--- a/mods/ra/maps/crossing/map.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Crossing the River
-
-Author: Westwood Studios
-
-PlayerCount: 6
-
-Tileset: TEMPERAT
-
-MapSize: 128,128
-
-TopLeft: 32,32
-
-BottomRight: 96,96
-
-Actors:
-	Actor0: v12 90,32 90,32
-	Actor1: mine 41,71 41,71
-	Actor2: mine 36,63 36,63
-	Actor3: tc05 37,66 37,66
-	Actor4: t15 41,65 41,65
-	Actor5: tc04 87,64 87,64
-	Actor6: tc01 91,66 91,66
-	Actor7: t02 92,65 92,65
-	Actor8: mine 92,63 92,63
-	Actor9: mine 87,69 87,69
-	Actor10: t03 38,91 38,91
-	Actor11: t10 40,93 40,93
-	Actor12: mine 36,83 36,83
-	Actor13: mine 53,78 53,78
-	Actor14: mine 48,88 48,88
-	Actor15: t10 73,83 73,83
-	Actor16: t03 72,82 72,82
-	Actor17: t13 70,83 70,83
-	Actor18: mine 34,34 34,34
-	Actor19: mine 93,93 93,93
-	Actor20: tc02 77,91 77,91
-	Actor21: t01 80,92 80,92
-	Actor22: t06 82,94 82,94
-	Actor23: t06 83,93 83,93
-	Actor24: tc03 49,32 49,32
-	Actor25: t08 51,32 51,32
-	Actor26: t08 48,33 48,33
-	Actor27: t08 47,32 47,32
-	Actor28: t05 46,32 46,32
-	Actor29: t02 51,34 51,34
-	Actor30: t10 39,42 39,42
-	Actor31: t11 37,44 37,44
-	Actor32: t12 37,42 37,42
-	Actor33: t12 39,43 39,43
-	Actor34: t13 43,41 43,41
-	Actor35: t15 35,43 35,43
-	Actor36: t03 34,44 34,44
-	Actor37: t03 42,40 42,40
-	Actor38: t13 88,34 88,34
-	Actor39: mine 93,45 93,45
-	Actor40: mine 75,46 75,46
-	Actor41: mine 85,55 85,55
-	Actor42: t13 86,43 86,43
-	Actor43: t10 87,45 87,45
-	Actor44: tc04 79,45 79,45
-	Actor45: t07 81,49 81,49
-	Actor46: t08 80,51 80,51
-	Actor47: t08 78,52 78,52
-	Actor48: tc02 72,51 72,51
-	Actor49: tc01 48,75 48,75
-	Actor50: t17 43,77 43,77
-	Actor51: t03 45,75 45,75
-	Actor52: t12 45,80 45,80
-	Actor53: t12 47,81 47,81
-
-Waypoints:
-	spawn0: 90,84
-	spawn1: 37,49
-	wp0: 44,55
-	spawn5: 91,76
-	spawn6: 85,79
-	wp1: 46,48
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/eastwest/map.bin b/mods/ra/maps/east-vs-west/map.bin
similarity index 100%
rename from mods/ra/maps/eastwest/map.bin
rename to mods/ra/maps/east-vs-west/map.bin
diff --git a/mods/ra/maps/east-vs-west/map.uid b/mods/ra/maps/east-vs-west/map.uid
new file mode 100644
index 0000000000..04ca8a7a35
--- /dev/null
+++ b/mods/ra/maps/east-vs-west/map.uid
@@ -0,0 +1 @@
+0bbcd8d4bfa77df49d6c9cdd30c6bb43df0db228
\ No newline at end of file
diff --git a/mods/ra/maps/east-vs-west/map.yaml b/mods/ra/maps/east-vs-west/map.yaml
new file mode 100644
index 0000000000..58eb36e4b9
--- /dev/null
+++ b/mods/ra/maps/east-vs-west/map.yaml
@@ -0,0 +1,144 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: East vs West
+
+Description: 2v2 Teamplay Map
+
+Author: Chris Forbes
+
+PlayerCount: 4
+
+Tileset: TEMPERAT
+
+MapSize: 96,56
+
+TopLeft: 8,8
+
+BottomRight: 88,48
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: tc01
+		Location: 26,25
+		Owner: Neutral
+	Actor1: tc04
+		Location: 25,27
+		Owner: Neutral
+	Actor2: t07
+		Location: 26,23
+		Owner: Neutral
+	Actor3: t06
+		Location: 26,22
+		Owner: Neutral
+	Actor4: t03
+		Location: 26,30
+		Owner: Neutral
+	Actor5: t01
+		Location: 27,30
+		Owner: Neutral
+	Actor6: t13
+		Location: 29,12
+		Owner: Neutral
+	Actor7: tc01
+		Location: 31,40
+		Owner: Neutral
+	Actor8: tc04
+		Location: 67,26
+		Owner: Neutral
+	Actor9: tc02
+		Location: 67,24
+		Owner: Neutral
+	Actor10: t14
+		Location: 68,22
+		Owner: Neutral
+	Actor11: t05
+		Location: 68,29
+		Owner: Neutral
+	Actor12: t08
+		Location: 67,21
+		Owner: Neutral
+	Actor13: tc01
+		Location: 64,12
+		Owner: Neutral
+	Actor14: tc02
+		Location: 64,40
+		Owner: Neutral
+	Actor15: mine
+		Location: 13,12
+		Owner: Neutral
+	Actor16: mine
+		Location: 19,12
+		Owner: Neutral
+	Actor17: mine
+		Location: 13,43
+		Owner: Neutral
+	Actor18: mine
+		Location: 19,43
+		Owner: Neutral
+	Actor19: mine
+		Location: 82,43
+		Owner: Neutral
+	Actor20: mine
+		Location: 76,43
+		Owner: Neutral
+	Actor21: mine
+		Location: 82,12
+		Owner: Neutral
+	Actor22: mine
+		Location: 76,12
+		Owner: Neutral
+	Actor23: mine
+		Location: 47,20
+		Owner: Neutral
+	Actor24: mine
+		Location: 48,20
+		Owner: Neutral
+	Actor25: mine
+		Location: 47,35
+		Owner: Neutral
+	Actor26: mine
+		Location: 48,35
+		Owner: Neutral
+	Actor27: tc04
+		Location: 45,9
+		Owner: Neutral
+	Actor28: tc04
+		Location: 48,42
+		Owner: Neutral
+	Actor29: tc05
+		Location: 45,42
+		Owner: Neutral
+	Actor30: tc02
+		Location: 48,10
+		Owner: Neutral
+	Actor31: tc05
+		Location: 46,11
+		Owner: Neutral
+	Actor32: tc02
+		Location: 48,44
+		Owner: Neutral
+	Actor33: t12
+		Location: 50,44
+		Owner: Neutral
+
+Waypoints:
+	wp0: 16,24
+	wp1: 16,29
+	wp2: 79,23
+	wp3: 79,28
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/eastwest/map.uid b/mods/ra/maps/eastwest/map.uid
deleted file mode 100644
index 895e9d3022..0000000000
--- a/mods/ra/maps/eastwest/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-6037b06bfbe00b1304787bb5d5fd142596a6b823
\ No newline at end of file
diff --git a/mods/ra/maps/eastwest/map.yaml b/mods/ra/maps/eastwest/map.yaml
deleted file mode 100644
index 6b24d337ef..0000000000
--- a/mods/ra/maps/eastwest/map.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: East vs West
-
-Description: 2v2 Teamplay Map
-
-Author: Chris Forbes
-
-PlayerCount: 4
-
-Tileset: TEMPERAT
-
-MapSize: 96,56
-
-TopLeft: 8,8
-
-BottomRight: 88,48
-
-Actors:
-	Actor0: tc01 Neutral 26,25
-	Actor1: tc04 Neutral 25,27
-	Actor2: t07 Neutral 26,23
-	Actor3: t06 Neutral 26,22
-	Actor4: t03 Neutral 26,30
-	Actor5: t01 Neutral 27,30
-	Actor6: t13 Neutral 29,12
-	Actor9: tc01 Neutral 31,40
-	Actor10: tc04 Neutral 67,26
-	Actor11: tc02 Neutral 67,24
-	Actor12: t14 Neutral 68,22
-	Actor13: t05 Neutral 68,29
-	Actor14: t08 Neutral 67,21
-	Actor15: tc01 Neutral 64,12
-	Actor16: tc02 Neutral 64,40
-	Actor17: mine Neutral 13,12
-	Actor18: mine Neutral 19,12
-	Actor19: mine Neutral 13,43
-	Actor20: mine Neutral 19,43
-	Actor21: mine Neutral 82,43
-	Actor22: mine Neutral 76,43
-	Actor23: mine Neutral 82,12
-	Actor24: mine Neutral 76,12
-	Actor25: mine Neutral 47,20
-	Actor26: mine Neutral 48,20
-	Actor27: mine Neutral 47,35
-	Actor28: mine Neutral 48,35
-	Actor29: tc04 Neutral 45,9
-	Actor30: tc04 Neutral 48,42
-	Actor31: tc05 Neutral 45,42
-	Actor32: tc02 Neutral 48,10
-	Actor33: tc05 Neutral 46,11
-	Actor34: tc02 Neutral 48,44
-	Actor35: t12 Neutral 50,44
-
-Waypoints:
-	wp0: 16,24
-	wp1: 16,29
-	wp2: 79,23
-	wp3: 79,28
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm03ea/map.bin b/mods/ra/maps/equal-opportunity/map.bin
similarity index 100%
rename from mods/ra/maps/scm03ea/map.bin
rename to mods/ra/maps/equal-opportunity/map.bin
diff --git a/mods/ra/maps/equal-opportunity/map.uid b/mods/ra/maps/equal-opportunity/map.uid
new file mode 100644
index 0000000000..9a22dfb9df
--- /dev/null
+++ b/mods/ra/maps/equal-opportunity/map.uid
@@ -0,0 +1 @@
+55c4966f5720fcb6ef1a6b9174fecce33f8b680b
\ No newline at end of file
diff --git a/mods/ra/maps/equal-opportunity/map.yaml b/mods/ra/maps/equal-opportunity/map.yaml
new file mode 100644
index 0000000000..61696e8270
--- /dev/null
+++ b/mods/ra/maps/equal-opportunity/map.yaml
@@ -0,0 +1,128 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Equal Opportunity
+
+Author: Westwood Studios
+
+PlayerCount: 5
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 28,26
+
+BottomRight: 99,97
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: sbag
+		Location: 61,96
+		Owner: Neutral
+	Actor1: tc03
+		Location: 38,66
+		Owner: Neutral
+	Actor2: tc03
+		Location: 55,35
+		Owner: Neutral
+	Actor3: tc02
+		Location: 45,37
+		Owner: Neutral
+	Actor4: tc03
+		Location: 71,71
+		Owner: Neutral
+	Actor5: tc02
+		Location: 72,72
+		Owner: Neutral
+	Actor6: t01
+		Location: 61,62
+		Owner: Neutral
+	Actor7: t03
+		Location: 67,77
+		Owner: Neutral
+	Actor8: t06
+		Location: 53,87
+		Owner: Neutral
+	Actor9: t10
+		Location: 62,70
+		Owner: Neutral
+	Actor10: t02
+		Location: 66,51
+		Owner: Neutral
+	Actor11: t05
+		Location: 71,57
+		Owner: Neutral
+	Actor12: tc01
+		Location: 76,47
+		Owner: Neutral
+	Actor13: t07
+		Location: 81,53
+		Owner: Neutral
+	Actor14: t12
+		Location: 73,54
+		Owner: Neutral
+	Actor15: t06
+		Location: 69,56
+		Owner: Neutral
+	Actor16: t11
+		Location: 39,84
+		Owner: Neutral
+	Actor17: t14
+		Location: 77,32
+		Owner: Neutral
+	Actor18: t12
+		Location: 69,43
+		Owner: Neutral
+	Actor19: tc02
+		Location: 62,52
+		Owner: Neutral
+	Actor20: tc03
+		Location: 74,86
+		Owner: Neutral
+	Actor21: tc05
+		Location: 76,62
+		Owner: Neutral
+	Actor22: tc04
+		Location: 48,62
+		Owner: Neutral
+	Actor23: mine
+		Location: 40,45
+		Owner: Neutral
+	Actor24: mine
+		Location: 89,85
+		Owner: Neutral
+	Actor25: mine
+		Location: 75,64
+		Owner: Neutral
+	Actor26: mine
+		Location: 46,64
+		Owner: Neutral
+	Actor27: mine
+		Location: 87,37
+		Owner: Neutral
+	Actor28: mine
+		Location: 49,87
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 46,43
+	spawn1: 80,80
+	spawn2: 77,39
+	spawn3: 47,81
+	spawn4: 47,81
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/scm10ea/map.bin b/mods/ra/maps/first-come-first-served/map.bin
similarity index 100%
rename from mods/ra/maps/scm10ea/map.bin
rename to mods/ra/maps/first-come-first-served/map.bin
diff --git a/mods/ra/maps/first-come-first-served/map.uid b/mods/ra/maps/first-come-first-served/map.uid
new file mode 100644
index 0000000000..452d0d7497
--- /dev/null
+++ b/mods/ra/maps/first-come-first-served/map.uid
@@ -0,0 +1 @@
+775845909a9cabfe7bc89434b267e8667b45523f
\ No newline at end of file
diff --git a/mods/ra/maps/first-come-first-served/map.yaml b/mods/ra/maps/first-come-first-served/map.yaml
new file mode 100644
index 0000000000..d4660d8a18
--- /dev/null
+++ b/mods/ra/maps/first-come-first-served/map.yaml
@@ -0,0 +1,133 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: First Come, First Served
+
+Author: Westwood Studios
+
+PlayerCount: 4
+
+Tileset: TEMPERAT
+
+MapSize: 128,128
+
+TopLeft: 22,22
+
+BottomRight: 106,106
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: mine
+		Location: 40,92
+		Owner: Neutral
+	Actor1: mine
+		Location: 89,35
+		Owner: Neutral
+	Actor2: mine
+		Location: 64,64
+		Owner: Neutral
+	Actor3: tc05
+		Location: 43,87
+		Owner: Neutral
+	Actor4: tc04
+		Location: 42,75
+		Owner: Neutral
+	Actor5: tc02
+		Location: 57,75
+		Owner: Neutral
+	Actor6: tc02
+		Location: 62,86
+		Owner: Neutral
+	Actor7: tc04
+		Location: 64,38
+		Owner: Neutral
+	Actor8: tc04
+		Location: 84,29
+		Owner: Neutral
+	Actor9: tc02
+		Location: 96,40
+		Owner: Neutral
+	Actor10: tc03
+		Location: 66,79
+		Owner: Neutral
+	Actor11: tc02
+		Location: 54,88
+		Owner: Neutral
+	Actor12: tc01
+		Location: 41,80
+		Owner: Neutral
+	Actor13: tc04
+		Location: 52,29
+		Owner: Neutral
+	Actor14: tc03
+		Location: 94,30
+		Owner: Neutral
+	Actor15: tc05
+		Location: 39,95
+		Owner: Neutral
+	Actor16: t17
+		Location: 35,87
+		Owner: Neutral
+	Actor17: tc05
+		Location: 68,50
+		Owner: Neutral
+	Actor18: mine
+		Location: 74,45
+		Owner: Neutral
+	Actor19: mine
+		Location: 52,81
+		Owner: Neutral
+	Actor20: tc03
+		Location: 86,94
+		Owner: Neutral
+	Actor21: tc04
+		Location: 32,29
+		Owner: Neutral
+	Actor22: tc01
+		Location: 42,57
+		Owner: Neutral
+	Actor23: tc03
+		Location: 83,45
+		Owner: Neutral
+	Actor24: tc03
+		Location: 89,79
+		Owner: Neutral
+	Actor25: tc01
+		Location: 81,78
+		Owner: Neutral
+	Actor26: t16
+		Location: 37,45
+		Owner: Neutral
+	Actor27: tc04
+		Location: 64,30
+		Owner: Neutral
+	Actor28: tc01
+		Location: 77,39
+		Owner: Neutral
+	Actor29: t16
+		Location: 73,54
+		Owner: Neutral
+	Actor30: t16
+		Location: 37,90
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 40,67
+	spawn1: 89,61
+	spawn2: 54,39
+	spawn3: 70,89
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/hilo/map.bin b/mods/ra/maps/high-and-low/map.bin
similarity index 100%
rename from mods/ra/maps/hilo/map.bin
rename to mods/ra/maps/high-and-low/map.bin
diff --git a/mods/ra/maps/high-and-low/map.uid b/mods/ra/maps/high-and-low/map.uid
new file mode 100644
index 0000000000..2b235a290c
--- /dev/null
+++ b/mods/ra/maps/high-and-low/map.uid
@@ -0,0 +1 @@
+ba1e932ca300581ae4d35b7cde825dd5e6860592
\ No newline at end of file
diff --git a/mods/ra/maps/high-and-low/map.yaml b/mods/ra/maps/high-and-low/map.yaml
new file mode 100644
index 0000000000..e0a4f88bfd
--- /dev/null
+++ b/mods/ra/maps/high-and-low/map.yaml
@@ -0,0 +1,299 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: High & Low
+
+Author: Captain Mel
+
+PlayerCount: 8
+
+Tileset: TEMPERAT
+
+MapSize: 128,128
+
+TopLeft: 16,16
+
+BottomRight: 112,112
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: tc05
+		Location: 42,85
+		Owner: Neutral
+	Actor1: tc05
+		Location: 44,94
+		Owner: Neutral
+	Actor2: tc05
+		Location: 41,66
+		Owner: Neutral
+	Actor3: tc05
+		Location: 42,58
+		Owner: Neutral
+	Actor4: tc05
+		Location: 45,40
+		Owner: Neutral
+	Actor5: tc05
+		Location: 87,32
+		Owner: Neutral
+	Actor6: tc05
+		Location: 87,94
+		Owner: Neutral
+	Actor7: tc05
+		Location: 87,110
+		Owner: Neutral
+	Actor8: tc05
+		Location: 87,42
+		Owner: Neutral
+	Actor9: tc02
+		Location: 69,23
+		Owner: Neutral
+	Actor10: tc02
+		Location: 64,25
+		Owner: Neutral
+	Actor11: tc02
+		Location: 69,30
+		Owner: Neutral
+	Actor12: tc02
+		Location: 64,29
+		Owner: Neutral
+	Actor13: tc02
+		Location: 56,17
+		Owner: Neutral
+	Actor14: tc02
+		Location: 43,31
+		Owner: Neutral
+	Actor15: tc02
+		Location: 44,46
+		Owner: Neutral
+	Actor16: tc02
+		Location: 44,77
+		Owner: Neutral
+	Actor17: tc02
+		Location: 43,70
+		Owner: Neutral
+	Actor18: tc02
+		Location: 35,94
+		Owner: Neutral
+	Actor19: tc02
+		Location: 45,110
+		Owner: Neutral
+	Actor20: tc02
+		Location: 55,72
+		Owner: Neutral
+	Actor21: tc02
+		Location: 55,59
+		Owner: Neutral
+	Actor22: tc02
+		Location: 74,74
+		Owner: Neutral
+	Actor23: tc02
+		Location: 88,70
+		Owner: Neutral
+	Actor24: t15
+		Location: 91,99
+		Owner: Neutral
+	Actor25: tc02
+		Location: 73,61
+		Owner: Neutral
+	Actor26: tc02
+		Location: 86,75
+		Owner: Neutral
+	Actor27: tc02
+		Location: 85,19
+		Owner: Neutral
+	Actor28: tc01
+		Location: 76,18
+		Owner: Neutral
+	Actor29: tc02
+		Location: 86,26
+		Owner: Neutral
+	Actor30: tc03
+		Location: 45,16
+		Owner: Neutral
+	Actor31: t01
+		Location: 53,97
+		Owner: Neutral
+	Actor32: mine
+		Location: 94,89
+		Owner: Neutral
+	Actor33: mine
+		Location: 105,90
+		Owner: Neutral
+	Actor34: mine
+		Location: 95,62
+		Owner: Neutral
+	Actor35: mine
+		Location: 107,64
+		Owner: Neutral
+	Actor36: mine
+		Location: 105,37
+		Owner: Neutral
+	Actor37: mine
+		Location: 96,37
+		Owner: Neutral
+	Actor38: mine
+		Location: 20,37
+		Owner: Neutral
+	Actor39: mine
+		Location: 30,37
+		Owner: Neutral
+	Actor40: mine
+		Location: 20,63
+		Owner: Neutral
+	Actor41: mine
+		Location: 27,63
+		Owner: Neutral
+	Actor42: mine
+		Location: 21,90
+		Owner: Neutral
+	Actor43: mine
+		Location: 30,90
+		Owner: Neutral
+	Actor44: tc03
+		Location: 53,35
+		Owner: Neutral
+	Actor45: tc03
+		Location: 78,96
+		Owner: Neutral
+	Actor46: tc03
+		Location: 84,107
+		Owner: Neutral
+	Actor47: tc03
+		Location: 77,77
+		Owner: Neutral
+	Actor48: tc03
+		Location: 80,38
+		Owner: Neutral
+	Actor49: tc05
+		Location: 34,32
+		Owner: Neutral
+	Actor50: t17
+		Location: 58,38
+		Owner: Neutral
+	Actor51: t17
+		Location: 53,24
+		Owner: Neutral
+	Actor52: t17
+		Location: 56,49
+		Owner: Neutral
+	Actor53: t17
+		Location: 53,64
+		Owner: Neutral
+	Actor54: t17
+		Location: 56,79
+		Owner: Neutral
+	Actor55: t17
+		Location: 75,93
+		Owner: Neutral
+	Actor56: t17
+		Location: 81,104
+		Owner: Neutral
+	Actor57: t17
+		Location: 74,83
+		Owner: Neutral
+	Actor58: t17
+		Location: 78,65
+		Owner: Neutral
+	Actor59: t17
+		Location: 76,46
+		Owner: Neutral
+	Actor60: t17
+		Location: 77,35
+		Owner: Neutral
+	Actor61: t17
+		Location: 78,25
+		Owner: Neutral
+	Actor62: tc02
+		Location: 52,20
+		Owner: Neutral
+	Actor63: tc02
+		Location: 46,20
+		Owner: Neutral
+	Actor64: tc02
+		Location: 48,18
+		Owner: Neutral
+	Actor65: tc02
+		Location: 53,33
+		Owner: Neutral
+	Actor66: tc02
+		Location: 47,35
+		Owner: Neutral
+	Actor67: tc02
+		Location: 52,96
+		Owner: Neutral
+	Actor68: tc02
+		Location: 55,94
+		Owner: Neutral
+	Actor69: tc02
+		Location: 58,97
+		Owner: Neutral
+	Actor70: tc02
+		Location: 55,100
+		Owner: Neutral
+	Actor71: tc02
+		Location: 52,37
+		Owner: Neutral
+	Actor72: tc02
+		Location: 51,23
+		Owner: Neutral
+	Actor73: tc05
+		Location: 76,20
+		Owner: Neutral
+	Actor74: tc05
+		Location: 78,18
+		Owner: Neutral
+	Actor75: tc02
+		Location: 79,54
+		Owner: Neutral
+	Actor76: tc02
+		Location: 84,57
+		Owner: Neutral
+	Actor77: tc02
+		Location: 78,58
+		Owner: Neutral
+	Actor78: tc02
+		Location: 77,80
+		Owner: Neutral
+	Actor79: tc02
+		Location: 82,81
+		Owner: Neutral
+	Actor80: t17
+		Location: 83,77
+		Owner: Neutral
+	Actor81: tc02
+		Location: 81,89
+		Owner: Neutral
+	Actor82: tc02
+		Location: 20,41
+		Owner: Neutral
+	Actor83: tc02
+		Location: 106,84
+		Owner: Neutral
+	Actor84: tc02
+		Location: 97,42
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 105,49
+	spawn1: 102,22
+	spawn2: 30,21
+	spawn3: 32,51
+	spawn4: 32,75
+	spawn5: 33,104
+	spawn6: 103,105
+	spawn7: 96,73
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/hilo/map.uid b/mods/ra/maps/hilo/map.uid
deleted file mode 100644
index e4ed8a3d89..0000000000
--- a/mods/ra/maps/hilo/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-c5cc7ee2b5f14331f6b956af55c019e5ec506a42
\ No newline at end of file
diff --git a/mods/ra/maps/hilo/map.yaml b/mods/ra/maps/hilo/map.yaml
deleted file mode 100644
index b4c184442f..0000000000
--- a/mods/ra/maps/hilo/map.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: High & Low
-
-Description:
-
-Author: Captain Mel
-
-PlayerCount: 8
-
-Tileset: TEMPERAT
-
-MapSize: 128,128
-
-TopLeft: 16,16
-
-BottomRight: 112,112
-
-Actors:
-	Actor0: tc05 42,85 42,85
-	Actor1: tc05 44,94 44,94
-	Actor2: tc05 41,66 41,66
-	Actor3: tc05 42,58 42,58
-	Actor4: tc05 45,40 45,40
-	Actor5: tc05 87,32 87,32
-	Actor6: tc05 87,94 87,94
-	Actor7: tc05 87,110 87,110
-	Actor8: tc05 87,42 87,42
-	Actor9: tc02 69,23 69,23
-	Actor10: tc02 64,25 64,25
-	Actor11: tc02 69,30 69,30
-	Actor12: tc02 64,29 64,29
-	Actor13: tc02 56,17 56,17
-	Actor14: tc02 43,31 43,31
-	Actor15: tc02 44,46 44,46
-	Actor16: tc02 44,77 44,77
-	Actor17: tc02 43,70 43,70
-	Actor18: tc02 35,94 35,94
-	Actor19: tc02 45,110 45,110
-	Actor20: tc02 55,72 55,72
-	Actor21: tc02 55,59 55,59
-	Actor22: tc02 74,74 74,74
-	Actor23: tc02 88,70 88,70
-	Actor24: t15 91,99 91,99
-	Actor25: tc02 73,61 73,61
-	Actor26: tc02 86,75 86,75
-	Actor27: tc02 85,19 85,19
-	Actor28: tc01 76,18 76,18
-	Actor29: tc02 86,26 86,26
-	Actor30: tc03 45,16 45,16
-	Actor31: t01 53,97 53,97
-	Actor32: mine 94,89 94,89
-	Actor33: mine 105,90 105,90
-	Actor34: mine 95,62 95,62
-	Actor35: mine 107,64 107,64
-	Actor36: mine 105,37 105,37
-	Actor37: mine 96,37 96,37
-	Actor38: mine 20,37 20,37
-	Actor39: mine 30,37 30,37
-	Actor40: mine 20,63 20,63
-	Actor41: mine 27,63 27,63
-	Actor42: mine 21,90 21,90
-	Actor43: mine 30,90 30,90
-	Actor44: tc03 53,35 53,35
-	Actor45: tc03 78,96 78,96
-	Actor46: tc03 84,107 84,107
-	Actor47: tc03 77,77 77,77
-	Actor48: tc03 80,38 80,38
-	Actor49: tc05 34,32 34,32
-	Actor50: t17 58,38 58,38
-	Actor51: t17 53,24 53,24
-	Actor52: t17 56,49 56,49
-	Actor53: t17 53,64 53,64
-	Actor54: t17 56,79 56,79
-	Actor55: t17 75,93 75,93
-	Actor56: t17 81,104 81,104
-	Actor57: t17 74,83 74,83
-	Actor58: t17 78,65 78,65
-	Actor59: t17 76,46 76,46
-	Actor60: t17 77,35 77,35
-	Actor61: t17 78,25 78,25
-	Actor62: tc02 52,20 52,20
-	Actor63: tc02 46,20 46,20
-	Actor64: tc02 48,18 48,18
-	Actor65: tc02 53,33 53,33
-	Actor66: tc02 47,35 47,35
-	Actor67: tc02 52,96 52,96
-	Actor68: tc02 55,94 55,94
-	Actor69: tc02 58,97 58,97
-	Actor70: tc02 55,100 55,100
-	Actor71: tc02 52,37 52,37
-	Actor72: tc02 51,23 51,23
-	Actor73: tc05 76,20 76,20
-	Actor74: tc05 78,18 78,18
-	Actor75: tc02 79,54 79,54
-	Actor76: tc02 84,57 84,57
-	Actor77: tc02 78,58 78,58
-	Actor78: tc02 77,80 77,80
-	Actor79: tc02 82,81 82,81
-	Actor80: t17 83,77 83,77
-	Actor81: tc02 81,89 81,89
-	Actor82: tc02 20,41 20,41
-	Actor83: tc02 106,84 106,84
-	Actor84: tc02 97,42 97,42
-
-Waypoints:
-	spawn0: 105,49
-	spawn1: 102,22
-	spawn2: 30,21
-	spawn3: 32,51
-	spawn4: 32,75
-	spawn5: 33,104
-	spawn6: 103,105
-	spawn7: 96,73
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm11ea/map.bin b/mods/ra/maps/island-hoppers/map.bin
similarity index 100%
rename from mods/ra/maps/scm11ea/map.bin
rename to mods/ra/maps/island-hoppers/map.bin
diff --git a/mods/ra/maps/island-hoppers/map.uid b/mods/ra/maps/island-hoppers/map.uid
new file mode 100644
index 0000000000..456973ca2c
--- /dev/null
+++ b/mods/ra/maps/island-hoppers/map.uid
@@ -0,0 +1 @@
+20c11a93877715d18c1fa8be20b90573ac7b0f46
\ No newline at end of file
diff --git a/mods/ra/maps/island-hoppers/map.yaml b/mods/ra/maps/island-hoppers/map.yaml
new file mode 100644
index 0000000000..8bf9cced09
--- /dev/null
+++ b/mods/ra/maps/island-hoppers/map.yaml
@@ -0,0 +1,121 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Island Hoppers
+
+Author: Westwood Studios
+
+PlayerCount: 4
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 11,19
+
+BottomRight: 107,115
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: t01
+		Location: 62,77
+		Owner: Neutral
+	Actor1: tc01
+		Location: 61,80
+		Owner: Neutral
+	Actor2: t08
+		Location: 59,76
+		Owner: Neutral
+	Actor3: tc05
+		Location: 53,99
+		Owner: Neutral
+	Actor4: tc05
+		Location: 18,68
+		Owner: Neutral
+	Actor5: tc05
+		Location: 59,34
+		Owner: Neutral
+	Actor6: tc04
+		Location: 98,68
+		Owner: Neutral
+	Actor7: tc04
+		Location: 39,24
+		Owner: Neutral
+	Actor8: tc04
+		Location: 80,105
+		Owner: Neutral
+	Actor9: tc03
+		Location: 41,105
+		Owner: Neutral
+	Actor10: tc02
+		Location: 18,80
+		Owner: Neutral
+	Actor11: tc02
+		Location: 57,23
+		Owner: Neutral
+	Actor12: tc01
+		Location: 98,81
+		Owner: Neutral
+	Actor13: t17
+		Location: 97,50
+		Owner: Neutral
+	Actor14: t16
+		Location: 67,101
+		Owner: Neutral
+	Actor15: t15
+		Location: 31,103
+		Owner: Neutral
+	Actor16: t14
+		Location: 21,48
+		Owner: Neutral
+	Actor17: t11
+		Location: 62,26
+		Owner: Neutral
+	Actor18: t10
+		Location: 93,66
+		Owner: Neutral
+	Actor19: mine
+		Location: 44,59
+		Owner: Neutral
+	Actor20: mine
+		Location: 87,48
+		Owner: Neutral
+	Actor21: mine
+		Location: 84,89
+		Owner: Neutral
+	Actor22: mine
+		Location: 45,86
+		Owner: Neutral
+	Actor23: mine
+		Location: 70,26
+		Owner: Neutral
+	Actor24: mine
+		Location: 66,103
+		Owner: Neutral
+	Actor25: mine
+		Location: 46,102
+		Owner: Neutral
+	Actor26: mine
+		Location: 50,31
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 41,53
+	spawn1: 79,84
+	spawn2: 81,50
+	spawn3: 40,84
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/map/map.uid b/mods/ra/maps/map/map.uid
deleted file mode 100644
index 5943e6e341..0000000000
--- a/mods/ra/maps/map/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-87025fa480353c34471080c08948f81d0a720830
\ No newline at end of file
diff --git a/mods/ra/maps/marooned/map.bin b/mods/ra/maps/marooned-2/map.bin
similarity index 100%
rename from mods/ra/maps/marooned/map.bin
rename to mods/ra/maps/marooned-2/map.bin
diff --git a/mods/ra/maps/marooned-2/map.uid b/mods/ra/maps/marooned-2/map.uid
new file mode 100644
index 0000000000..ef8a8631e5
--- /dev/null
+++ b/mods/ra/maps/marooned-2/map.uid
@@ -0,0 +1 @@
+cbb9920367c92e4b47e9a8456f1384db3054bf08
\ No newline at end of file
diff --git a/mods/ra/maps/marooned-2/map.yaml b/mods/ra/maps/marooned-2/map.yaml
new file mode 100644
index 0000000000..a4e26a76fb
--- /dev/null
+++ b/mods/ra/maps/marooned-2/map.yaml
@@ -0,0 +1,252 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Marooned II
+
+Author: Westwood Studios
+
+PlayerCount: 6
+
+Tileset: TEMPERAT
+
+MapSize: 128,128
+
+TopLeft: 16,16
+
+BottomRight: 112,112
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: mine
+		Location: 63,74
+		Owner: Neutral
+	Actor1: mine
+		Location: 92,30
+		Owner: Neutral
+	Actor2: mine
+		Location: 81,25
+		Owner: Neutral
+	Actor3: mine
+		Location: 43,28
+		Owner: Neutral
+	Actor4: mine
+		Location: 40,72
+		Owner: Neutral
+	Actor5: mine
+		Location: 97,76
+		Owner: Neutral
+	Actor6: mine
+		Location: 26,63
+		Owner: Neutral
+	Actor7: mine
+		Location: 50,46
+		Owner: Neutral
+	Actor8: mine
+		Location: 64,90
+		Owner: Neutral
+	Actor9: mine
+		Location: 44,99
+		Owner: Neutral
+	Actor10: tc04
+		Location: 80,78
+		Owner: Neutral
+	Actor11: tc03
+		Location: 78,85
+		Owner: Neutral
+	Actor12: tc01
+		Location: 83,87
+		Owner: Neutral
+	Actor13: t17
+		Location: 66,88
+		Owner: Neutral
+	Actor14: t16
+		Location: 57,79
+		Owner: Neutral
+	Actor15: t15
+		Location: 60,69
+		Owner: Neutral
+	Actor16: t14
+		Location: 65,80
+		Owner: Neutral
+	Actor17: t13
+		Location: 62,92
+		Owner: Neutral
+	Actor18: t11
+		Location: 85,101
+		Owner: Neutral
+	Actor19: t08
+		Location: 87,100
+		Owner: Neutral
+	Actor20: t08
+		Location: 97,40
+		Owner: Neutral
+	Actor21: t11
+		Location: 98,39
+		Owner: Neutral
+	Actor22: t08
+		Location: 100,41
+		Owner: Neutral
+	Actor23: t07
+		Location: 96,35
+		Owner: Neutral
+	Actor24: t06
+		Location: 85,37
+		Owner: Neutral
+	Actor25: t02
+		Location: 83,47
+		Owner: Neutral
+	Actor26: t01
+		Location: 54,33
+		Owner: Neutral
+	Actor27: t03
+		Location: 43,47
+		Owner: Neutral
+	Actor28: tc02
+		Location: 51,28
+		Owner: Neutral
+	Actor29: tc01
+		Location: 37,25
+		Owner: Neutral
+	Actor30: t17
+		Location: 31,26
+		Owner: Neutral
+	Actor31: t15
+		Location: 32,65
+		Owner: Neutral
+	Actor32: t14
+		Location: 37,64
+		Owner: Neutral
+	Actor33: t13
+		Location: 62,83
+		Owner: Neutral
+	Actor34: t11
+		Location: 90,70
+		Owner: Neutral
+	Actor35: t10
+		Location: 74,65
+		Owner: Neutral
+	Actor36: tc01
+		Location: 81,21
+		Owner: Neutral
+	Actor37: t17
+		Location: 96,27
+		Owner: Neutral
+	Actor38: tc05
+		Location: 45,55
+		Owner: Neutral
+	Actor39: tc04
+		Location: 35,58
+		Owner: Neutral
+	Actor40: t16
+		Location: 46,61
+		Owner: Neutral
+	Actor41: t13
+		Location: 45,50
+		Owner: Neutral
+	Actor42: t12
+		Location: 43,39
+		Owner: Neutral
+	Actor43: tc02
+		Location: 68,36
+		Owner: Neutral
+	Actor44: t07
+		Location: 72,72
+		Owner: Neutral
+	Actor45: t06
+		Location: 42,58
+		Owner: Neutral
+	Actor46: t06
+		Location: 22,63
+		Owner: Neutral
+	Actor47: t10
+		Location: 22,56
+		Owner: Neutral
+	Actor48: t08
+		Location: 34,82
+		Owner: Neutral
+	Actor49: tc04
+		Location: 54,101
+		Owner: Neutral
+	Actor50: tc01
+		Location: 61,47
+		Owner: Neutral
+	Actor51: t17
+		Location: 57,32
+		Owner: Neutral
+	Actor52: tc01
+		Location: 81,36
+		Owner: Neutral
+	Actor53: t16
+		Location: 87,52
+		Owner: Neutral
+	Actor54: t16
+		Location: 102,48
+		Owner: Neutral
+	Actor55: t15
+		Location: 94,60
+		Owner: Neutral
+	Actor56: tc02
+		Location: 103,76
+		Owner: Neutral
+	Actor57: t16
+		Location: 96,85
+		Owner: Neutral
+	Actor58: tc04
+		Location: 95,84
+		Owner: Neutral
+	Actor59: tc05
+		Location: 86,39
+		Owner: Neutral
+	Actor60: tc04
+		Location: 49,21
+		Owner: Neutral
+	Actor61: tc01
+		Location: 45,40
+		Owner: Neutral
+	Actor62: t16
+		Location: 27,52
+		Owner: Neutral
+	Actor63: tc02
+		Location: 72,103
+		Owner: Neutral
+	Actor64: t16
+		Location: 81,102
+		Owner: Neutral
+	Actor65: t17
+		Location: 78,57
+		Owner: Neutral
+	Actor66: tc01
+		Location: 37,75
+		Owner: Neutral
+	Actor67: tc01
+		Location: 61,41
+		Owner: Neutral
+	Actor68: t16
+		Location: 79,42
+		Owner: Neutral
+	Actor69: tc04
+		Location: 98,56
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 94,47
+	spawn1: 81,94
+	spawn2: 36,42
+	spawn3: 35,92
+	spawn4: 64,27
+	spawn5: 80,72
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/marooned/map.uid b/mods/ra/maps/marooned/map.uid
deleted file mode 100644
index 95a5916436..0000000000
--- a/mods/ra/maps/marooned/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-1dada5680127799dd111bde670a9da9968c4aabe
\ No newline at end of file
diff --git a/mods/ra/maps/marooned/map.yaml b/mods/ra/maps/marooned/map.yaml
deleted file mode 100644
index d21ef2db5e..0000000000
--- a/mods/ra/maps/marooned/map.yaml
+++ /dev/null
@@ -1,392 +0,0 @@
-Selectable: True
-
-MapFormat: 2
-
-Title: Marooned II
-
-Author: Westwood Studios
-
-PlayerCount: 6
-
-Tileset: TEMPERAT
-
-MapSize: 128,128
-
-TopLeft: 16,16
-
-BottomRight: 112,112
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		Palette:
-		Race: allies
-		OwnsWorld: True
-		NonCombatant: True
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-
-Actors:
-	ActorReference@Actor0:
-		Id: Actor0
-		Type: mine
-		Location: 63,74
-		Owner: Neutral
-	ActorReference@Actor1:
-		Id: Actor1
-		Type: mine
-		Location: 92,30
-		Owner: Neutral
-	ActorReference@Actor2:
-		Id: Actor2
-		Type: mine
-		Location: 81,25
-		Owner: Neutral
-	ActorReference@Actor3:
-		Id: Actor3
-		Type: mine
-		Location: 43,28
-		Owner: Neutral
-	ActorReference@Actor4:
-		Id: Actor4
-		Type: mine
-		Location: 40,72
-		Owner: Neutral
-	ActorReference@Actor5:
-		Id: Actor5
-		Type: mine
-		Location: 97,76
-		Owner: Neutral
-	ActorReference@Actor6:
-		Id: Actor6
-		Type: mine
-		Location: 26,63
-		Owner: Neutral
-	ActorReference@Actor7:
-		Id: Actor7
-		Type: mine
-		Location: 50,46
-		Owner: Neutral
-	ActorReference@Actor8:
-		Id: Actor8
-		Type: mine
-		Location: 64,90
-		Owner: Neutral
-	ActorReference@Actor9:
-		Id: Actor9
-		Type: mine
-		Location: 44,99
-		Owner: Neutral
-	ActorReference@Actor10:
-		Id: Actor10
-		Type: tc04
-		Location: 80,78
-		Owner: Neutral
-	ActorReference@Actor11:
-		Id: Actor11
-		Type: tc03
-		Location: 78,85
-		Owner: Neutral
-	ActorReference@Actor12:
-		Id: Actor12
-		Type: tc01
-		Location: 83,87
-		Owner: Neutral
-	ActorReference@Actor13:
-		Id: Actor13
-		Type: t17
-		Location: 66,88
-		Owner: Neutral
-	ActorReference@Actor14:
-		Id: Actor14
-		Type: t16
-		Location: 57,79
-		Owner: Neutral
-	ActorReference@Actor15:
-		Id: Actor15
-		Type: t15
-		Location: 60,69
-		Owner: Neutral
-	ActorReference@Actor16:
-		Id: Actor16
-		Type: t14
-		Location: 65,80
-		Owner: Neutral
-	ActorReference@Actor17:
-		Id: Actor17
-		Type: t13
-		Location: 62,92
-		Owner: Neutral
-	ActorReference@Actor18:
-		Id: Actor18
-		Type: t11
-		Location: 85,101
-		Owner: Neutral
-	ActorReference@Actor19:
-		Id: Actor19
-		Type: t08
-		Location: 87,100
-		Owner: Neutral
-	ActorReference@Actor20:
-		Id: Actor20
-		Type: t08
-		Location: 97,40
-		Owner: Neutral
-	ActorReference@Actor21:
-		Id: Actor21
-		Type: t11
-		Location: 98,39
-		Owner: Neutral
-	ActorReference@Actor22:
-		Id: Actor22
-		Type: t08
-		Location: 100,41
-		Owner: Neutral
-	ActorReference@Actor23:
-		Id: Actor23
-		Type: t07
-		Location: 96,35
-		Owner: Neutral
-	ActorReference@Actor24:
-		Id: Actor24
-		Type: t06
-		Location: 85,37
-		Owner: Neutral
-	ActorReference@Actor25:
-		Id: Actor25
-		Type: t02
-		Location: 83,47
-		Owner: Neutral
-	ActorReference@Actor26:
-		Id: Actor26
-		Type: t01
-		Location: 54,33
-		Owner: Neutral
-	ActorReference@Actor27:
-		Id: Actor27
-		Type: t03
-		Location: 43,47
-		Owner: Neutral
-	ActorReference@Actor28:
-		Id: Actor28
-		Type: tc02
-		Location: 51,28
-		Owner: Neutral
-	ActorReference@Actor29:
-		Id: Actor29
-		Type: tc01
-		Location: 37,25
-		Owner: Neutral
-	ActorReference@Actor30:
-		Id: Actor30
-		Type: t17
-		Location: 31,26
-		Owner: Neutral
-	ActorReference@Actor31:
-		Id: Actor31
-		Type: t15
-		Location: 32,65
-		Owner: Neutral
-	ActorReference@Actor32:
-		Id: Actor32
-		Type: t14
-		Location: 37,64
-		Owner: Neutral
-	ActorReference@Actor33:
-		Id: Actor33
-		Type: t13
-		Location: 62,83
-		Owner: Neutral
-	ActorReference@Actor34:
-		Id: Actor34
-		Type: t11
-		Location: 90,70
-		Owner: Neutral
-	ActorReference@Actor35:
-		Id: Actor35
-		Type: t10
-		Location: 74,65
-		Owner: Neutral
-	ActorReference@Actor36:
-		Id: Actor36
-		Type: tc01
-		Location: 81,21
-		Owner: Neutral
-	ActorReference@Actor37:
-		Id: Actor37
-		Type: t17
-		Location: 96,27
-		Owner: Neutral
-	ActorReference@Actor38:
-		Id: Actor38
-		Type: tc05
-		Location: 45,55
-		Owner: Neutral
-	ActorReference@Actor39:
-		Id: Actor39
-		Type: tc04
-		Location: 35,58
-		Owner: Neutral
-	ActorReference@Actor40:
-		Id: Actor40
-		Type: t16
-		Location: 46,61
-		Owner: Neutral
-	ActorReference@Actor41:
-		Id: Actor41
-		Type: t13
-		Location: 45,50
-		Owner: Neutral
-	ActorReference@Actor42:
-		Id: Actor42
-		Type: t12
-		Location: 43,39
-		Owner: Neutral
-	ActorReference@Actor43:
-		Id: Actor43
-		Type: tc02
-		Location: 68,36
-		Owner: Neutral
-	ActorReference@Actor44:
-		Id: Actor44
-		Type: t07
-		Location: 72,72
-		Owner: Neutral
-	ActorReference@Actor45:
-		Id: Actor45
-		Type: t06
-		Location: 42,58
-		Owner: Neutral
-	ActorReference@Actor46:
-		Id: Actor46
-		Type: t06
-		Location: 22,63
-		Owner: Neutral
-	ActorReference@Actor47:
-		Id: Actor47
-		Type: t10
-		Location: 22,56
-		Owner: Neutral
-	ActorReference@Actor48:
-		Id: Actor48
-		Type: t08
-		Location: 34,82
-		Owner: Neutral
-	ActorReference@Actor49:
-		Id: Actor49
-		Type: tc04
-		Location: 54,101
-		Owner: Neutral
-	ActorReference@Actor50:
-		Id: Actor50
-		Type: tc01
-		Location: 61,47
-		Owner: Neutral
-	ActorReference@Actor51:
-		Id: Actor51
-		Type: t17
-		Location: 57,32
-		Owner: Neutral
-	ActorReference@Actor52:
-		Id: Actor52
-		Type: tc01
-		Location: 81,36
-		Owner: Neutral
-	ActorReference@Actor53:
-		Id: Actor53
-		Type: t16
-		Location: 87,52
-		Owner: Neutral
-	ActorReference@Actor54:
-		Id: Actor54
-		Type: t16
-		Location: 102,48
-		Owner: Neutral
-	ActorReference@Actor55:
-		Id: Actor55
-		Type: t15
-		Location: 94,60
-		Owner: Neutral
-	ActorReference@Actor56:
-		Id: Actor56
-		Type: tc02
-		Location: 103,76
-		Owner: Neutral
-	ActorReference@Actor57:
-		Id: Actor57
-		Type: t16
-		Location: 96,85
-		Owner: Neutral
-	ActorReference@Actor58:
-		Id: Actor58
-		Type: tc04
-		Location: 95,84
-		Owner: Neutral
-	ActorReference@Actor59:
-		Id: Actor59
-		Type: tc05
-		Location: 86,39
-		Owner: Neutral
-	ActorReference@Actor60:
-		Id: Actor60
-		Type: tc04
-		Location: 49,21
-		Owner: Neutral
-	ActorReference@Actor61:
-		Id: Actor61
-		Type: tc01
-		Location: 45,40
-		Owner: Neutral
-	ActorReference@Actor62:
-		Id: Actor62
-		Type: t16
-		Location: 27,52
-		Owner: Neutral
-	ActorReference@Actor63:
-		Id: Actor63
-		Type: tc02
-		Location: 72,103
-		Owner: Neutral
-	ActorReference@Actor64:
-		Id: Actor64
-		Type: t16
-		Location: 81,102
-		Owner: Neutral
-	ActorReference@Actor65:
-		Id: Actor65
-		Type: t17
-		Location: 78,57
-		Owner: Neutral
-	ActorReference@Actor66:
-		Id: Actor66
-		Type: tc01
-		Location: 37,75
-		Owner: Neutral
-	ActorReference@Actor67:
-		Id: Actor67
-		Type: tc01
-		Location: 61,41
-		Owner: Neutral
-	ActorReference@Actor68:
-		Id: Actor68
-		Type: t16
-		Location: 79,42
-		Owner: Neutral
-	ActorReference@Actor69:
-		Id: Actor69
-		Type: tc04
-		Location: 98,56
-		Owner: Neutral
-
-Waypoints:
-	spawn0: 94,47
-	spawn1: 81,94
-	spawn2: 36,42
-	spawn3: 35,92
-	spawn4: 64,27
-	spawn5: 80,72
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm02ea/map.bin b/mods/ra/maps/middle-mayhem/map.bin
similarity index 100%
rename from mods/ra/maps/scm02ea/map.bin
rename to mods/ra/maps/middle-mayhem/map.bin
diff --git a/mods/ra/maps/middle-mayhem/map.uid b/mods/ra/maps/middle-mayhem/map.uid
new file mode 100644
index 0000000000..1419fdc147
--- /dev/null
+++ b/mods/ra/maps/middle-mayhem/map.uid
@@ -0,0 +1 @@
+fa0e0a31342c1c6eba2a0ebaf9c0201a8e235aed
\ No newline at end of file
diff --git a/mods/ra/maps/middle-mayhem/map.yaml b/mods/ra/maps/middle-mayhem/map.yaml
new file mode 100644
index 0000000000..149eea5266
--- /dev/null
+++ b/mods/ra/maps/middle-mayhem/map.yaml
@@ -0,0 +1,145 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Middle Mayhem
+
+Author: Westwood Studios
+
+PlayerCount: 4
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 27,26
+
+BottomRight: 102,91
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: tc05
+		Location: 62,58
+		Owner: Neutral
+	Actor1: tc04
+		Location: 64,63
+		Owner: Neutral
+	Actor2: tc03
+		Location: 73,60
+		Owner: Neutral
+	Actor3: tc03
+		Location: 55,48
+		Owner: Neutral
+	Actor4: tc01
+		Location: 58,51
+		Owner: Neutral
+	Actor5: tc01
+		Location: 54,68
+		Owner: Neutral
+	Actor6: t17
+		Location: 60,68
+		Owner: Neutral
+	Actor7: tc02
+		Location: 48,57
+		Owner: Neutral
+	Actor8: tc05
+		Location: 68,63
+		Owner: Neutral
+	Actor9: t16
+		Location: 71,63
+		Owner: Neutral
+	Actor10: t16
+		Location: 70,55
+		Owner: Neutral
+	Actor11: tc01
+		Location: 83,57
+		Owner: Neutral
+	Actor12: tc02
+		Location: 62,54
+		Owner: Neutral
+	Actor13: t08
+		Location: 62,56
+		Owner: Neutral
+	Actor14: t01
+		Location: 49,80
+		Owner: Neutral
+	Actor15: tc04
+		Location: 50,81
+		Owner: Neutral
+	Actor16: t16
+		Location: 53,82
+		Owner: Neutral
+	Actor17: tc02
+		Location: 42,79
+		Owner: Neutral
+	Actor18: tc03
+		Location: 27,26
+		Owner: Neutral
+	Actor19: t01
+		Location: 29,48
+		Owner: Neutral
+	Actor20: t02
+		Location: 31,50
+		Owner: Neutral
+	Actor21: t03
+		Location: 32,59
+		Owner: Neutral
+	Actor22: tc05
+		Location: 56,88
+		Owner: Neutral
+	Actor23: tc03
+		Location: 54,89
+		Owner: Neutral
+	Actor24: t16
+		Location: 56,89
+		Owner: Neutral
+	Actor25: t15
+		Location: 52,89
+		Owner: Neutral
+	Actor26: t14
+		Location: 64,78
+		Owner: Neutral
+	Actor27: tc01
+		Location: 27,44
+		Owner: Neutral
+	Actor28: tc01
+		Location: 45,39
+		Owner: Neutral
+	Actor29: t17
+		Location: 76,26
+		Owner: Neutral
+	Actor30: mine
+		Location: 68,53
+		Owner: Neutral
+	Actor31: mine
+		Location: 54,57
+		Owner: Neutral
+	Actor32: mine
+		Location: 53,65
+		Owner: Neutral
+	Actor33: mine
+		Location: 65,68
+		Owner: Neutral
+	Actor34: mine
+		Location: 80,61
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 34,84
+	spawn1: 35,34
+	wp0: 95,34
+	wp1: 94,83
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/mjolnir/map.uid b/mods/ra/maps/mjolnir/map.uid
index 32ab376dc5..e051de778d 100644
--- a/mods/ra/maps/mjolnir/map.uid
+++ b/mods/ra/maps/mjolnir/map.uid
@@ -1 +1 @@
-6d10c4c6bd31e68f5b6efe40cf5462da2e109b34
\ No newline at end of file
+81d46f5e0d9664253b9d2f45a83bbcffad98a97f
\ No newline at end of file
diff --git a/mods/ra/maps/mjolnir/map.yaml b/mods/ra/maps/mjolnir/map.yaml
index 0c9497c610..e628e899b6 100644
--- a/mods/ra/maps/mjolnir/map.yaml
+++ b/mods/ra/maps/mjolnir/map.yaml
@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 1
+MapFormat: 3
 
 Title: Mjolnir
 
@@ -16,128 +16,380 @@ TopLeft: 16,16
 
 BottomRight: 112,112
 
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
 Actors:
-	Actor0: t03 Neutral 58,85
-	Actor1: t13 Neutral 60,84
-	Actor2: mine Neutral 73,99
-	Actor3: mine Neutral 61,99
-	Actor4: t10 Neutral 63,102
-	Actor5: t12 Neutral 63,100
-	Actor6: t12 Neutral 43,88
-	Actor7: t13 Neutral 46,86
-	Actor8: t14 Neutral 45,87
-	Actor9: t14 Neutral 44,88
-	Actor10: t15 Neutral 43,87
-	Actor11: t12 Neutral 45,86
-	Actor12: t11 Neutral 49,90
-	Actor13: t10 Neutral 51,92
-	Actor14: t03 Neutral 50,93
-	Actor15: tc05 Neutral 26,105
-	Actor16: tc02 Neutral 28,103
-	Actor17: tc04 Neutral 31,68
-	Actor18: mine Neutral 96,76
-	Actor19: t02 Neutral 93,73
-	Actor20: t02 Neutral 91,72
-	Actor21: t05 Neutral 87,73
-	Actor22: t06 Neutral 88,71
-	Actor23: t11 Neutral 84,85
-	Actor24: t13 Neutral 83,84
-	Actor25: t15 Neutral 81,83
-	Actor26: t17 Neutral 82,85
-	Actor27: t03 Neutral 85,84
-	Actor28: t03 Neutral 88,89
-	Actor29: t03 Neutral 91,90
-	Actor30: t10 Neutral 90,91
-	Actor31: t12 Neutral 95,100
-	Actor32: t12 Neutral 93,98
-	Actor33: t12 Neutral 94,97
-	Actor34: mine Neutral 70,74
-	Actor35: mine Neutral 59,74
-	Actor36: tc02 Neutral 71,77
-	Actor37: tc02 Neutral 61,71
-	Actor38: tc04 Neutral 62,72
-	Actor39: t03 Neutral 60,70
-	Actor40: t11 Neutral 57,71
-	Actor41: t13 Neutral 70,75
-	Actor42: t13 Neutral 70,76
-	Actor43: t13 Neutral 69,77
-	Actor44: mine Neutral 33,59
-	Actor45: tc05 Neutral 29,45
-	Actor46: tc02 Neutral 28,47
-	Actor47: tc01 Neutral 22,22
-	Actor48: t16 Neutral 24,23
-	Actor49: t08 Neutral 24,25
-	Actor50: t08 Neutral 25,26
-	Actor51: t08 Neutral 22,26
-	Actor52: t08 Neutral 20,25
-	Actor53: t07 Neutral 21,24
-	Actor54: t06 Neutral 23,23
-	Actor55: t06 Neutral 22,24
-	Actor56: t05 Neutral 23,25
-	Actor57: mine Neutral 97,59
-	Actor58: tc05 Neutral 91,56
-	Actor59: tc04 Neutral 90,43
-	Actor60: tc04 Neutral 91,44
-	Actor61: tc03 Neutral 93,43
-	Actor62: t15 Neutral 106,31
-	Actor63: t14 Neutral 107,30
-	Actor64: t12 Neutral 111,26
-	Actor65: t12 Neutral 109,25
-	Actor66: t13 Neutral 34,41
-	Actor67: t13 Neutral 35,40
-	Actor68: t12 Neutral 34,39
-	Actor69: tc02 Neutral 68,16
-	Actor70: tc03 Neutral 65,16
-	Actor71: tc04 Neutral 67,17
-	Actor72: t17 Neutral 67,16
-	Actor73: t17 Neutral 66,17
-	Actor74: t11 Neutral 64,17
-	Actor75: t10 Neutral 65,18
-	Actor76: t03 Neutral 65,19
-	Actor77: tc05 Neutral 65,20
-	Actor78: tc05 Neutral 66,22
-	Actor79: tc03 Neutral 68,19
-	Actor80: t17 Neutral 64,19
-	Actor81: t17 Neutral 63,20
-	Actor82: t17 Neutral 65,22
-	Actor83: t14 Neutral 62,21
-	Actor84: t08 Neutral 64,21
-	Actor85: t08 Neutral 66,20
-	Actor86: t08 Neutral 68,21
-	Actor87: t10 Neutral 63,22
-	Actor88: t10 Neutral 65,23
-	Actor89: t11 Neutral 64,24
-	Actor90: tc01 Neutral 66,24
-	Actor91: tc04 Neutral 65,25
-	Actor92: tc04 Neutral 66,26
-	Actor93: t03 Neutral 64,23
-	Actor94: t03 Neutral 63,24
-	Actor95: t10 Neutral 62,23
-	Actor96: t16 Neutral 64,25
-	Actor97: tc01 Neutral 67,27
-	Actor98: tc01 Neutral 69,26
-	Actor99: tc01 Neutral 63,26
-	Actor100: tc02 Neutral 64,28
-	Actor101: tc04 Neutral 69,27
-	Actor102: t01 Neutral 64,27
-	Actor103: t01 Neutral 66,28
-	Actor104: t02 Neutral 70,28
-	Actor105: t05 Neutral 68,29
-	Actor106: t05 Neutral 63,29
-	Actor107: t06 Neutral 70,30
-	Actor108: t07 Neutral 69,29
-	Actor109: t08 Neutral 64,30
-	Actor110: tc01 Neutral 67,28
-	Actor111: tc04 Neutral 65,29
-	Actor112: tc03 Neutral 68,31
-	Actor113: tc03 Neutral 66,31
-	Actor114: mine Neutral 55,24
-	Actor115: mine Neutral 75,23
-	Actor116: mine Neutral 72,50
-	Actor117: mine Neutral 57,51
-	Actor118: t17 Neutral 61,55
-	Actor119: tc05 Neutral 61,54
-	Actor120: tc04 Neutral 60,53
+	Actor0: t03
+		Location: 58,85
+		Owner: Neutral
+	Actor1: t13
+		Location: 60,84
+		Owner: Neutral
+	Actor2: mine
+		Location: 73,99
+		Owner: Neutral
+	Actor3: mine
+		Location: 61,99
+		Owner: Neutral
+	Actor4: t10
+		Location: 63,102
+		Owner: Neutral
+	Actor5: t12
+		Location: 63,100
+		Owner: Neutral
+	Actor6: t12
+		Location: 43,88
+		Owner: Neutral
+	Actor7: t13
+		Location: 46,86
+		Owner: Neutral
+	Actor8: t14
+		Location: 45,87
+		Owner: Neutral
+	Actor9: t14
+		Location: 44,88
+		Owner: Neutral
+	Actor10: t15
+		Location: 43,87
+		Owner: Neutral
+	Actor11: t12
+		Location: 45,86
+		Owner: Neutral
+	Actor12: t11
+		Location: 49,90
+		Owner: Neutral
+	Actor13: t10
+		Location: 51,92
+		Owner: Neutral
+	Actor14: t03
+		Location: 50,93
+		Owner: Neutral
+	Actor15: tc05
+		Location: 26,105
+		Owner: Neutral
+	Actor16: tc02
+		Location: 28,103
+		Owner: Neutral
+	Actor17: tc04
+		Location: 31,68
+		Owner: Neutral
+	Actor18: mine
+		Location: 96,76
+		Owner: Neutral
+	Actor19: t02
+		Location: 93,73
+		Owner: Neutral
+	Actor20: t02
+		Location: 91,72
+		Owner: Neutral
+	Actor21: t05
+		Location: 87,73
+		Owner: Neutral
+	Actor22: t06
+		Location: 88,71
+		Owner: Neutral
+	Actor23: t11
+		Location: 84,85
+		Owner: Neutral
+	Actor24: t13
+		Location: 83,84
+		Owner: Neutral
+	Actor25: t15
+		Location: 81,83
+		Owner: Neutral
+	Actor26: t17
+		Location: 82,85
+		Owner: Neutral
+	Actor27: t03
+		Location: 85,84
+		Owner: Neutral
+	Actor28: t03
+		Location: 88,89
+		Owner: Neutral
+	Actor29: t03
+		Location: 91,90
+		Owner: Neutral
+	Actor30: t10
+		Location: 90,91
+		Owner: Neutral
+	Actor31: t12
+		Location: 95,100
+		Owner: Neutral
+	Actor32: t12
+		Location: 93,98
+		Owner: Neutral
+	Actor33: t12
+		Location: 94,97
+		Owner: Neutral
+	Actor34: mine
+		Location: 70,74
+		Owner: Neutral
+	Actor35: mine
+		Location: 59,74
+		Owner: Neutral
+	Actor36: tc02
+		Location: 71,77
+		Owner: Neutral
+	Actor37: tc02
+		Location: 61,71
+		Owner: Neutral
+	Actor38: tc04
+		Location: 62,72
+		Owner: Neutral
+	Actor39: t03
+		Location: 60,70
+		Owner: Neutral
+	Actor40: t11
+		Location: 57,71
+		Owner: Neutral
+	Actor41: t13
+		Location: 70,75
+		Owner: Neutral
+	Actor42: t13
+		Location: 70,76
+		Owner: Neutral
+	Actor43: t13
+		Location: 69,77
+		Owner: Neutral
+	Actor44: mine
+		Location: 33,59
+		Owner: Neutral
+	Actor45: tc05
+		Location: 29,45
+		Owner: Neutral
+	Actor46: tc02
+		Location: 28,47
+		Owner: Neutral
+	Actor47: tc01
+		Location: 22,22
+		Owner: Neutral
+	Actor48: t16
+		Location: 24,23
+		Owner: Neutral
+	Actor49: t08
+		Location: 24,25
+		Owner: Neutral
+	Actor50: t08
+		Location: 25,26
+		Owner: Neutral
+	Actor51: t08
+		Location: 22,26
+		Owner: Neutral
+	Actor52: t08
+		Location: 20,25
+		Owner: Neutral
+	Actor53: t07
+		Location: 21,24
+		Owner: Neutral
+	Actor54: t06
+		Location: 23,23
+		Owner: Neutral
+	Actor55: t06
+		Location: 22,24
+		Owner: Neutral
+	Actor56: t05
+		Location: 23,25
+		Owner: Neutral
+	Actor57: mine
+		Location: 97,59
+		Owner: Neutral
+	Actor58: tc05
+		Location: 91,56
+		Owner: Neutral
+	Actor59: tc04
+		Location: 90,43
+		Owner: Neutral
+	Actor60: tc04
+		Location: 91,44
+		Owner: Neutral
+	Actor61: tc03
+		Location: 93,43
+		Owner: Neutral
+	Actor62: t15
+		Location: 106,31
+		Owner: Neutral
+	Actor63: t14
+		Location: 107,30
+		Owner: Neutral
+	Actor64: t12
+		Location: 111,26
+		Owner: Neutral
+	Actor65: t12
+		Location: 109,25
+		Owner: Neutral
+	Actor66: t13
+		Location: 34,41
+		Owner: Neutral
+	Actor67: t13
+		Location: 35,40
+		Owner: Neutral
+	Actor68: t12
+		Location: 34,39
+		Owner: Neutral
+	Actor69: tc02
+		Location: 68,16
+		Owner: Neutral
+	Actor70: tc03
+		Location: 65,16
+		Owner: Neutral
+	Actor71: tc04
+		Location: 67,17
+		Owner: Neutral
+	Actor72: t17
+		Location: 67,16
+		Owner: Neutral
+	Actor73: t17
+		Location: 66,17
+		Owner: Neutral
+	Actor74: t11
+		Location: 64,17
+		Owner: Neutral
+	Actor75: t10
+		Location: 65,18
+		Owner: Neutral
+	Actor76: t03
+		Location: 65,19
+		Owner: Neutral
+	Actor77: tc05
+		Location: 65,20
+		Owner: Neutral
+	Actor78: tc05
+		Location: 66,22
+		Owner: Neutral
+	Actor79: tc03
+		Location: 68,19
+		Owner: Neutral
+	Actor80: t17
+		Location: 64,19
+		Owner: Neutral
+	Actor81: t17
+		Location: 63,20
+		Owner: Neutral
+	Actor82: t17
+		Location: 65,22
+		Owner: Neutral
+	Actor83: t14
+		Location: 62,21
+		Owner: Neutral
+	Actor84: t08
+		Location: 64,21
+		Owner: Neutral
+	Actor85: t08
+		Location: 66,20
+		Owner: Neutral
+	Actor86: t08
+		Location: 68,21
+		Owner: Neutral
+	Actor87: t10
+		Location: 63,22
+		Owner: Neutral
+	Actor88: t10
+		Location: 65,23
+		Owner: Neutral
+	Actor89: t11
+		Location: 64,24
+		Owner: Neutral
+	Actor90: tc01
+		Location: 66,24
+		Owner: Neutral
+	Actor91: tc04
+		Location: 65,25
+		Owner: Neutral
+	Actor92: tc04
+		Location: 66,26
+		Owner: Neutral
+	Actor93: t03
+		Location: 64,23
+		Owner: Neutral
+	Actor94: t03
+		Location: 63,24
+		Owner: Neutral
+	Actor95: t10
+		Location: 62,23
+		Owner: Neutral
+	Actor96: t16
+		Location: 64,25
+		Owner: Neutral
+	Actor97: tc01
+		Location: 67,27
+		Owner: Neutral
+	Actor98: tc01
+		Location: 69,26
+		Owner: Neutral
+	Actor99: tc01
+		Location: 63,26
+		Owner: Neutral
+	Actor100: tc02
+		Location: 64,28
+		Owner: Neutral
+	Actor101: tc04
+		Location: 69,27
+		Owner: Neutral
+	Actor102: t01
+		Location: 64,27
+		Owner: Neutral
+	Actor103: t01
+		Location: 66,28
+		Owner: Neutral
+	Actor104: t02
+		Location: 70,28
+		Owner: Neutral
+	Actor105: t05
+		Location: 68,29
+		Owner: Neutral
+	Actor106: t05
+		Location: 63,29
+		Owner: Neutral
+	Actor107: t06
+		Location: 70,30
+		Owner: Neutral
+	Actor108: t07
+		Location: 69,29
+		Owner: Neutral
+	Actor109: t08
+		Location: 64,30
+		Owner: Neutral
+	Actor110: tc01
+		Location: 67,28
+		Owner: Neutral
+	Actor111: tc04
+		Location: 65,29
+		Owner: Neutral
+	Actor112: tc03
+		Location: 68,31
+		Owner: Neutral
+	Actor113: tc03
+		Location: 66,31
+		Owner: Neutral
+	Actor114: mine
+		Location: 55,24
+		Owner: Neutral
+	Actor115: mine
+		Location: 75,23
+		Owner: Neutral
+	Actor116: mine
+		Location: 72,50
+		Owner: Neutral
+	Actor117: mine
+		Location: 57,51
+		Owner: Neutral
+	Actor118: t17
+		Location: 61,55
+		Owner: Neutral
+	Actor119: tc05
+		Location: 61,54
+		Owner: Neutral
+	Actor120: tc04
+		Location: 60,53
+		Owner: Neutral
 
 Waypoints:
 	spawn0: 85,105
diff --git a/mods/ra/maps/scm09ea/map.bin b/mods/ra/maps/north-by-northwest/map.bin
similarity index 100%
rename from mods/ra/maps/scm09ea/map.bin
rename to mods/ra/maps/north-by-northwest/map.bin
diff --git a/mods/ra/maps/north-by-northwest/map.uid b/mods/ra/maps/north-by-northwest/map.uid
new file mode 100644
index 0000000000..bf700bb975
--- /dev/null
+++ b/mods/ra/maps/north-by-northwest/map.uid
@@ -0,0 +1 @@
+4ffd7a4c679699b55b0e0a0817ff482c5a267b2a
\ No newline at end of file
diff --git a/mods/ra/maps/north-by-northwest/map.yaml b/mods/ra/maps/north-by-northwest/map.yaml
new file mode 100644
index 0000000000..c53b9f9734
--- /dev/null
+++ b/mods/ra/maps/north-by-northwest/map.yaml
@@ -0,0 +1,278 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: North by Northwest
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 16,15
+
+BottomRight: 112,111
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: mine
+		Location: 19,107
+		Owner: Neutral
+	Actor1: mine
+		Location: 108,107
+		Owner: Neutral
+	Actor2: mine
+		Location: 108,18
+		Owner: Neutral
+	Actor3: mine
+		Location: 19,18
+		Owner: Neutral
+	Actor4: tc04
+		Location: 37,61
+		Owner: Neutral
+	Actor5: tc03
+		Location: 34,62
+		Owner: Neutral
+	Actor6: tc03
+		Location: 63,87
+		Owner: Neutral
+	Actor7: tc02
+		Location: 63,90
+		Owner: Neutral
+	Actor8: tc02
+		Location: 88,62
+		Owner: Neutral
+	Actor9: tc01
+		Location: 92,61
+		Owner: Neutral
+	Actor10: t17
+		Location: 91,62
+		Owner: Neutral
+	Actor11: tc01
+		Location: 63,37
+		Owner: Neutral
+	Actor12: t16
+		Location: 63,34
+		Owner: Neutral
+	Actor13: tc02
+		Location: 63,32
+		Owner: Neutral
+	Actor14: t17
+		Location: 64,35
+		Owner: Neutral
+	Actor15: tc04
+		Location: 32,88
+		Owner: Neutral
+	Actor16: tc05
+		Location: 34,91
+		Owner: Neutral
+	Actor17: tc03
+		Location: 31,93
+		Owner: Neutral
+	Actor18: tc02
+		Location: 31,30
+		Owner: Neutral
+	Actor19: tc01
+		Location: 35,31
+		Owner: Neutral
+	Actor20: t14
+		Location: 32,33
+		Owner: Neutral
+	Actor21: t13
+		Location: 35,34
+		Owner: Neutral
+	Actor22: tc02
+		Location: 94,29
+		Owner: Neutral
+	Actor23: tc03
+		Location: 90,32
+		Owner: Neutral
+	Actor24: tc04
+		Location: 92,33
+		Owner: Neutral
+	Actor25: tc04
+		Location: 101,22
+		Owner: Neutral
+	Actor26: t16
+		Location: 100,24
+		Owner: Neutral
+	Actor27: tc02
+		Location: 102,101
+		Owner: Neutral
+	Actor28: t17
+		Location: 101,99
+		Owner: Neutral
+	Actor29: tc05
+		Location: 93,93
+		Owner: Neutral
+	Actor30: tc04
+		Location: 91,89
+		Owner: Neutral
+	Actor31: tc03
+		Location: 94,91
+		Owner: Neutral
+	Actor32: tc03
+		Location: 24,101
+		Owner: Neutral
+	Actor33: tc02
+		Location: 24,23
+		Owner: Neutral
+	Actor34: t17
+		Location: 26,24
+		Owner: Neutral
+	Actor35: mine
+		Location: 71,63
+		Owner: Neutral
+	Actor36: mine
+		Location: 64,56
+		Owner: Neutral
+	Actor37: mine
+		Location: 57,63
+		Owner: Neutral
+	Actor38: mine
+		Location: 64,70
+		Owner: Neutral
+	Actor39: t07
+		Location: 42,40
+		Owner: Neutral
+	Actor40: t07
+		Location: 85,40
+		Owner: Neutral
+	Actor41: t06
+		Location: 85,83
+		Owner: Neutral
+	Actor42: t01
+		Location: 42,83
+		Owner: Neutral
+	Actor43: t02
+		Location: 52,58
+		Owner: Neutral
+	Actor44: t03
+		Location: 58,67
+		Owner: Neutral
+	Actor45: t05
+		Location: 69,55
+		Owner: Neutral
+	Actor46: t06
+		Location: 75,61
+		Owner: Neutral
+	Actor47: t07
+		Location: 60,52
+		Owner: Neutral
+	Actor48: t08
+		Location: 53,65
+		Owner: Neutral
+	Actor49: t10
+		Location: 60,73
+		Owner: Neutral
+	Actor50: t12
+		Location: 70,66
+		Owner: Neutral
+	Actor51: t14
+		Location: 69,58
+		Owner: Neutral
+	Actor52: t16
+		Location: 50,61
+		Owner: Neutral
+	Actor53: t16
+		Location: 68,71
+		Owner: Neutral
+	Actor54: tc02
+		Location: 35,86
+		Owner: Neutral
+	Actor55: t17
+		Location: 39,89
+		Owner: Neutral
+	Actor56: tc01
+		Location: 90,86
+		Owner: Neutral
+	Actor57: t16
+		Location: 87,89
+		Owner: Neutral
+	Actor58: t15
+		Location: 87,34
+		Owner: Neutral
+	Actor59: t14
+		Location: 91,38
+		Owner: Neutral
+	Actor60: t14
+		Location: 28,27
+		Owner: Neutral
+	Actor61: t16
+		Location: 29,96
+		Owner: Neutral
+	Actor62: tc01
+		Location: 98,95
+		Owner: Neutral
+	Actor63: tc01
+		Location: 95,31
+		Owner: Neutral
+	Actor64: tc01
+		Location: 50,42
+		Owner: Neutral
+	Actor65: t17
+		Location: 44,51
+		Owner: Neutral
+	Actor66: t16
+		Location: 45,46
+		Owner: Neutral
+	Actor67: t15
+		Location: 50,47
+		Owner: Neutral
+	Actor68: t12
+		Location: 46,79
+		Owner: Neutral
+	Actor69: tc04
+		Location: 49,81
+		Owner: Neutral
+	Actor70: tc03
+		Location: 45,75
+		Owner: Neutral
+	Actor71: t17
+		Location: 42,70
+		Owner: Neutral
+	Actor72: tc03
+		Location: 82,75
+		Owner: Neutral
+	Actor73: tc05
+		Location: 75,80
+		Owner: Neutral
+	Actor74: tc03
+		Location: 83,49
+		Owner: Neutral
+	Actor75: tc01
+		Location: 72,40
+		Owner: Neutral
+	Actor76: t16
+		Location: 76,45
+		Owner: Neutral
+	Actor77: t14
+		Location: 79,42
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 47,23
+	spawn1: 80,102
+	spawn2: 103,46
+	spawn3: 24,79
+	spawn4: 24,46
+	spawn5: 103,79
+	spawn6: 79,23
+	spawn7: 47,102
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/scm12ea/map.bin b/mods/ra/maps/raraku/map.bin
similarity index 100%
rename from mods/ra/maps/scm12ea/map.bin
rename to mods/ra/maps/raraku/map.bin
diff --git a/mods/ra/maps/raraku/map.uid b/mods/ra/maps/raraku/map.uid
new file mode 100644
index 0000000000..04516a4836
--- /dev/null
+++ b/mods/ra/maps/raraku/map.uid
@@ -0,0 +1 @@
+79001edc6871751717843108bf35045bf749a477
\ No newline at end of file
diff --git a/mods/ra/maps/raraku/map.yaml b/mods/ra/maps/raraku/map.yaml
new file mode 100644
index 0000000000..d8e3764c5a
--- /dev/null
+++ b/mods/ra/maps/raraku/map.yaml
@@ -0,0 +1,257 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Raraku
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: TEMPERAT
+
+MapSize: 128,128
+
+TopLeft: 15,15
+
+BottomRight: 111,111
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: tc04
+		Location: 57,17
+		Owner: Neutral
+	Actor1: tc05
+		Location: 61,22
+		Owner: Neutral
+	Actor2: tc03
+		Location: 55,25
+		Owner: Neutral
+	Actor3: tc02
+		Location: 65,16
+		Owner: Neutral
+	Actor4: t17
+		Location: 62,18
+		Owner: Neutral
+	Actor5: tc04
+		Location: 51,14
+		Owner: Neutral
+	Actor6: tc03
+		Location: 68,29
+		Owner: Neutral
+	Actor7: tc01
+		Location: 58,29
+		Owner: Neutral
+	Actor8: tc05
+		Location: 50,38
+		Owner: Neutral
+	Actor9: tc02
+		Location: 45,30
+		Owner: Neutral
+	Actor10: tc05
+		Location: 97,16
+		Owner: Neutral
+	Actor11: tc04
+		Location: 96,15
+		Owner: Neutral
+	Actor12: tc03
+		Location: 96,24
+		Owner: Neutral
+	Actor13: tc05
+		Location: 26,30
+		Owner: Neutral
+	Actor14: tc04
+		Location: 15,28
+		Owner: Neutral
+	Actor15: tc05
+		Location: 16,29
+		Owner: Neutral
+	Actor16: tc03
+		Location: 25,32
+		Owner: Neutral
+	Actor17: tc04
+		Location: 23,92
+		Owner: Neutral
+	Actor18: tc05
+		Location: 24,93
+		Owner: Neutral
+	Actor19: tc03
+		Location: 96,90
+		Owner: Neutral
+	Actor20: tc05
+		Location: 96,76
+		Owner: Neutral
+	Actor21: tc01
+		Location: 86,77
+		Owner: Neutral
+	Actor22: t16
+		Location: 90,80
+		Owner: Neutral
+	Actor23: tc02
+		Location: 37,86
+		Owner: Neutral
+	Actor24: t17
+		Location: 80,56
+		Owner: Neutral
+	Actor25: tc02
+		Location: 76,66
+		Owner: Neutral
+	Actor26: tc04
+		Location: 56,61
+		Owner: Neutral
+	Actor27: tc05
+		Location: 52,59
+		Owner: Neutral
+	Actor28: tc03
+		Location: 30,49
+		Owner: Neutral
+	Actor29: tc02
+		Location: 25,69
+		Owner: Neutral
+	Actor30: t16
+		Location: 34,72
+		Owner: Neutral
+	Actor31: tc03
+		Location: 42,54
+		Owner: Neutral
+	Actor32: mine
+		Location: 73,79
+		Owner: Neutral
+	Actor33: mine
+		Location: 49,34
+		Owner: Neutral
+	Actor34: mine
+		Location: 105,22
+		Owner: Neutral
+	Actor35: mine
+		Location: 101,80
+		Owner: Neutral
+	Actor36: mine
+		Location: 43,107
+		Owner: Neutral
+	Actor37: mine
+		Location: 24,47
+		Owner: Neutral
+	Actor38: tc01
+		Location: 84,90
+		Owner: Neutral
+	Actor39: t16
+		Location: 83,91
+		Owner: Neutral
+	Actor40: tc02
+		Location: 18,101
+		Owner: Neutral
+	Actor41: tc01
+		Location: 17,107
+		Owner: Neutral
+	Actor42: t16
+		Location: 15,95
+		Owner: Neutral
+	Actor43: tc04
+		Location: 17,16
+		Owner: Neutral
+	Actor44: tc01
+		Location: 42,28
+		Owner: Neutral
+	Actor45: tc05
+		Location: 79,31
+		Owner: Neutral
+	Actor46: tc03
+		Location: 109,15
+		Owner: Neutral
+	Actor47: tc02
+		Location: 107,15
+		Owner: Neutral
+	Actor48: tc02
+		Location: 105,33
+		Owner: Neutral
+	Actor49: tc02
+		Location: 104,32
+		Owner: Neutral
+	Actor50: tc04
+		Location: 45,85
+		Owner: Neutral
+	Actor51: tc05
+		Location: 75,97
+		Owner: Neutral
+	Actor52: t16
+		Location: 76,99
+		Owner: Neutral
+	Actor53: tc01
+		Location: 88,89
+		Owner: Neutral
+	Actor54: tc02
+		Location: 35,91
+		Owner: Neutral
+	Actor55: tc01
+		Location: 39,31
+		Owner: Neutral
+	Actor56: tc03
+		Location: 14,59
+		Owner: Neutral
+	Actor57: tc02
+		Location: 15,57
+		Owner: Neutral
+	Actor58: tc01
+		Location: 21,14
+		Owner: Neutral
+	Actor59: mine
+		Location: 74,62
+		Owner: Neutral
+	Actor60: mine
+		Location: 43,21
+		Owner: Neutral
+	Actor61: tc02
+		Location: 36,109
+		Owner: Neutral
+	Actor62: tc01
+		Location: 109,44
+		Owner: Neutral
+	Actor63: tc02
+		Location: 98,38
+		Owner: Neutral
+	Actor64: tc03
+		Location: 72,69
+		Owner: Neutral
+	Actor65: tc01
+		Location: 89,14
+		Owner: Neutral
+	Actor66: tc04
+		Location: 81,47
+		Owner: Neutral
+	Actor67: tc01
+		Location: 100,94
+		Owner: Neutral
+	Actor68: tc02
+		Location: 102,86
+		Owner: Neutral
+	Actor69: tc05
+		Location: 89,54
+		Owner: Neutral
+	Actor70: tc01
+		Location: 89,53
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 26,102
+	spawn1: 88,24
+	spawn2: 90,97
+	spawn3: 26,23
+	spawn4: 63,88
+	spawn5: 59,53
+	spawn6: 29,61
+	spawn7: 104,51
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/regener/map.uid b/mods/ra/maps/regener/map.uid
deleted file mode 100644
index e9241f4dd9..0000000000
--- a/mods/ra/maps/regener/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-21f6356ca89c75b886410e4451c1ef3080827b61
\ No newline at end of file
diff --git a/mods/ra/maps/regener/map.yaml b/mods/ra/maps/regener/map.yaml
deleted file mode 100644
index 3e9329bf52..0000000000
--- a/mods/ra/maps/regener/map.yaml
+++ /dev/null
@@ -1,183 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Regeneration Basin
-
-Author: Westwood Studios
-
-PlayerCount: 8
-
-Tileset: TEMPERAT
-
-MapSize: 128,128
-
-TopLeft: 16,16
-
-BottomRight: 112,112
-
-Actors:
-	Actor0: v12 Neutral 75,50
-	Actor1: v13 Neutral 76,51
-	Actor2: v12 Neutral 47,79
-	Actor3: v13 Neutral 48,80
-	Actor4: mine Neutral 33,27
-	Actor5: mine Neutral 36,33
-	Actor6: mine Neutral 35,36
-	Actor7: mine Neutral 32,38
-	Actor8: mine Neutral 28,45
-	Actor9: mine Neutral 82,17
-	Actor10: mine Neutral 87,20
-	Actor11: mine Neutral 85,23
-	Actor12: mine Neutral 88,28
-	Actor13: mine Neutral 88,32
-	Actor14: mine Neutral 106,37
-	Actor15: mine Neutral 19,94
-	Actor16: mine Neutral 23,94
-	Actor17: mine Neutral 30,93
-	Actor18: mine Neutral 42,96
-	Actor19: mine Neutral 46,100
-	Actor20: mine Neutral 51,102
-	Actor21: mine Neutral 44,111
-	Actor22: mine Neutral 93,99
-	Actor23: mine Neutral 90,89
-	Actor24: mine Neutral 100,84
-	Actor25: mine Neutral 104,83
-	Actor26: mine Neutral 109,85
-	Actor27: mine Neutral 18,56
-	Actor28: mine Neutral 21,58
-	Actor29: mine Neutral 24,57
-	Actor30: mine Neutral 17,82
-	Actor31: mine Neutral 20,80
-	Actor32: mine Neutral 28,78
-	Actor33: mine Neutral 29,81
-	Actor34: tc05 Neutral 49,49
-	Actor35: tc04 Neutral 52,49
-	Actor36: tc01 Neutral 53,50
-	Actor37: t17 Neutral 49,50
-	Actor38: t16 Neutral 52,48
-	Actor39: t15 Neutral 49,48
-	Actor40: t13 Neutral 52,47
-	Actor41: t12 Neutral 49,47
-	Actor42: t12 Neutral 76,75
-	Actor43: t11 Neutral 76,76
-	Actor44: t07 Neutral 73,77
-	Actor45: t08 Neutral 65,72
-	Actor46: t08 Neutral 63,73
-	Actor47: t03 Neutral 62,60
-	Actor48: t17 Neutral 65,59
-	Actor49: mine Neutral 21,41
-	Actor50: t15 Neutral 22,46
-	Actor51: t13 Neutral 20,48
-	Actor52: t12 Neutral 18,46
-	Actor53: mine Neutral 22,48
-	Actor54: mine Neutral 34,43
-	Actor55: tc04 Neutral 30,42
-	Actor56: tc05 Neutral 26,60
-	Actor57: mine Neutral 28,88
-	Actor58: mine Neutral 22,89
-	Actor59: tc02 Neutral 24,84
-	Actor60: tc01 Neutral 29,90
-	Actor61: t17 Neutral 21,85
-	Actor62: t15 Neutral 24,87
-	Actor63: t07 Neutral 26,91
-	Actor64: t07 Neutral 24,76
-	Actor65: t05 Neutral 22,77
-	Actor66: t01 Neutral 26,79
-	Actor67: mine Neutral 55,109
-	Actor68: mine Neutral 61,103
-	Actor69: mine Neutral 63,98
-	Actor70: mine Neutral 43,105
-	Actor71: tc04 Neutral 39,101
-	Actor72: tc05 Neutral 37,107
-	Actor73: t15 Neutral 46,105
-	Actor74: mine Neutral 96,109
-	Actor75: mine Neutral 88,98
-	Actor76: mine Neutral 84,88
-	Actor77: mine Neutral 83,110
-	Actor78: mine Neutral 86,106
-	Actor79: mine Neutral 79,99
-	Actor80: mine Neutral 81,105
-	Actor81: mine Neutral 73,90
-	Actor82: tc03 Neutral 77,105
-	Actor83: t08 Neutral 76,106
-	Actor84: t08 Neutral 77,104
-	Actor85: t12 Neutral 77,109
-	Actor86: t13 Neutral 76,107
-	Actor87: t13 Neutral 86,103
-	Actor88: mine Neutral 91,91
-	Actor89: mine Neutral 94,105
-	Actor90: t14 Neutral 97,107
-	Actor91: t16 Neutral 91,101
-	Actor92: mine Neutral 95,87
-	Actor93: tc02 Neutral 52,109
-	Actor94: tc01 Neutral 57,103
-	Actor95: mine Neutral 36,70
-	Actor96: mine Neutral 34,54
-	Actor97: mine Neutral 24,80
-	Actor98: mine Neutral 59,90
-	Actor99: mine Neutral 100,41
-	Actor100: mine Neutral 96,39
-	Actor101: mine Neutral 109,34
-	Actor102: mine Neutral 101,49
-	Actor103: mine Neutral 97,49
-	Actor104: mine Neutral 108,76
-	Actor105: mine Neutral 110,73
-	Actor106: mine Neutral 104,74
-	Actor107: mine Neutral 94,73
-	Actor108: mine Neutral 91,70
-	Actor109: mine Neutral 89,54
-	Actor110: mine Neutral 105,47
-	Actor111: t11 Neutral 107,78
-	Actor112: t13 Neutral 103,75
-	Actor113: tc01 Neutral 99,45
-	Actor114: tc05 Neutral 88,22
-	Actor115: tc04 Neutral 81,20
-	Actor116: tc01 Neutral 89,29
-	Actor117: mine Neutral 32,22
-	Actor118: mine Neutral 31,18
-	Actor119: mine Neutral 47,18
-	Actor120: mine Neutral 44,24
-	Actor121: mine Neutral 48,23
-	Actor122: mine Neutral 50,30
-	Actor123: mine Neutral 55,37
-	Actor124: mine Neutral 69,35
-	Actor125: mine Neutral 73,18
-	Actor126: mine Neutral 72,24
-	Actor127: mine Neutral 76,27
-	Actor128: tc02 Neutral 33,17
-	Actor129: t01 Neutral 36,25
-	Actor130: t02 Neutral 37,23
-	Actor131: t05 Neutral 30,23
-	Actor132: t10 Neutral 49,19
-	Actor133: t13 Neutral 46,24
-	Actor134: t03 Neutral 49,26
-	Actor135: t12 Neutral 48,27
-	Actor136: tc02 Neutral 50,83
-	Actor137: tc04 Neutral 42,69
-	Actor138: tc05 Neutral 46,75
-	Actor139: tc04 Neutral 74,54
-	Actor140: tc01 Neutral 80,52
-	Actor141: t03 Neutral 73,48
-	Actor142: t12 Neutral 75,47
-	Actor143: t17 Neutral 76,48
-	Actor144: mine Neutral 44,43
-	Actor145: mine Neutral 86,77
-	Actor146: mine Neutral 82,82
-	Actor147: mine Neutral 41,53
-	Actor148: mine Neutral 48,44
-
-Waypoints:
-	spawn0: 23,105
-	spawn1: 22,67
-	spawn2: 21,20
-	spawn3: 62,24
-	spawn4: 102,24
-	spawn5: 104,64
-	spawn6: 106,104
-	spawn7: 72,103
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/regener/map.bin b/mods/ra/maps/regeneration-basin/map.bin
similarity index 100%
rename from mods/ra/maps/regener/map.bin
rename to mods/ra/maps/regeneration-basin/map.bin
diff --git a/mods/ra/maps/regeneration-basin/map.uid b/mods/ra/maps/regeneration-basin/map.uid
new file mode 100644
index 0000000000..5e5595e2cd
--- /dev/null
+++ b/mods/ra/maps/regeneration-basin/map.uid
@@ -0,0 +1 @@
+83ed5376d6d76bea1492169f5ecb17e696218670
\ No newline at end of file
diff --git a/mods/ra/maps/regeneration-basin/map.yaml b/mods/ra/maps/regeneration-basin/map.yaml
new file mode 100644
index 0000000000..519794a91a
--- /dev/null
+++ b/mods/ra/maps/regeneration-basin/map.yaml
@@ -0,0 +1,491 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Regeneration Basin
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: TEMPERAT
+
+MapSize: 128,128
+
+TopLeft: 16,16
+
+BottomRight: 112,112
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: v12
+		Location: 75,50
+		Owner: Neutral
+	Actor1: v13
+		Location: 76,51
+		Owner: Neutral
+	Actor2: v12
+		Location: 47,79
+		Owner: Neutral
+	Actor3: v13
+		Location: 48,80
+		Owner: Neutral
+	Actor4: mine
+		Location: 33,27
+		Owner: Neutral
+	Actor5: mine
+		Location: 36,33
+		Owner: Neutral
+	Actor6: mine
+		Location: 35,36
+		Owner: Neutral
+	Actor7: mine
+		Location: 32,38
+		Owner: Neutral
+	Actor8: mine
+		Location: 28,45
+		Owner: Neutral
+	Actor9: mine
+		Location: 82,17
+		Owner: Neutral
+	Actor10: mine
+		Location: 87,20
+		Owner: Neutral
+	Actor11: mine
+		Location: 85,23
+		Owner: Neutral
+	Actor12: mine
+		Location: 88,28
+		Owner: Neutral
+	Actor13: mine
+		Location: 88,32
+		Owner: Neutral
+	Actor14: mine
+		Location: 106,37
+		Owner: Neutral
+	Actor15: mine
+		Location: 19,94
+		Owner: Neutral
+	Actor16: mine
+		Location: 23,94
+		Owner: Neutral
+	Actor17: mine
+		Location: 30,93
+		Owner: Neutral
+	Actor18: mine
+		Location: 42,96
+		Owner: Neutral
+	Actor19: mine
+		Location: 46,100
+		Owner: Neutral
+	Actor20: mine
+		Location: 51,102
+		Owner: Neutral
+	Actor21: mine
+		Location: 44,111
+		Owner: Neutral
+	Actor22: mine
+		Location: 93,99
+		Owner: Neutral
+	Actor23: mine
+		Location: 90,89
+		Owner: Neutral
+	Actor24: mine
+		Location: 100,84
+		Owner: Neutral
+	Actor25: mine
+		Location: 104,83
+		Owner: Neutral
+	Actor26: mine
+		Location: 109,85
+		Owner: Neutral
+	Actor27: mine
+		Location: 18,56
+		Owner: Neutral
+	Actor28: mine
+		Location: 21,58
+		Owner: Neutral
+	Actor29: mine
+		Location: 24,57
+		Owner: Neutral
+	Actor30: mine
+		Location: 17,82
+		Owner: Neutral
+	Actor31: mine
+		Location: 20,80
+		Owner: Neutral
+	Actor32: mine
+		Location: 28,78
+		Owner: Neutral
+	Actor33: mine
+		Location: 29,81
+		Owner: Neutral
+	Actor34: tc05
+		Location: 49,49
+		Owner: Neutral
+	Actor35: tc04
+		Location: 52,49
+		Owner: Neutral
+	Actor36: tc01
+		Location: 53,50
+		Owner: Neutral
+	Actor37: t17
+		Location: 49,50
+		Owner: Neutral
+	Actor38: t16
+		Location: 52,48
+		Owner: Neutral
+	Actor39: t15
+		Location: 49,48
+		Owner: Neutral
+	Actor40: t13
+		Location: 52,47
+		Owner: Neutral
+	Actor41: t12
+		Location: 49,47
+		Owner: Neutral
+	Actor42: t12
+		Location: 76,75
+		Owner: Neutral
+	Actor43: t11
+		Location: 76,76
+		Owner: Neutral
+	Actor44: t07
+		Location: 73,77
+		Owner: Neutral
+	Actor45: t08
+		Location: 65,72
+		Owner: Neutral
+	Actor46: t08
+		Location: 63,73
+		Owner: Neutral
+	Actor47: t03
+		Location: 62,60
+		Owner: Neutral
+	Actor48: t17
+		Location: 65,59
+		Owner: Neutral
+	Actor49: mine
+		Location: 21,41
+		Owner: Neutral
+	Actor50: t15
+		Location: 22,46
+		Owner: Neutral
+	Actor51: t13
+		Location: 20,48
+		Owner: Neutral
+	Actor52: t12
+		Location: 18,46
+		Owner: Neutral
+	Actor53: mine
+		Location: 22,48
+		Owner: Neutral
+	Actor54: mine
+		Location: 34,43
+		Owner: Neutral
+	Actor55: tc04
+		Location: 30,42
+		Owner: Neutral
+	Actor56: tc05
+		Location: 26,60
+		Owner: Neutral
+	Actor57: mine
+		Location: 28,88
+		Owner: Neutral
+	Actor58: mine
+		Location: 22,89
+		Owner: Neutral
+	Actor59: tc02
+		Location: 24,84
+		Owner: Neutral
+	Actor60: tc01
+		Location: 29,90
+		Owner: Neutral
+	Actor61: t17
+		Location: 21,85
+		Owner: Neutral
+	Actor62: t15
+		Location: 24,87
+		Owner: Neutral
+	Actor63: t07
+		Location: 26,91
+		Owner: Neutral
+	Actor64: t07
+		Location: 24,76
+		Owner: Neutral
+	Actor65: t05
+		Location: 22,77
+		Owner: Neutral
+	Actor66: t01
+		Location: 26,79
+		Owner: Neutral
+	Actor67: mine
+		Location: 55,109
+		Owner: Neutral
+	Actor68: mine
+		Location: 61,103
+		Owner: Neutral
+	Actor69: mine
+		Location: 63,98
+		Owner: Neutral
+	Actor70: mine
+		Location: 43,105
+		Owner: Neutral
+	Actor71: tc04
+		Location: 39,101
+		Owner: Neutral
+	Actor72: tc05
+		Location: 37,107
+		Owner: Neutral
+	Actor73: t15
+		Location: 46,105
+		Owner: Neutral
+	Actor74: mine
+		Location: 96,109
+		Owner: Neutral
+	Actor75: mine
+		Location: 88,98
+		Owner: Neutral
+	Actor76: mine
+		Location: 84,88
+		Owner: Neutral
+	Actor77: mine
+		Location: 83,110
+		Owner: Neutral
+	Actor78: mine
+		Location: 86,106
+		Owner: Neutral
+	Actor79: mine
+		Location: 79,99
+		Owner: Neutral
+	Actor80: mine
+		Location: 81,105
+		Owner: Neutral
+	Actor81: mine
+		Location: 73,90
+		Owner: Neutral
+	Actor82: tc03
+		Location: 77,105
+		Owner: Neutral
+	Actor83: t08
+		Location: 76,106
+		Owner: Neutral
+	Actor84: t08
+		Location: 77,104
+		Owner: Neutral
+	Actor85: t12
+		Location: 77,109
+		Owner: Neutral
+	Actor86: t13
+		Location: 76,107
+		Owner: Neutral
+	Actor87: t13
+		Location: 86,103
+		Owner: Neutral
+	Actor88: mine
+		Location: 91,91
+		Owner: Neutral
+	Actor89: mine
+		Location: 94,105
+		Owner: Neutral
+	Actor90: t14
+		Location: 97,107
+		Owner: Neutral
+	Actor91: t16
+		Location: 91,101
+		Owner: Neutral
+	Actor92: mine
+		Location: 95,87
+		Owner: Neutral
+	Actor93: tc02
+		Location: 52,109
+		Owner: Neutral
+	Actor94: tc01
+		Location: 57,103
+		Owner: Neutral
+	Actor95: mine
+		Location: 36,70
+		Owner: Neutral
+	Actor96: mine
+		Location: 34,54
+		Owner: Neutral
+	Actor97: mine
+		Location: 24,80
+		Owner: Neutral
+	Actor98: mine
+		Location: 59,90
+		Owner: Neutral
+	Actor99: mine
+		Location: 100,41
+		Owner: Neutral
+	Actor100: mine
+		Location: 96,39
+		Owner: Neutral
+	Actor101: mine
+		Location: 109,34
+		Owner: Neutral
+	Actor102: mine
+		Location: 101,49
+		Owner: Neutral
+	Actor103: mine
+		Location: 97,49
+		Owner: Neutral
+	Actor104: mine
+		Location: 108,76
+		Owner: Neutral
+	Actor105: mine
+		Location: 110,73
+		Owner: Neutral
+	Actor106: mine
+		Location: 104,74
+		Owner: Neutral
+	Actor107: mine
+		Location: 94,73
+		Owner: Neutral
+	Actor108: mine
+		Location: 91,70
+		Owner: Neutral
+	Actor109: mine
+		Location: 89,54
+		Owner: Neutral
+	Actor110: mine
+		Location: 105,47
+		Owner: Neutral
+	Actor111: t11
+		Location: 107,78
+		Owner: Neutral
+	Actor112: t13
+		Location: 103,75
+		Owner: Neutral
+	Actor113: tc01
+		Location: 99,45
+		Owner: Neutral
+	Actor114: tc05
+		Location: 88,22
+		Owner: Neutral
+	Actor115: tc04
+		Location: 81,20
+		Owner: Neutral
+	Actor116: tc01
+		Location: 89,29
+		Owner: Neutral
+	Actor117: mine
+		Location: 32,22
+		Owner: Neutral
+	Actor118: mine
+		Location: 31,18
+		Owner: Neutral
+	Actor119: mine
+		Location: 47,18
+		Owner: Neutral
+	Actor120: mine
+		Location: 44,24
+		Owner: Neutral
+	Actor121: mine
+		Location: 48,23
+		Owner: Neutral
+	Actor122: mine
+		Location: 50,30
+		Owner: Neutral
+	Actor123: mine
+		Location: 55,37
+		Owner: Neutral
+	Actor124: mine
+		Location: 69,35
+		Owner: Neutral
+	Actor125: mine
+		Location: 73,18
+		Owner: Neutral
+	Actor126: mine
+		Location: 72,24
+		Owner: Neutral
+	Actor127: mine
+		Location: 76,27
+		Owner: Neutral
+	Actor128: tc02
+		Location: 33,17
+		Owner: Neutral
+	Actor129: t01
+		Location: 36,25
+		Owner: Neutral
+	Actor130: t02
+		Location: 37,23
+		Owner: Neutral
+	Actor131: t05
+		Location: 30,23
+		Owner: Neutral
+	Actor132: t10
+		Location: 49,19
+		Owner: Neutral
+	Actor133: t13
+		Location: 46,24
+		Owner: Neutral
+	Actor134: t03
+		Location: 49,26
+		Owner: Neutral
+	Actor135: t12
+		Location: 48,27
+		Owner: Neutral
+	Actor136: tc02
+		Location: 50,83
+		Owner: Neutral
+	Actor137: tc04
+		Location: 42,69
+		Owner: Neutral
+	Actor138: tc05
+		Location: 46,75
+		Owner: Neutral
+	Actor139: tc04
+		Location: 74,54
+		Owner: Neutral
+	Actor140: tc01
+		Location: 80,52
+		Owner: Neutral
+	Actor141: t03
+		Location: 73,48
+		Owner: Neutral
+	Actor142: t12
+		Location: 75,47
+		Owner: Neutral
+	Actor143: t17
+		Location: 76,48
+		Owner: Neutral
+	Actor144: mine
+		Location: 44,43
+		Owner: Neutral
+	Actor145: mine
+		Location: 86,77
+		Owner: Neutral
+	Actor146: mine
+		Location: 82,82
+		Owner: Neutral
+	Actor147: mine
+		Location: 41,53
+		Owner: Neutral
+	Actor148: mine
+		Location: 48,44
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 23,105
+	spawn1: 22,67
+	spawn2: 21,20
+	spawn3: 62,24
+	spawn4: 102,24
+	spawn5: 104,64
+	spawn6: 106,104
+	spawn7: 72,103
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/ringof/map.bin b/mods/ra/maps/ring-of-fire/map.bin
similarity index 100%
rename from mods/ra/maps/ringof/map.bin
rename to mods/ra/maps/ring-of-fire/map.bin
diff --git a/mods/ra/maps/ring-of-fire/map.uid b/mods/ra/maps/ring-of-fire/map.uid
new file mode 100644
index 0000000000..9dcf467e9f
--- /dev/null
+++ b/mods/ra/maps/ring-of-fire/map.uid
@@ -0,0 +1 @@
+700c39e1f70c06ee7a9dd119720234c3132231a0
\ No newline at end of file
diff --git a/mods/ra/maps/ring-of-fire/map.yaml b/mods/ra/maps/ring-of-fire/map.yaml
new file mode 100644
index 0000000000..15e7e697f7
--- /dev/null
+++ b/mods/ra/maps/ring-of-fire/map.yaml
@@ -0,0 +1,302 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: Ring of Fire
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 16,16
+
+BottomRight: 112,112
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: v12
+		Location: 63,17
+		Owner: Neutral
+	Actor1: v13
+		Location: 73,105
+		Owner: Neutral
+	Actor2: mine
+		Location: 44,18
+		Owner: Neutral
+	Actor3: mine
+		Location: 27,39
+		Owner: Neutral
+	Actor4: mine
+		Location: 103,35
+		Owner: Neutral
+	Actor5: mine
+		Location: 81,19
+		Owner: Neutral
+	Actor6: mine
+		Location: 83,91
+		Owner: Neutral
+	Actor7: mine
+		Location: 89,51
+		Owner: Neutral
+	Actor8: mine
+		Location: 49,46
+		Owner: Neutral
+	Actor9: mine
+		Location: 45,85
+		Owner: Neutral
+	Actor10: mine
+		Location: 24,86
+		Owner: Neutral
+	Actor11: mine
+		Location: 39,101
+		Owner: Neutral
+	Actor12: mine
+		Location: 88,108
+		Owner: Neutral
+	Actor13: mine
+		Location: 106,87
+		Owner: Neutral
+	Actor14: t11
+		Location: 51,71
+		Owner: Neutral
+	Actor15: t11
+		Location: 41,76
+		Owner: Neutral
+	Actor16: t12
+		Location: 43,75
+		Owner: Neutral
+	Actor17: t12
+		Location: 82,65
+		Owner: Neutral
+	Actor18: t13
+		Location: 90,70
+		Owner: Neutral
+	Actor19: t13
+		Location: 95,68
+		Owner: Neutral
+	Actor20: t10
+		Location: 70,44
+		Owner: Neutral
+	Actor21: t10
+		Location: 58,56
+		Owner: Neutral
+	Actor22: t03
+		Location: 56,55
+		Owner: Neutral
+	Actor23: t10
+		Location: 94,17
+		Owner: Neutral
+	Actor24: t11
+		Location: 92,28
+		Owner: Neutral
+	Actor25: t15
+		Location: 69,82
+		Owner: Neutral
+	Actor26: t16
+		Location: 69,83
+		Owner: Neutral
+	Actor27: tc01
+		Location: 106,31
+		Owner: Neutral
+	Actor28: tc01
+		Location: 31,25
+		Owner: Neutral
+	Actor29: tc02
+		Location: 41,44
+		Owner: Neutral
+	Actor30: tc03
+		Location: 35,46
+		Owner: Neutral
+	Actor31: tc04
+		Location: 34,47
+		Owner: Neutral
+	Actor32: tc04
+		Location: 35,94
+		Owner: Neutral
+	Actor33: t06
+		Location: 39,89
+		Owner: Neutral
+	Actor34: t05
+		Location: 32,91
+		Owner: Neutral
+	Actor35: t07
+		Location: 54,91
+		Owner: Neutral
+	Actor36: t07
+		Location: 53,90
+		Owner: Neutral
+	Actor37: t08
+		Location: 53,93
+		Owner: Neutral
+	Actor38: t06
+		Location: 51,91
+		Owner: Neutral
+	Actor39: t06
+		Location: 54,94
+		Owner: Neutral
+	Actor40: t10
+		Location: 52,91
+		Owner: Neutral
+	Actor41: t12
+		Location: 54,92
+		Owner: Neutral
+	Actor42: t12
+		Location: 89,79
+		Owner: Neutral
+	Actor43: t13
+		Location: 90,80
+		Owner: Neutral
+	Actor44: t15
+		Location: 88,82
+		Owner: Neutral
+	Actor45: tc02
+		Location: 87,101
+		Owner: Neutral
+	Actor46: mine
+		Location: 50,101
+		Owner: Neutral
+	Actor47: mine
+		Location: 102,83
+		Owner: Neutral
+	Actor48: mine
+		Location: 101,48
+		Owner: Neutral
+	Actor49: mine
+		Location: 41,54
+		Owner: Neutral
+	Actor50: tc05
+		Location: 51,30
+		Owner: Neutral
+	Actor51: tc04
+		Location: 50,29
+		Owner: Neutral
+	Actor52: t01
+		Location: 54,34
+		Owner: Neutral
+	Actor53: t01
+		Location: 53,35
+		Owner: Neutral
+	Actor54: t02
+		Location: 55,33
+		Owner: Neutral
+	Actor55: t03
+		Location: 52,33
+		Owner: Neutral
+	Actor56: t03
+		Location: 62,17
+		Owner: Neutral
+	Actor57: t03
+		Location: 61,16
+		Owner: Neutral
+	Actor58: tc02
+		Location: 58,18
+		Owner: Neutral
+	Actor59: t03
+		Location: 23,60
+		Owner: Neutral
+	Actor60: t10
+		Location: 19,58
+		Owner: Neutral
+	Actor61: t11
+		Location: 26,64
+		Owner: Neutral
+	Actor62: t12
+		Location: 24,66
+		Owner: Neutral
+	Actor63: t13
+		Location: 16,67
+		Owner: Neutral
+	Actor64: t14
+		Location: 18,54
+		Owner: Neutral
+	Actor65: t15
+		Location: 28,56
+		Owner: Neutral
+	Actor66: t16
+		Location: 30,55
+		Owner: Neutral
+	Actor67: t17
+		Location: 27,57
+		Owner: Neutral
+	Actor68: tc01
+		Location: 24,52
+		Owner: Neutral
+	Actor69: tc02
+		Location: 17,71
+		Owner: Neutral
+	Actor70: tc03
+		Location: 19,72
+		Owner: Neutral
+	Actor71: tc04
+		Location: 23,75
+		Owner: Neutral
+	Actor72: mine
+		Location: 19,49
+		Owner: Neutral
+	Actor73: tc01
+		Location: 72,110
+		Owner: Neutral
+	Actor74: t15
+		Location: 75,108
+		Owner: Neutral
+	Actor75: t14
+		Location: 72,108
+		Owner: Neutral
+	Actor76: t01
+		Location: 51,108
+		Owner: Neutral
+	Actor77: tc05
+		Location: 52,109
+		Owner: Neutral
+	Actor78: tc05
+		Location: 108,64
+		Owner: Neutral
+	Actor79: t01
+		Location: 101,56
+		Owner: Neutral
+	Actor80: t12
+		Location: 101,54
+		Owner: Neutral
+	Actor81: t11
+		Location: 103,51
+		Owner: Neutral
+	Actor82: t14
+		Location: 100,55
+		Owner: Neutral
+	Actor83: t15
+		Location: 106,56
+		Owner: Neutral
+	Actor84: tc04
+		Location: 109,103
+		Owner: Neutral
+	Actor85: t15
+		Location: 99,110
+		Owner: Neutral
+
+Waypoints:
+	spawn0: 19,19
+	spawn1: 110,109
+	spawn2: 17,109
+	spawn3: 110,17
+	spawn4: 66,50
+	spawn5: 69,87
+	spawn6: 46,70
+	spawn7: 89,65
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/ringof/map.uid b/mods/ra/maps/ringof/map.uid
deleted file mode 100644
index 85f7755bb0..0000000000
--- a/mods/ra/maps/ringof/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-f109052a46005e5f8f8c48bb0e357a7c417ef43e
\ No newline at end of file
diff --git a/mods/ra/maps/ringof/map.yaml b/mods/ra/maps/ringof/map.yaml
deleted file mode 100644
index 188ccea004..0000000000
--- a/mods/ra/maps/ringof/map.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Ring of Fire
-
-Author: Westwood Studios
-
-PlayerCount: 8
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 16,16
-
-BottomRight: 112,112
-
-Actors:
-	Actor0: v12 Neutral 63,17
-	Actor1: v13 Neutral 73,105
-	Actor2: mine Neutral 44,18
-	Actor3: mine Neutral 27,39
-	Actor4: mine Neutral 103,35
-	Actor5: mine Neutral 81,19
-	Actor6: mine Neutral 83,91
-	Actor7: mine Neutral 89,51
-	Actor8: mine Neutral 49,46
-	Actor9: mine Neutral 45,85
-	Actor10: mine Neutral 24,86
-	Actor11: mine Neutral 39,101
-	Actor12: mine Neutral 88,108
-	Actor13: mine Neutral 106,87
-	Actor14: t11 Neutral 51,71
-	Actor15: t11 Neutral 41,76
-	Actor16: t12 Neutral 43,75
-	Actor17: t12 Neutral 82,65
-	Actor18: t13 Neutral 90,70
-	Actor19: t13 Neutral 95,68
-	Actor20: t10 Neutral 70,44
-	Actor21: t10 Neutral 58,56
-	Actor22: t03 Neutral 56,55
-	Actor23: t10 Neutral 94,17
-	Actor24: t11 Neutral 92,28
-	Actor25: t15 Neutral 69,82
-	Actor26: t16 Neutral 69,83
-	Actor27: tc01 Neutral 106,31
-	Actor28: tc01 Neutral 31,25
-	Actor29: tc02 Neutral 41,44
-	Actor30: tc03 Neutral 35,46
-	Actor31: tc04 Neutral 34,47
-	Actor32: tc04 Neutral 35,94
-	Actor33: t06 Neutral 39,89
-	Actor34: t05 Neutral 32,91
-	Actor35: t07 Neutral 54,91
-	Actor36: t07 Neutral 53,90
-	Actor37: t08 Neutral 53,93
-	Actor38: t06 Neutral 51,91
-	Actor39: t06 Neutral 54,94
-	Actor40: t10 Neutral 52,91
-	Actor41: t12 Neutral 54,92
-	Actor42: t12 Neutral 89,79
-	Actor43: t13 Neutral 90,80
-	Actor44: t15 Neutral 88,82
-	Actor45: tc02 Neutral 87,101
-	Actor46: mine Neutral 50,101
-	Actor47: mine Neutral 102,83
-	Actor48: mine Neutral 101,48
-	Actor49: mine Neutral 41,54
-	Actor50: tc05 Neutral 51,30
-	Actor51: tc04 Neutral 50,29
-	Actor52: t01 Neutral 54,34
-	Actor53: t01 Neutral 53,35
-	Actor54: t02 Neutral 55,33
-	Actor55: t03 Neutral 52,33
-	Actor56: t03 Neutral 62,17
-	Actor57: t03 Neutral 61,16
-	Actor58: tc02 Neutral 58,18
-	Actor59: t03 Neutral 23,60
-	Actor60: t10 Neutral 19,58
-	Actor61: t11 Neutral 26,64
-	Actor62: t12 Neutral 24,66
-	Actor63: t13 Neutral 16,67
-	Actor64: t14 Neutral 18,54
-	Actor65: t15 Neutral 28,56
-	Actor66: t16 Neutral 30,55
-	Actor67: t17 Neutral 27,57
-	Actor68: tc01 Neutral 24,52
-	Actor69: tc02 Neutral 17,71
-	Actor70: tc03 Neutral 19,72
-	Actor71: tc04 Neutral 23,75
-	Actor72: mine Neutral 19,49
-	Actor73: tc01 Neutral 72,110
-	Actor74: t15 Neutral 75,108
-	Actor75: t14 Neutral 72,108
-	Actor76: t01 Neutral 51,108
-	Actor77: tc05 Neutral 52,109
-	Actor78: tc05 Neutral 108,64
-	Actor79: t01 Neutral 101,56
-	Actor80: t12 Neutral 101,54
-	Actor81: t11 Neutral 103,51
-	Actor82: t14 Neutral 100,55
-	Actor83: t15 Neutral 106,56
-	Actor84: tc04 Neutral 109,103
-	Actor85: t15 Neutral 99,110
-
-Waypoints:
-	spawn0: 19,19
-	spawn1: 110,109
-	spawn2: 17,109
-	spawn3: 110,17
-	spawn4: 66,50
-	spawn5: 69,87
-	spawn6: 46,70
-	spawn7: 89,65
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/riverwar2/map.bin b/mods/ra/maps/river-war-2/map.bin
similarity index 100%
rename from mods/ra/maps/riverwar2/map.bin
rename to mods/ra/maps/river-war-2/map.bin
diff --git a/mods/ra/maps/river-war-2/map.uid b/mods/ra/maps/river-war-2/map.uid
new file mode 100644
index 0000000000..ed7ab8faec
--- /dev/null
+++ b/mods/ra/maps/river-war-2/map.uid
@@ -0,0 +1 @@
+fdd526e6102c20e12d126a9a5212a29ac224cd59
\ No newline at end of file
diff --git a/mods/ra/maps/river-war-2/map.yaml b/mods/ra/maps/river-war-2/map.yaml
new file mode 100644
index 0000000000..bfa69ac214
--- /dev/null
+++ b/mods/ra/maps/river-war-2/map.yaml
@@ -0,0 +1,328 @@
+Selectable: True
+
+MapFormat: 3
+
+Title: River War 2
+
+Author: Captain Mel
+
+PlayerCount: 4
+
+Tileset: TEMPERAT
+
+MapSize: 128,128
+
+TopLeft: 32,1
+
+BottomRight: 96,127
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: t01
+		Location: 79,121
+		Owner: Neutral
+	Actor1: tc05
+		Location: 50,22
+		Owner: Neutral
+	Actor2: tc05
+		Location: 44,21
+		Owner: Neutral
+	Actor3: tc05
+		Location: 39,1
+		Owner: Neutral
+	Actor4: tc05
+		Location: 41,3
+		Owner: Neutral
+	Actor5: tc05
+		Location: 46,42
+		Owner: Neutral
+	Actor6: tc05
+		Location: 36,37
+		Owner: Neutral
+	Actor7: tc05
+		Location: 48,64
+		Owner: Neutral
+	Actor8: tc05
+		Location: 53,74
+		Owner: Neutral
+	Actor9: tc05
+		Location: 46,76
+		Owner: Neutral
+	Actor10: tc05
+		Location: 36,78
+		Owner: Neutral
+	Actor11: tc05
+		Location: 36,69
+		Owner: Neutral
+	Actor12: tc05
+		Location: 40,61
+		Owner: Neutral
+	Actor13: tc05
+		Location: 65,64
+		Owner: Neutral
+	Actor14: tc05
+		Location: 58,62
+		Owner: Neutral
+	Actor15: tc05
+		Location: 56,79
+		Owner: Neutral
+	Actor16: tc05
+		Location: 58,81
+		Owner: Neutral
+	Actor17: tc05
+		Location: 47,81
+		Owner: Neutral
+	Actor18: tc05
+		Location: 51,80
+		Owner: Neutral
+	Actor19: tc05
+		Location: 43,78
+		Owner: Neutral
+	Actor20: tc05
+		Location: 32,118
+		Owner: Neutral
+	Actor21: tc05
+		Location: 35,111
+		Owner: Neutral
+	Actor22: tc05
+		Location: 79,123
+		Owner: Neutral
+	Actor23: tc05
+		Location: 88,107
+		Owner: Neutral
+	Actor24: tc05
+		Location: 88,101
+		Owner: Neutral
+	Actor25: tc05
+		Location: 88,98
+		Owner: Neutral
+	Actor26: tc05
+		Location: 83,98
+		Owner: Neutral
+	Actor27: tc05
+		Location: 86,89
+		Owner: Neutral
+	Actor28: tc05
+		Location: 89,69
+		Owner: Neutral
+	Actor29: tc05
+		Location: 84,61
+		Owner: Neutral
+	Actor30: tc05
+		Location: 70,52
+		Owner: Neutral
+	Actor31: tc05
+		Location: 68,20
+		Owner: Neutral
+	Actor32: tc05
+		Location: 91,17
+		Owner: Neutral
+	Actor33: tc05
+		Location: 81,31
+		Owner: Neutral
+	Actor34: tc05
+		Location: 70,29
+		Owner: Neutral
+	Actor35: tc05
+		Location: 76,30
+		Owner: Neutral
+	Actor36: tc02
+		Location: 76,46
+		Owner: Neutral
+	Actor37: tc02
+		Location: 79,54
+		Owner: Neutral
+	Actor38: tc02
+		Location: 87,67
+		Owner: Neutral
+	Actor39: tc02
+		Location: 82,38
+		Owner: Neutral
+	Actor40: tc02
+		Location: 70,39
+		Owner: Neutral
+	Actor41: tc02
+		Location: 70,47
+		Owner: Neutral
+	Actor42: tc02
+		Location: 72,44
+		Owner: Neutral
+	Actor43: tc02
+		Location: 70,42
+		Owner: Neutral
+	Actor44: tc02
+		Location: 57,38
+		Owner: Neutral
+	Actor45: tc02
+		Location: 53,22
+		Owner: Neutral
+	Actor46: tc02
+		Location: 79,26
+		Owner: Neutral
+	Actor47: tc02
+		Location: 81,26
+		Owner: Neutral
+	Actor48: tc02
+		Location: 80,24
+		Owner: Neutral
+	Actor49: tc02
+		Location: 83,25
+		Owner: Neutral
+	Actor50: tc02
+		Location: 82,24
+		Owner: Neutral
+	Actor51: tc02
+		Location: 47,32
+		Owner: Neutral
+	Actor52: tc02
+		Location: 50,29
+		Owner: Neutral
+	Actor53: tc02
+		Location: 50,26
+		Owner: Neutral
+	Actor54: tc02
+		Location: 40,27
+		Owner: Neutral
+	Actor55: mine
+		Location: 69,109
+		Owner: Neutral
+	Actor56: mine
+		Location: 62,108
+		Owner: Neutral
+	Actor57: mine
+		Location: 61,100
+		Owner: Neutral
+	Actor58: mine
+		Location: 51,110
+		Owner: Neutral
+	Actor59: mine
+		Location: 36,30
+		Owner: Neutral
+	Actor60: mine
+		Location: 62,30
+		Owner: Neutral
+	Actor61: mine
+		Location: 66,25
+		Owner: Neutral
+	Actor62: mine
+		Location: 83,19
+		Owner: Neutral
+	Actor63: mine
+		Location: 89,38
+		Owner: Neutral
+	Actor64: mine
+		Location: 89,49
+		Owner: Neutral
+	Actor65: mine
+		Location: 78,91
+		Owner: Neutral
+	Actor66: tc02
+		Location: 88,113
+		Owner: Neutral
+	Actor67: tc02
+		Location: 92,112
+		Owner: Neutral
+	Actor68: tc02
+		Location: 90,116
+		Owner: Neutral
+	Actor69: tc02
+		Location: 94,118
+		Owner: Neutral
+	Actor70: tc02
+		Location: 94,125
+		Owner: Neutral
+	Actor71: tc02
+		Location: 63,43
+		Owner: Neutral
+	Actor72: tc02
+		Location: 64,51
+		Owner: Neutral
+	Actor73: tc02
+		Location: 68,33
+		Owner: Neutral
+	Actor74: tc02
+		Location: 32,17
+		Owner: Neutral
+	Actor75: tc02
+		Location: 35,21
+		Owner: Neutral
+	Actor76: tc02
+		Location: 40,24
+		Owner: Neutral
+	Actor77: tc02
+		Location: 43,49
+		Owner: Neutral
+	Actor78: tc02
+		Location: 49,47
+		Owner: Neutral
+	Actor79: tc02
+		Location: 46,52
+		Owner: Neutral
+	Actor80: tc02
+		Location: 52,55
+		Owner: Neutral
+	Actor81: tc05
+		Location: 46,56
+		Owner: Neutral
+	Actor82: tc05
+		Location: 49,48
+		Owner: Neutral
+	Actor83: tc05
+		Location: 52,56
+		Owner: Neutral
+	Actor84: tc05
+		Location: 52,51
+		Owner: Neutral
+	Actor85: tc05
+		Location: 49,59
+		Owner: Neutral
+	Actor86: tc05
+		Location: 38,42
+		Owner: Neutral
+	Actor87: tc05
+		Location: 55,66
+		Owner: Neutral
+	Actor88: tc05
+		Location: 48,70
+		Owner: Neutral
+	Actor89: tc05
+		Location: 43,72
+		Owner: Neutral
+	Actor90: tc05
+		Location: 93,106
+		Owner: Neutral
+	Actor91: tc05
+		Location: 86,79
+		Owner: Neutral
+	Actor92: tc05
+		Location: 80,75
+		Owner: Neutral
+	Actor93: tc05
+		Location: 84,57
+		Owner: Neutral
+	Actor94: tc05
+		Location: 76,50
+		Owner: Neutral
+	Actor95: tc05
+		Location: 82,50
+		Owner: Neutral
+
+Waypoints:
+	wp0: 58,123
+	spawn1: 64,121
+	wp4: 56,10
+	wp3: 65,10
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/riverwar2/map.uid b/mods/ra/maps/riverwar2/map.uid
deleted file mode 100644
index 1aeb6f3501..0000000000
--- a/mods/ra/maps/riverwar2/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-6505fd53338998e7ed2b6807e485ad306f9e0bf6
\ No newline at end of file
diff --git a/mods/ra/maps/riverwar2/map.yaml b/mods/ra/maps/riverwar2/map.yaml
deleted file mode 100644
index eb2cc770c3..0000000000
--- a/mods/ra/maps/riverwar2/map.yaml
+++ /dev/null
@@ -1,128 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: River War 2
-
-Description:
-
-Author: Captain Mel
-
-PlayerCount: 4
-
-Tileset: TEMPERAT
-
-MapSize: 128,128
-
-TopLeft: 32,1
-
-BottomRight: 96,127
-
-Actors:
-	Actor0: t01 79,121 79,121
-	Actor1: tc05 50,22 50,22
-	Actor2: tc05 44,21 44,21
-	Actor3: tc05 39,1 39,1
-	Actor4: tc05 41,3 41,3
-	Actor5: tc05 46,42 46,42
-	Actor6: tc05 36,37 36,37
-	Actor7: tc05 48,64 48,64
-	Actor8: tc05 53,74 53,74
-	Actor9: tc05 46,76 46,76
-	Actor10: tc05 36,78 36,78
-	Actor11: tc05 36,69 36,69
-	Actor12: tc05 40,61 40,61
-	Actor13: tc05 65,64 65,64
-	Actor14: tc05 58,62 58,62
-	Actor15: tc05 56,79 56,79
-	Actor16: tc05 58,81 58,81
-	Actor17: tc05 47,81 47,81
-	Actor18: tc05 51,80 51,80
-	Actor19: tc05 43,78 43,78
-	Actor20: tc05 32,118 32,118
-	Actor21: tc05 35,111 35,111
-	Actor22: tc05 79,123 79,123
-	Actor23: tc05 88,107 88,107
-	Actor24: tc05 88,101 88,101
-	Actor25: tc05 88,98 88,98
-	Actor26: tc05 83,98 83,98
-	Actor27: tc05 86,89 86,89
-	Actor28: tc05 89,69 89,69
-	Actor29: tc05 84,61 84,61
-	Actor30: tc05 70,52 70,52
-	Actor31: tc05 68,20 68,20
-	Actor32: tc05 91,17 91,17
-	Actor33: tc05 81,31 81,31
-	Actor34: tc05 70,29 70,29
-	Actor35: tc05 76,30 76,30
-	Actor36: tc02 76,46 76,46
-	Actor37: tc02 79,54 79,54
-	Actor38: tc02 87,67 87,67
-	Actor39: tc02 82,38 82,38
-	Actor40: tc02 70,39 70,39
-	Actor41: tc02 70,47 70,47
-	Actor42: tc02 72,44 72,44
-	Actor43: tc02 70,42 70,42
-	Actor44: tc02 57,38 57,38
-	Actor45: tc02 53,22 53,22
-	Actor46: tc02 79,26 79,26
-	Actor47: tc02 81,26 81,26
-	Actor48: tc02 80,24 80,24
-	Actor49: tc02 83,25 83,25
-	Actor50: tc02 82,24 82,24
-	Actor51: tc02 47,32 47,32
-	Actor52: tc02 50,29 50,29
-	Actor53: tc02 50,26 50,26
-	Actor54: tc02 40,27 40,27
-	Actor55: mine 69,109 69,109
-	Actor56: mine 62,108 62,108
-	Actor57: mine 61,100 61,100
-	Actor58: mine 51,110 51,110
-	Actor59: mine 36,30 36,30
-	Actor60: mine 62,30 62,30
-	Actor61: mine 66,25 66,25
-	Actor62: mine 83,19 83,19
-	Actor63: mine 89,38 89,38
-	Actor64: mine 89,49 89,49
-	Actor65: mine 78,91 78,91
-	Actor66: tc02 88,113 88,113
-	Actor67: tc02 92,112 92,112
-	Actor68: tc02 90,116 90,116
-	Actor69: tc02 94,118 94,118
-	Actor70: tc02 94,125 94,125
-	Actor71: tc02 63,43 63,43
-	Actor72: tc02 64,51 64,51
-	Actor73: tc02 68,33 68,33
-	Actor74: tc02 32,17 32,17
-	Actor75: tc02 35,21 35,21
-	Actor76: tc02 40,24 40,24
-	Actor77: tc02 43,49 43,49
-	Actor78: tc02 49,47 49,47
-	Actor79: tc02 46,52 46,52
-	Actor80: tc02 52,55 52,55
-	Actor81: tc05 46,56 46,56
-	Actor82: tc05 49,48 49,48
-	Actor83: tc05 52,56 52,56
-	Actor84: tc05 52,51 52,51
-	Actor85: tc05 49,59 49,59
-	Actor86: tc05 38,42 38,42
-	Actor87: tc05 55,66 55,66
-	Actor88: tc05 48,70 48,70
-	Actor89: tc05 43,72 43,72
-	Actor90: tc05 93,106 93,106
-	Actor91: tc05 86,79 86,79
-	Actor92: tc05 80,75 80,75
-	Actor93: tc05 84,57 84,57
-	Actor94: tc05 76,50 76,50
-	Actor95: tc05 82,50 82,50
-
-Waypoints:
-	wp0: 58,123
-	spawn1: 64,121
-	wp4: 56,10
-	wp3: 65,10
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm01ea/map.uid b/mods/ra/maps/scm01ea/map.uid
deleted file mode 100644
index 91cd0350de..0000000000
--- a/mods/ra/maps/scm01ea/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-531bc417fc7e52621c40ae8dd461f4ce1527423c
\ No newline at end of file
diff --git a/mods/ra/maps/scm01ea/map.yaml b/mods/ra/maps/scm01ea/map.yaml
deleted file mode 100644
index 2fca26fa8b..0000000000
--- a/mods/ra/maps/scm01ea/map.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Coastal Influence
-
-Description:
-
-Author: Westwood Studios
-
-PlayerCount: 8
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 13,18
-
-BottomRight: 107,112
-
-Actors:
-	Actor0: t08 105,86 105,86
-	Actor1: t17 106,85 106,85
-	Actor2: t12 94,82 94,82
-	Actor3: tc03 87,87 87,87
-	Actor4: tc04 91,82 91,82
-	Actor5: tc05 93,83 93,83
-	Actor6: tc05 93,97 93,97
-	Actor7: tc03 32,66 32,66
-	Actor8: t01 14,30 14,30
-	Actor9: tc05 33,31 33,31
-	Actor10: tc02 90,30 90,30
-	Actor11: tc01 91,28 91,28
-	Actor12: tc04 38,69 38,69
-	Actor13: t02 32,84 32,84
-	Actor14: t01 28,89 28,89
-	Actor15: tc04 13,40 13,40
-	Actor16: tc01 18,40 18,40
-	Actor17: tc03 30,45 30,45
-	Actor18: tc05 26,53 26,53
-	Actor19: t03 26,72 26,72
-	Actor20: t12 34,77 34,77
-	Actor21: tc04 45,75 45,75
-	Actor22: tc03 15,20 15,20
-	Actor23: tc02 22,18 22,18
-	Actor24: t07 93,28 93,28
-	Actor25: t10 68,37 68,37
-	Actor26: tc03 97,46 97,46
-	Actor27: t01 47,98 47,98
-	Actor28: tc03 28,99 28,99
-	Actor29: tc04 28,94 28,94
-	Actor30: tc02 18,106 18,106
-	Actor31: tc01 81,107 81,107
-	Actor32: t16 105,109 105,109
-	Actor33: tc02 105,110 105,110
-	Actor34: tc04 13,96 13,96
-	Actor35: tc04 15,73 15,73
-	Actor36: tc01 16,74 16,74
-	Actor37: t16 16,72 16,72
-	Actor38: t16 61,54 61,54
-	Actor39: tc02 84,54 84,54
-	Actor40: tc04 104,53 104,53
-	Actor41: tc04 14,86 14,86
-	Actor42: tc01 13,88 13,88
-	Actor43: tc04 15,34 15,34
-	Actor44: tc05 84,40 84,40
-	Actor45: tc04 80,48 80,48
-	Actor46: tc03 87,45 87,45
-	Actor47: tc02 78,42 78,42
-	Actor48: tc04 25,46 25,46
-	Actor49: tc05 33,46 33,46
-	Actor50: tc04 43,62 43,62
-	Actor51: tc05 44,63 44,63
-	Actor52: tc03 41,64 41,64
-	Actor53: tc05 104,71 104,71
-	Actor54: t01 106,73 106,73
-	Actor55: t03 104,72 104,72
-	Actor56: t12 50,78 50,78
-	Actor57: tc02 48,79 48,79
-	Actor58: tc02 103,25 103,25
-	Actor59: tc01 96,17 96,17
-	Actor60: tc03 85,95 85,95
-	Actor61: tc04 87,73 87,73
-	Actor62: t01 78,64 78,64
-	Actor63: t15 73,66 73,66
-	Actor64: tc01 67,61 67,61
-	Actor65: t01 21,45 21,45
-	Actor66: mine 50,94 50,94
-	Actor67: mine 102,57 102,57
-	Actor68: mine 97,107 97,107
-	Actor69: mine 100,21 100,21
-	Actor70: mine 37,22 37,22
-	Actor71: mine 21,70 21,70
-	Actor72: mine 19,90 19,90
-	Actor73: mine 53,55 53,55
-	Actor74: t01 54,24 54,24
-	Actor75: t03 78,21 78,21
-	Actor76: tc01 55,35 55,35
-
-Waypoints:
-	spawn0: 24,26
-	spawn1: 101,35
-	spawn2: 100,92
-	spawn3: 25,102
-	spawn4: 61,83
-	spawn5: 63,44
-	spawn6: 19,52
-	spawn7: 95,65
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm02ea/map.uid b/mods/ra/maps/scm02ea/map.uid
deleted file mode 100644
index 02084555eb..0000000000
--- a/mods/ra/maps/scm02ea/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-d249e36837b7f34cd57de3ceab7036c334e2e0a4
\ No newline at end of file
diff --git a/mods/ra/maps/scm02ea/map.yaml b/mods/ra/maps/scm02ea/map.yaml
deleted file mode 100644
index f37a159e64..0000000000
--- a/mods/ra/maps/scm02ea/map.yaml
+++ /dev/null
@@ -1,217 +0,0 @@
-Selectable: True
-
-MapFormat: 2
-
-Title: Middle Mayhem
-
-Description:
-
-Author: Westwood Studios
-
-PlayerCount: 4
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 27,26
-
-BottomRight: 102,91
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		Palette:
-		Race: allies
-		OwnsWorld: True
-		NonCombatant: True
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-
-Actors:
-	ActorReference@Actor0:
-		Id: Actor0
-		Type: tc05
-		Location: 62,58
-		Owner: Neutral
-	ActorReference@Actor1:
-		Id: Actor1
-		Type: tc04
-		Location: 64,63
-		Owner: Neutral
-	ActorReference@Actor2:
-		Id: Actor2
-		Type: tc03
-		Location: 73,60
-		Owner: Neutral
-	ActorReference@Actor3:
-		Id: Actor3
-		Type: tc03
-		Location: 55,48
-		Owner: Neutral
-	ActorReference@Actor4:
-		Id: Actor4
-		Type: tc01
-		Location: 58,51
-		Owner: Neutral
-	ActorReference@Actor5:
-		Id: Actor5
-		Type: tc01
-		Location: 54,68
-		Owner: Neutral
-	ActorReference@Actor6:
-		Id: Actor6
-		Type: t17
-		Location: 60,68
-		Owner: Neutral
-	ActorReference@Actor7:
-		Id: Actor7
-		Type: tc02
-		Location: 48,57
-		Owner: Neutral
-	ActorReference@Actor8:
-		Id: Actor8
-		Type: tc05
-		Location: 68,63
-		Owner: Neutral
-	ActorReference@Actor9:
-		Id: Actor9
-		Type: t16
-		Location: 71,63
-		Owner: Neutral
-	ActorReference@Actor10:
-		Id: Actor10
-		Type: t16
-		Location: 70,55
-		Owner: Neutral
-	ActorReference@Actor11:
-		Id: Actor11
-		Type: tc01
-		Location: 83,57
-		Owner: Neutral
-	ActorReference@Actor12:
-		Id: Actor12
-		Type: tc02
-		Location: 62,54
-		Owner: Neutral
-	ActorReference@Actor13:
-		Id: Actor13
-		Type: t08
-		Location: 62,56
-		Owner: Neutral
-	ActorReference@Actor14:
-		Id: Actor14
-		Type: t01
-		Location: 49,80
-		Owner: Neutral
-	ActorReference@Actor15:
-		Id: Actor15
-		Type: tc04
-		Location: 50,81
-		Owner: Neutral
-	ActorReference@Actor16:
-		Id: Actor16
-		Type: t16
-		Location: 53,82
-		Owner: Neutral
-	ActorReference@Actor17:
-		Id: Actor17
-		Type: tc02
-		Location: 42,79
-		Owner: Neutral
-	ActorReference@Actor18:
-		Id: Actor18
-		Type: tc03
-		Location: 27,26
-		Owner: Neutral
-	ActorReference@Actor19:
-		Id: Actor19
-		Type: t01
-		Location: 29,48
-		Owner: Neutral
-	ActorReference@Actor20:
-		Id: Actor20
-		Type: t02
-		Location: 31,50
-		Owner: Neutral
-	ActorReference@Actor21:
-		Id: Actor21
-		Type: t03
-		Location: 32,59
-		Owner: Neutral
-	ActorReference@Actor22:
-		Id: Actor22
-		Type: tc05
-		Location: 56,88
-		Owner: Neutral
-	ActorReference@Actor23:
-		Id: Actor23
-		Type: tc03
-		Location: 54,89
-		Owner: Neutral
-	ActorReference@Actor24:
-		Id: Actor24
-		Type: t16
-		Location: 56,89
-		Owner: Neutral
-	ActorReference@Actor25:
-		Id: Actor25
-		Type: t15
-		Location: 52,89
-		Owner: Neutral
-	ActorReference@Actor26:
-		Id: Actor26
-		Type: t14
-		Location: 64,78
-		Owner: Neutral
-	ActorReference@Actor27:
-		Id: Actor27
-		Type: tc01
-		Location: 27,44
-		Owner: Neutral
-	ActorReference@Actor28:
-		Id: Actor28
-		Type: tc01
-		Location: 45,39
-		Owner: Neutral
-	ActorReference@Actor29:
-		Id: Actor29
-		Type: t17
-		Location: 76,26
-		Owner: Neutral
-	ActorReference@Actor30:
-		Id: Actor30
-		Type: mine
-		Location: 68,53
-		Owner: Neutral
-	ActorReference@Actor31:
-		Id: Actor31
-		Type: mine
-		Location: 54,57
-		Owner: Neutral
-	ActorReference@Actor32:
-		Id: Actor32
-		Type: mine
-		Location: 53,65
-		Owner: Neutral
-	ActorReference@Actor33:
-		Id: Actor33
-		Type: mine
-		Location: 65,68
-		Owner: Neutral
-	ActorReference@Actor34:
-		Id: Actor34
-		Type: mine
-		Location: 80,61
-		Owner: Neutral
-
-Waypoints:
-	spawn0: 34,84
-	spawn1: 35,34
-	wp0: 95,34
-	wp1: 94,83
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm03ea/map.uid b/mods/ra/maps/scm03ea/map.uid
deleted file mode 100644
index c78943a49a..0000000000
--- a/mods/ra/maps/scm03ea/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-4472d5d4fd2a9259bff5cbeb15d26c61922a54b5
\ No newline at end of file
diff --git a/mods/ra/maps/scm03ea/map.yaml b/mods/ra/maps/scm03ea/map.yaml
deleted file mode 100644
index a259ee30b8..0000000000
--- a/mods/ra/maps/scm03ea/map.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Equal Opportunity
-
-Description:
-
-Author: Westwood Studios
-
-PlayerCount: 5
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 28,26
-
-BottomRight: 99,97
-
-Actors:
-	Actor0: sbag 61,96 61,96
-	Actor1: tc03 38,66 38,66
-	Actor2: tc03 55,35 55,35
-	Actor3: tc02 45,37 45,37
-	Actor4: tc03 71,71 71,71
-	Actor5: tc02 72,72 72,72
-	Actor6: t01 61,62 61,62
-	Actor7: t03 67,77 67,77
-	Actor8: t06 53,87 53,87
-	Actor9: t10 62,70 62,70
-	Actor10: t02 66,51 66,51
-	Actor11: t05 71,57 71,57
-	Actor12: tc01 76,47 76,47
-	Actor13: t07 81,53 81,53
-	Actor14: t12 73,54 73,54
-	Actor15: t06 69,56 69,56
-	Actor16: t11 39,84 39,84
-	Actor17: t14 77,32 77,32
-	Actor18: t12 69,43 69,43
-	Actor19: tc02 62,52 62,52
-	Actor20: tc03 74,86 74,86
-	Actor21: tc05 76,62 76,62
-	Actor22: tc04 48,62 48,62
-	Actor23: mine 40,45 40,45
-	Actor24: mine 89,85 89,85
-	Actor25: mine 75,64 75,64
-	Actor26: mine 46,64 46,64
-	Actor27: mine 87,37 87,37
-	Actor28: mine 49,87 49,87
-
-Waypoints:
-	spawn0: 46,43
-	spawn1: 80,80
-	spawn2: 77,39
-	spawn3: 47,81
-	spawn4: 47,81
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm09ea/map.uid b/mods/ra/maps/scm09ea/map.uid
deleted file mode 100644
index d19a9488ca..0000000000
--- a/mods/ra/maps/scm09ea/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-4c986efc2890eee29599b38a01126034d4e3b26f
\ No newline at end of file
diff --git a/mods/ra/maps/scm09ea/map.yaml b/mods/ra/maps/scm09ea/map.yaml
deleted file mode 100644
index 46d2df062d..0000000000
--- a/mods/ra/maps/scm09ea/map.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: North by Northwest
-
-Description:
-
-Author: Westwood Studios
-
-PlayerCount: 8
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 16,15
-
-BottomRight: 112,111
-
-Actors:
-	Actor0: mine 19,107 19,107
-	Actor1: mine 108,107 108,107
-	Actor2: mine 108,18 108,18
-	Actor3: mine 19,18 19,18
-	Actor4: tc04 37,61 37,61
-	Actor5: tc03 34,62 34,62
-	Actor6: tc03 63,87 63,87
-	Actor7: tc02 63,90 63,90
-	Actor8: tc02 88,62 88,62
-	Actor9: tc01 92,61 92,61
-	Actor10: t17 91,62 91,62
-	Actor11: tc01 63,37 63,37
-	Actor12: t16 63,34 63,34
-	Actor13: tc02 63,32 63,32
-	Actor14: t17 64,35 64,35
-	Actor15: tc04 32,88 32,88
-	Actor16: tc05 34,91 34,91
-	Actor17: tc03 31,93 31,93
-	Actor18: tc02 31,30 31,30
-	Actor19: tc01 35,31 35,31
-	Actor20: t14 32,33 32,33
-	Actor21: t13 35,34 35,34
-	Actor22: tc02 94,29 94,29
-	Actor23: tc03 90,32 90,32
-	Actor24: tc04 92,33 92,33
-	Actor25: tc04 101,22 101,22
-	Actor26: t16 100,24 100,24
-	Actor27: tc02 102,101 102,101
-	Actor28: t17 101,99 101,99
-	Actor29: tc05 93,93 93,93
-	Actor30: tc04 91,89 91,89
-	Actor31: tc03 94,91 94,91
-	Actor32: tc03 24,101 24,101
-	Actor33: tc02 24,23 24,23
-	Actor34: t17 26,24 26,24
-	Actor35: mine 71,63 71,63
-	Actor36: mine 64,56 64,56
-	Actor37: mine 57,63 57,63
-	Actor38: mine 64,70 64,70
-	Actor39: t07 42,40 42,40
-	Actor40: t07 85,40 85,40
-	Actor41: t06 85,83 85,83
-	Actor42: t01 42,83 42,83
-	Actor43: t02 52,58 52,58
-	Actor44: t03 58,67 58,67
-	Actor45: t05 69,55 69,55
-	Actor46: t06 75,61 75,61
-	Actor47: t07 60,52 60,52
-	Actor48: t08 53,65 53,65
-	Actor49: t10 60,73 60,73
-	Actor50: t12 70,66 70,66
-	Actor51: t14 69,58 69,58
-	Actor52: t16 50,61 50,61
-	Actor53: t16 68,71 68,71
-	Actor54: tc02 35,86 35,86
-	Actor55: t17 39,89 39,89
-	Actor56: tc01 90,86 90,86
-	Actor57: t16 87,89 87,89
-	Actor58: t15 87,34 87,34
-	Actor59: t14 91,38 91,38
-	Actor60: t14 28,27 28,27
-	Actor61: t16 29,96 29,96
-	Actor62: tc01 98,95 98,95
-	Actor63: tc01 95,31 95,31
-	Actor64: tc01 50,42 50,42
-	Actor65: t17 44,51 44,51
-	Actor66: t16 45,46 45,46
-	Actor67: t15 50,47 50,47
-	Actor68: t12 46,79 46,79
-	Actor69: tc04 49,81 49,81
-	Actor70: tc03 45,75 45,75
-	Actor71: t17 42,70 42,70
-	Actor72: tc03 82,75 82,75
-	Actor73: tc05 75,80 75,80
-	Actor74: tc03 83,49 83,49
-	Actor75: tc01 72,40 72,40
-	Actor76: t16 76,45 76,45
-	Actor77: t14 79,42 79,42
-
-Waypoints:
-	spawn0: 47,23
-	spawn1: 80,102
-	spawn2: 103,46
-	spawn3: 24,79
-	spawn4: 24,46
-	spawn5: 103,79
-	spawn6: 79,23
-	spawn7: 47,102
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm10ea/map.uid b/mods/ra/maps/scm10ea/map.uid
deleted file mode 100644
index e190dbc3ab..0000000000
--- a/mods/ra/maps/scm10ea/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-276392458aaf0409db0cbed2d98e58a69be67b3d
\ No newline at end of file
diff --git a/mods/ra/maps/scm10ea/map.yaml b/mods/ra/maps/scm10ea/map.yaml
deleted file mode 100644
index a5fa3080dc..0000000000
--- a/mods/ra/maps/scm10ea/map.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: First Come, First Served
-
-Description:
-
-Author: Westwood Studios
-
-PlayerCount: 4
-
-Tileset: TEMPERAT
-
-MapSize: 128,128
-
-TopLeft: 22,22
-
-BottomRight: 106,106
-
-Actors:
-	Actor0: mine 40,92 40,92
-	Actor1: mine 89,35 89,35
-	Actor2: mine 64,64 64,64
-	Actor3: tc05 43,87 43,87
-	Actor4: tc04 42,75 42,75
-	Actor5: tc02 57,75 57,75
-	Actor6: tc02 62,86 62,86
-	Actor7: tc04 64,38 64,38
-	Actor8: tc04 84,29 84,29
-	Actor9: tc02 96,40 96,40
-	Actor10: tc03 66,79 66,79
-	Actor11: tc02 54,88 54,88
-	Actor12: tc01 41,80 41,80
-	Actor13: tc04 52,29 52,29
-	Actor14: tc03 94,30 94,30
-	Actor15: tc05 39,95 39,95
-	Actor16: t17 35,87 35,87
-	Actor17: tc05 68,50 68,50
-	Actor18: mine 74,45 74,45
-	Actor19: mine 52,81 52,81
-	Actor20: tc03 86,94 86,94
-	Actor21: tc04 32,29 32,29
-	Actor22: tc01 42,57 42,57
-	Actor23: tc03 83,45 83,45
-	Actor24: tc03 89,79 89,79
-	Actor25: tc01 81,78 81,78
-	Actor26: t16 37,45 37,45
-	Actor27: tc04 64,30 64,30
-	Actor28: tc01 77,39 77,39
-	Actor29: t16 73,54 73,54
-	Actor30: t16 37,90 37,90
-
-Waypoints:
-	spawn0: 40,67
-	spawn1: 89,61
-	spawn2: 54,39
-	spawn3: 70,89
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm11ea/map.uid b/mods/ra/maps/scm11ea/map.uid
deleted file mode 100644
index 8d966de1ca..0000000000
--- a/mods/ra/maps/scm11ea/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-4104acf0819ec740a1073976704a35e74014f4de
\ No newline at end of file
diff --git a/mods/ra/maps/scm11ea/map.yaml b/mods/ra/maps/scm11ea/map.yaml
deleted file mode 100644
index c0e36aa11b..0000000000
--- a/mods/ra/maps/scm11ea/map.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Island Hoppers
-
-Description:
-
-Author: Westwood Studios
-
-PlayerCount: 4
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 11,19
-
-BottomRight: 107,115
-
-Actors:
-	Actor0: t01 62,77 62,77
-	Actor1: tc01 61,80 61,80
-	Actor2: t08 59,76 59,76
-	Actor3: tc05 53,99 53,99
-	Actor4: tc05 18,68 18,68
-	Actor5: tc05 59,34 59,34
-	Actor6: tc04 98,68 98,68
-	Actor7: tc04 39,24 39,24
-	Actor8: tc04 80,105 80,105
-	Actor9: tc03 41,105 41,105
-	Actor10: tc02 18,80 18,80
-	Actor11: tc02 57,23 57,23
-	Actor12: tc01 98,81 98,81
-	Actor13: t17 97,50 97,50
-	Actor14: t16 67,101 67,101
-	Actor15: t15 31,103 31,103
-	Actor16: t14 21,48 21,48
-	Actor17: t11 62,26 62,26
-	Actor18: t10 93,66 93,66
-	Actor19: mine 44,59 44,59
-	Actor20: mine 87,48 87,48
-	Actor21: mine 84,89 84,89
-	Actor22: mine 45,86 45,86
-	Actor23: mine 70,26 70,26
-	Actor24: mine 66,103 66,103
-	Actor25: mine 46,102 46,102
-	Actor26: mine 50,31 50,31
-
-Waypoints:
-	spawn0: 41,53
-	spawn1: 79,84
-	spawn2: 81,50
-	spawn3: 40,84
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/scm12ea/map.uid b/mods/ra/maps/scm12ea/map.uid
deleted file mode 100644
index e3ad678b4a..0000000000
--- a/mods/ra/maps/scm12ea/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-84f76e69d4957aae51a850d59eb5d4f6ba11e484
\ No newline at end of file
diff --git a/mods/ra/maps/scm12ea/map.yaml b/mods/ra/maps/scm12ea/map.yaml
deleted file mode 100644
index 265402fb3e..0000000000
--- a/mods/ra/maps/scm12ea/map.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Raraku
-
-Description:
-
-Author: Westwood Studios
-
-PlayerCount: 8
-
-Tileset: TEMPERAT
-
-MapSize: 128,128
-
-TopLeft: 15,15
-
-BottomRight: 111,111
-
-Actors:
-	Actor0: tc04 57,17 57,17
-	Actor1: tc05 61,22 61,22
-	Actor2: tc03 55,25 55,25
-	Actor3: tc02 65,16 65,16
-	Actor4: t17 62,18 62,18
-	Actor5: tc04 51,14 51,14
-	Actor6: tc03 68,29 68,29
-	Actor7: tc01 58,29 58,29
-	Actor8: tc05 50,38 50,38
-	Actor9: tc02 45,30 45,30
-	Actor10: tc05 97,16 97,16
-	Actor11: tc04 96,15 96,15
-	Actor12: tc03 96,24 96,24
-	Actor13: tc05 26,30 26,30
-	Actor14: tc04 15,28 15,28
-	Actor15: tc05 16,29 16,29
-	Actor16: tc03 25,32 25,32
-	Actor17: tc04 23,92 23,92
-	Actor18: tc05 24,93 24,93
-	Actor19: tc03 96,90 96,90
-	Actor20: tc05 96,76 96,76
-	Actor21: tc01 86,77 86,77
-	Actor22: t16 90,80 90,80
-	Actor23: tc02 37,86 37,86
-	Actor24: t17 80,56 80,56
-	Actor25: tc02 76,66 76,66
-	Actor26: tc04 56,61 56,61
-	Actor27: tc05 52,59 52,59
-	Actor28: tc03 30,49 30,49
-	Actor29: tc02 25,69 25,69
-	Actor30: t16 34,72 34,72
-	Actor31: tc03 42,54 42,54
-	Actor32: mine 73,79 73,79
-	Actor33: mine 49,34 49,34
-	Actor34: mine 105,22 105,22
-	Actor35: mine 101,80 101,80
-	Actor36: mine 43,107 43,107
-	Actor37: mine 24,47 24,47
-	Actor38: tc01 84,90 84,90
-	Actor39: t16 83,91 83,91
-	Actor40: tc02 18,101 18,101
-	Actor41: tc01 17,107 17,107
-	Actor42: t16 15,95 15,95
-	Actor43: tc04 17,16 17,16
-	Actor44: tc01 42,28 42,28
-	Actor45: tc05 79,31 79,31
-	Actor46: tc03 109,15 109,15
-	Actor47: tc02 107,15 107,15
-	Actor48: tc02 105,33 105,33
-	Actor49: tc02 104,32 104,32
-	Actor50: tc04 45,85 45,85
-	Actor51: tc05 75,97 75,97
-	Actor52: t16 76,99 76,99
-	Actor53: tc01 88,89 88,89
-	Actor54: tc02 35,91 35,91
-	Actor55: tc01 39,31 39,31
-	Actor56: tc03 14,59 14,59
-	Actor57: tc02 15,57 15,57
-	Actor58: tc01 21,14 21,14
-	Actor59: mine 74,62 74,62
-	Actor60: mine 43,21 43,21
-	Actor61: tc02 36,109 36,109
-	Actor62: tc01 109,44 109,44
-	Actor63: tc02 98,38 98,38
-	Actor64: tc03 72,69 72,69
-	Actor65: tc01 89,14 89,14
-	Actor66: tc04 81,47 81,47
-	Actor67: tc01 100,94 100,94
-	Actor68: tc02 102,86 102,86
-	Actor69: tc05 89,54 89,54
-	Actor70: tc01 89,53 89,53
-
-Waypoints:
-	spawn0: 26,102
-	spawn1: 88,24
-	spawn2: 90,97
-	spawn3: 26,23
-	spawn4: 63,88
-	spawn5: 59,53
-	spawn6: 29,61
-	spawn7: 104,51
-
-Smudges:
-
-Rules:
-
diff --git a/mods/ra/maps/snowyridge/map.uid b/mods/ra/maps/snowyridge/map.uid
index 14808fb289..2f30fa389b 100644
--- a/mods/ra/maps/snowyridge/map.uid
+++ b/mods/ra/maps/snowyridge/map.uid
@@ -1 +1 @@
-c3a9e0b14a9bf72b98b739f1f415f84db934a1d0
\ No newline at end of file
+7952c56ae8b08bf5149b3bfe053404333e69018b
\ No newline at end of file
diff --git a/mods/ra/maps/snowyridge/map.yaml b/mods/ra/maps/snowyridge/map.yaml
index 552e130e5e..b7d8e3763f 100644
--- a/mods/ra/maps/snowyridge/map.yaml
+++ b/mods/ra/maps/snowyridge/map.yaml
@@ -1,199 +1,137 @@
-Selectable: True
-
-MapFormat: 2
-
-Title: Snowy Ridge
-
-Description: Free-for-all deathmatch in the snow
-
-Author: Chris Forbes
-
-PlayerCount: 3
-
-Tileset: SNOW
-
-MapSize: 72,72
-
-TopLeft: 14,19
-
-BottomRight: 60,60
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		Palette: neutral
-		Race: allies
-		OwnsWorld: True
-		NonCombatant: True
-
-Actors:
-	ActorReference@Actor0:
-		Id: Actor0
-		Type: tc02
-		Location: 25,39
-		Owner: Neutral
-	ActorReference@Actor1:
-		Id: Actor1
-		Type: tc01
-		Location: 26,40
-		Owner: Neutral
-	ActorReference@Actor2:
-		Id: Actor2
-		Type: tc01
-		Location: 27,39
-		Owner: Neutral
-	ActorReference@Actor3:
-		Id: Actor3
-		Type: tc05
-		Location: 30,40
-		Owner: Neutral
-	ActorReference@Actor4:
-		Id: Actor4
-		Type: tc04
-		Location: 37,39
-		Owner: Neutral
-	ActorReference@Actor5:
-		Id: Actor5
-		Type: tc04
-		Location: 39,37
-		Owner: Neutral
-	ActorReference@Actor6:
-		Id: Actor6
-		Type: tc04
-		Location: 41,35
-		Owner: Neutral
-	ActorReference@Actor7:
-		Id: Actor7
-		Type: t01
-		Location: 42,33
-		Owner: Neutral
-	ActorReference@Actor8:
-		Id: Actor8
-		Type: t01
-		Location: 50,24
-		Owner: Neutral
-	ActorReference@Actor9:
-		Id: Actor9
-		Type: t05
-		Location: 49,25
-		Owner: Neutral
-	ActorReference@Actor10:
-		Id: Actor10
-		Type: t08
-		Location: 45,29
-		Owner: Neutral
-	ActorReference@Actor11:
-		Id: Actor11
-		Type: tc04
-		Location: 43,49
-		Owner: Neutral
-	ActorReference@Actor12:
-		Id: Actor12
-		Type: tc01
-		Location: 45,51
-		Owner: Neutral
-	ActorReference@Actor13:
-		Id: Actor13
-		Type: tc01
-		Location: 48,52
-		Owner: Neutral
-	ActorReference@Actor14:
-		Id: Actor14
-		Type: t03
-		Location: 40,42
-		Owner: Neutral
-	ActorReference@Actor15:
-		Id: Actor15
-		Type: t03
-		Location: 35,40
-		Owner: Neutral
-	ActorReference@Actor16:
-		Id: Actor16
-		Type: tc04
-		Location: 57,57
-		Owner: Neutral
-	ActorReference@Actor17:
-		Id: Actor17
-		Type: tc02
-		Location: 58,19
-		Owner: Neutral
-	ActorReference@Actor18:
-		Id: Actor18
-		Type: tc01
-		Location: 21,19
-		Owner: Neutral
-	ActorReference@Actor19:
-		Id: Actor19
-		Type: tc02
-		Location: 19,20
-		Owner: Neutral
-	ActorReference@Actor20:
-		Id: Actor20
-		Type: t08
-		Location: 16,22
-		Owner: Neutral
-	ActorReference@Actor21:
-		Id: Actor21
-		Type: v12
-		Location: 18,22
-		Owner: Neutral
-	ActorReference@Actor22:
-		Id: Actor22
-		Type: t05
-		Location: 18,55
-		Owner: Neutral
-	ActorReference@Actor23:
-		Id: Actor23
-		Type: tc02
-		Location: 16,54
-		Owner: Neutral
-	ActorReference@Actor24:
-		Id: Actor24
-		Type: t16
-		Location: 29,39
-		Owner: Neutral
-	ActorReference@Actor25:
-		Id: Actor25
-		Type: t16
-		Location: 21,56
-		Owner: Neutral
-	ActorReference@Actor26:
-		Id: Actor26
-		Type: mine
-		Location: 33,45
-		Owner: Neutral
-	ActorReference@Actor27:
-		Id: Actor27
-		Type: mine
-		Location: 36,45
-		Owner: Neutral
-	ActorReference@Actor28:
-		Id: Actor28
-		Type: mine
-		Location: 44,43
-		Owner: Neutral
-	ActorReference@Actor29:
-		Id: Actor29
-		Type: mine
-		Location: 45,40
-		Owner: Neutral
-	ActorReference@Actor30:
-		Id: Actor30
-		Type: mine
-		Location: 37,34
-		Owner: Neutral
-	ActorReference@Actor31:
-		Id: Actor31
-		Type: mine
-		Location: 35,37
-		Owner: Neutral
-
-Waypoints:
-	wp0: 29,24
-	wp1: 56,41
-	wp2: 26,54
-
-Smudges:
-
-Rules:
-
+Selectable: True
+
+MapFormat: 3
+
+Title: Snowy Ridge
+
+Description: Free-for-all deathmatch in the snow
+
+Author: Chris Forbes
+
+PlayerCount: 3
+
+Tileset: SNOW
+
+MapSize: 72,72
+
+TopLeft: 14,19
+
+BottomRight: 60,60
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette: neutral
+		Race: allies
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: tc02
+		Location: 25,39
+		Owner: Neutral
+	Actor1: tc01
+		Location: 26,40
+		Owner: Neutral
+	Actor2: tc01
+		Location: 27,39
+		Owner: Neutral
+	Actor3: tc05
+		Location: 30,40
+		Owner: Neutral
+	Actor4: tc04
+		Location: 37,39
+		Owner: Neutral
+	Actor5: tc04
+		Location: 39,37
+		Owner: Neutral
+	Actor6: tc04
+		Location: 41,35
+		Owner: Neutral
+	Actor7: t01
+		Location: 42,33
+		Owner: Neutral
+	Actor8: t01
+		Location: 50,24
+		Owner: Neutral
+	Actor9: t05
+		Location: 49,25
+		Owner: Neutral
+	Actor10: t08
+		Location: 45,29
+		Owner: Neutral
+	Actor11: tc04
+		Location: 43,49
+		Owner: Neutral
+	Actor12: tc01
+		Location: 45,51
+		Owner: Neutral
+	Actor13: tc01
+		Location: 48,52
+		Owner: Neutral
+	Actor14: t03
+		Location: 40,42
+		Owner: Neutral
+	Actor15: t03
+		Location: 35,40
+		Owner: Neutral
+	Actor16: tc04
+		Location: 57,57
+		Owner: Neutral
+	Actor17: tc02
+		Location: 58,19
+		Owner: Neutral
+	Actor18: tc01
+		Location: 21,19
+		Owner: Neutral
+	Actor19: tc02
+		Location: 19,20
+		Owner: Neutral
+	Actor20: t08
+		Location: 16,22
+		Owner: Neutral
+	Actor21: v12
+		Location: 18,22
+		Owner: Neutral
+	Actor22: t05
+		Location: 18,55
+		Owner: Neutral
+	Actor23: tc02
+		Location: 16,54
+		Owner: Neutral
+	Actor24: t16
+		Location: 29,39
+		Owner: Neutral
+	Actor25: t16
+		Location: 21,56
+		Owner: Neutral
+	Actor26: mine
+		Location: 33,45
+		Owner: Neutral
+	Actor27: mine
+		Location: 36,45
+		Owner: Neutral
+	Actor28: mine
+		Location: 44,43
+		Owner: Neutral
+	Actor29: mine
+		Location: 45,40
+		Owner: Neutral
+	Actor30: mine
+		Location: 37,34
+		Owner: Neutral
+	Actor31: mine
+		Location: 35,37
+		Owner: Neutral
+
+Waypoints:
+	wp0: 29,24
+	wp1: 56,41
+	wp2: 26,54
+
+Smudges:
+
+Rules:
+