diff --git a/light/flint_and_steel.arc b/light/flint_and_steel.arc
index 6f561196a..a38e1db88 100644
--- a/light/flint_and_steel.arc
+++ b/light/flint_and_steel.arc
@@ -7,7 +7,6 @@ food 500
 weight 300
 value 2000
 material 66
-magicmap grey
 name_pl flints and steels
 client_type 1101
 nrof 1
diff --git a/light/flint_and_steel.face b/light/flint_and_steel.face
new file mode 100644
index 000000000..3939fffd8
--- /dev/null
+++ b/light/flint_and_steel.face
@@ -0,0 +1,3 @@
+face flint_and_steel.111
+magicmap grey
+end
diff --git a/light/lantern.arc b/light/lantern.arc
index 33c03a494..e85d1a9a4 100644
--- a/light/lantern.arc
+++ b/light/lantern.arc
@@ -10,7 +10,6 @@ type 82
 nrof 1
 glow_radius 0
 is_lightable 1
-magicmap brown
 name_pl lanterns
 client_type 1102
 end
@@ -27,7 +26,6 @@ weight 1500
 speed 0.01
 glow_radius 5
 is_lightable 1
-magicmap orange
 name_pl lanterns
 client_type 1102
 end
diff --git a/light/lantern.face b/light/lantern.face
new file mode 100644
index 000000000..85019ee19
--- /dev/null
+++ b/light/lantern.face
@@ -0,0 +1,3 @@
+face lantern.111
+magicmap orange
+end
diff --git a/light/lantern2.arc b/light/lantern2.arc
index 96bb0bb84..5a61171af 100644
--- a/light/lantern2.arc
+++ b/light/lantern2.arc
@@ -10,7 +10,6 @@ type 82
 nrof 1
 glow_radius 0
 is_lightable 1
-magicmap brown
 name_pl lanterns
 client_type 1102
 end
@@ -27,7 +26,6 @@ weight 2500
 speed 0.02
 glow_radius 8
 is_lightable 1
-magicmap orange
 name_pl lanterns
 client_type 1102
 end
diff --git a/light/lantern2.face b/light/lantern2.face
new file mode 100644
index 000000000..60eec3d15
--- /dev/null
+++ b/light/lantern2.face
@@ -0,0 +1,3 @@
+face lantern2.111
+magicmap orange
+end
diff --git a/light/lantern2_off.face b/light/lantern2_off.face
new file mode 100644
index 000000000..6644cd0fd
--- /dev/null
+++ b/light/lantern2_off.face
@@ -0,0 +1,3 @@
+face lantern2_off.111
+magicmap brown
+end
diff --git a/light/lantern_off.face b/light/lantern_off.face
new file mode 100644
index 000000000..6232b0b99
--- /dev/null
+++ b/light/lantern_off.face
@@ -0,0 +1,3 @@
+face lantern_off.111
+magicmap brown
+end
diff --git a/light/light_bulb.arc b/light/light_bulb.arc
index 4044a3e61..02cd61d26 100644
--- a/light/light_bulb.arc
+++ b/light/light_bulb.arc
@@ -3,26 +3,22 @@ name light
 face light_bulb_1.111
 glow_radius 1
 invisible 1
-magicmap yellow
 end
 Object light2
 name light
 face light_bulb_2.111
 glow_radius 2
 invisible 1
-magicmap yellow
 end
 Object light3
 name light
 face light_bulb_3.111
 glow_radius 3
 invisible 1
-magicmap yellow
 end
 Object light4
 name light
 face light_bulb_4.111
 glow_radius 4
 invisible 1
-magicmap yellow
 end
diff --git a/light/light_bulb_1.face b/light/light_bulb_1.face
new file mode 100644
index 000000000..8f6aeafc8
--- /dev/null
+++ b/light/light_bulb_1.face
@@ -0,0 +1,3 @@
+face light_bulb_1.111
+magicmap yellow
+end
diff --git a/light/light_bulb_2.face b/light/light_bulb_2.face
new file mode 100644
index 000000000..32cc3077f
--- /dev/null
+++ b/light/light_bulb_2.face
@@ -0,0 +1,3 @@
+face light_bulb_2.111
+magicmap yellow
+end
diff --git a/light/light_bulb_3.face b/light/light_bulb_3.face
new file mode 100644
index 000000000..ce2cfc4d6
--- /dev/null
+++ b/light/light_bulb_3.face
@@ -0,0 +1,3 @@
+face light_bulb_3.111
+magicmap yellow
+end
diff --git a/light/light_bulb_4.face b/light/light_bulb_4.face
new file mode 100644
index 000000000..4d4d1c6df
--- /dev/null
+++ b/light/light_bulb_4.face
@@ -0,0 +1,3 @@
+face light_bulb_4.111
+magicmap yellow
+end
diff --git a/light/torch.arc b/light/torch.arc
index 9de69c328..81b74576d 100644
--- a/light/torch.arc
+++ b/light/torch.arc
@@ -10,7 +10,6 @@ changing 1
 nrof 1
 glow_radius 0
 is_lightable 1
-magicmap brown
 name_pl torches
 client_type 1102
 end
@@ -31,7 +30,6 @@ weight 500
 speed 0.15
 client_anim_random 1
 glow_radius 3
-magicmap orange
 name_pl torches
 client_type 1102
 end
diff --git a/light/torch_lit1.face b/light/torch_lit1.face
new file mode 100644
index 000000000..e1d59231d
--- /dev/null
+++ b/light/torch_lit1.face
@@ -0,0 +1,3 @@
+face torch_lit1.111
+magicmap orange
+end
diff --git a/light/torch_lit2.face b/light/torch_lit2.face
new file mode 100644
index 000000000..d086d847e
--- /dev/null
+++ b/light/torch_lit2.face
@@ -0,0 +1,3 @@
+face torch_lit2.111
+magicmap orange
+end
diff --git a/light/torch_unlit.face b/light/torch_unlit.face
new file mode 100644
index 000000000..e7db94693
--- /dev/null
+++ b/light/torch_unlit.face
@@ -0,0 +1,3 @@
+face torch_unlit.111
+magicmap brown
+end