diff --git a/src/mame/layout/polyplay.lay b/src/mame/layout/polyplay.lay
index e9473865cb3..ef1ce3a1dff 100644
--- a/src/mame/layout/polyplay.lay
+++ b/src/mame/layout/polyplay.lay
@@ -1,112 +1,117 @@
 <?xml version="1.0"?>
 <mamelayout version="2">
-	<element name="redpiece1">
-		<disk state ="0">
+	<element name="red1">
+		<text state ="0" string="Y">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.3" green="0.1" blue="0.1" />
-		</disk>
-		<disk state ="1">
+		</text>
+		<text state ="1" string="Y">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="1.0" green="0.1" blue="0.1" />
-		</disk>
+		</text>
 	</element>
-	<element name="bluepiece1">
-		<disk state ="0">
+	<element name="blue1">
+		<text state ="0" string="A">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.1" green="0.1" blue="0.3" />
-		</disk>
-		<disk state ="1">
+		</text>
+		<text state ="1" string="A">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.1" green="0.1" blue="1.0" />
-		</disk>
+		</text>
 	</element>
-	<element name="yellowpiece1">
-		<disk state ="0">
+	<element name="yellow1">
+		<text state ="0" string="L">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.3" green="0.3" blue="0.1" />
-		</disk>
-		<disk state ="1">
+		</text>
+		<text state ="1" string="L">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="1.0" green="1.0" blue="0.1" />
-		</disk>
+		</text>
 	</element>
-	<element name="greenpiece1">
-		<disk state ="0">
+	<element name="green1">
+		<text state ="0" string="P">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.1" green="0.3" blue="0.1" />
-		</disk>
-		<disk state ="1">
+		</text>
+		<text state ="1" string="P">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.1" green="1.0" blue="0.1" />
-		</disk>
+		</text>
 	</element>
-	<element name="redpiece2">
-		<disk state ="0">
+	<element name="red2">
+		<text state ="0" string="Y">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.3" green="0.1" blue="0.1" />
-		</disk>
-		<disk state ="1">
+		</text>
+		<text state ="1" string="Y">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="1.0" green="0.1" blue="0.1" />
-		</disk>
+		</text>
 	</element>
-	<element name="bluepiece2">
-		<disk state ="0">
+	<element name="blue2">
+		<text state ="0" string="L">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.1" green="0.1" blue="0.3" />
-		</disk>
-		<disk state ="1">
+		</text>
+		<text state ="1" string="L">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.1" green="0.1" blue="1.0" />
-		</disk>
+		</text>
 	</element>
-	<element name="yellowpiece2">
-		<disk state ="0">
+	<element name="yellow2">
+		<text state ="0" string="O">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.3" green="0.3" blue="0.1" />
-		</disk>
-		<disk state ="1">
+		</text>
+		<text state ="1" string="O">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="1.0" green="1.0" blue="0.1" />
-		</disk>
+		</text>
 	</element>
-	<element name="greenpiece2">
-		<disk state ="0">
+	<element name="green2">
+		<text state ="0" string="P">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.1" green="0.3" blue="0.1" />
-		</disk>
-		<disk state ="1">
+		</text>
+		<text state ="1" string="P">
 			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.1" green="1.0" blue="0.1" />
-		</disk>
+		</text>
 	</element>
-	<view name="Light organ without frontispiece">
-		<backdrop name="lamp1" element="redpiece1" state="0">
-			<bounds x="560" y="0" width="70" height="70"/>
+	<view name="Screen only">
+		<screen index="0">
+			<bounds x="0" y="0" width="4" height="3" />
+		</screen>
+	</view>
+	<view name="Screen + Lights">
+		<backdrop name="lamp1" element="red1" state="0">
+			<bounds x="7" y="0" width="1" height="1"/>
 		</backdrop>
-		<backdrop name="lamp1" element="redpiece2" state="0">
-			<bounds x="240" y="0" width="70" height="70"/>
+		<backdrop name="lamp2" element="blue1" state="0">
+			<bounds x="6" y="0" width="1" height="1"/>
 		</backdrop>
-		<backdrop name="lamp2" element="bluepiece2" state="0">
-			<bounds x="160" y="0" width="70" height="70"/>
+		<backdrop name="lamp3" element="yellow1" state="0">
+			<bounds x="5" y="0" width="1" height="1"/>
 		</backdrop>
-		<backdrop name="lamp2" element="bluepiece1" state="0">
-			<bounds x="480" y="0" width="70" height="70"/>
+		<backdrop name="lamp4" element="green1" state="0">
+			<bounds x="4" y="0" width="1" height="1"/>
 		</backdrop>
-		<backdrop name="lamp3" element="yellowpiece1" state="0">
-			<bounds x="400" y="0" width="70" height="70"/>
+		<backdrop name="lamp1" element="red2" state="0">
+			<bounds x="3" y="0" width="1" height="1"/>
 		</backdrop>
-		<backdrop name="lamp3" element="yellowpiece2" state="0">
-			<bounds x="80" y="0" width="70" height="70"/>
+		<backdrop name="lamp2" element="blue2" state="0">
+			<bounds x="2" y="0" width="1" height="1"/>
 		</backdrop>
-		<backdrop name="lamp4" element="greenpiece2" state="0">
-			<bounds x="0" y="0" width="70" height="70"/>
+		<backdrop name="lamp3" element="yellow2" state="0">
+			<bounds x="1" y="0" width="1" height="1"/>
 		</backdrop>
-		<backdrop name="lamp4" element="greenpiece1" state="0">
-			<bounds x="320" y="0" width="70" height="70"/>
+		<backdrop name="lamp4" element="green2" state="0">
+			<bounds x="0" y="0" width="1" height="1"/>
 		</backdrop>
 		<screen index="0">
-			<bounds x="0" y="80" width="640" height="480" />
+			<bounds x="0" y="1" width="8" height="6" />
 		</screen>
 	</view>
 </mamelayout>
\ No newline at end of file