diff --git a/gui/romviz/romviz.tal b/gui/romviz/romviz.tal
index c338e8b..c5e799e 100644
--- a/gui/romviz/romviz.tal
+++ b/gui/romviz/romviz.tal
@@ -125,7 +125,7 @@ JMP2r
 
 	.page LDZ set-page
 	draw-clear
-	#00 .Screen/auto DEO
+	[ LIT2 00 -Screen/auto ] DEO
 	;pixel-icn .Screen/addr DEO2
 	LIT2r 0000
 	&stream
@@ -139,7 +139,7 @@ JMP2r
 	#01 ;draw-chr/color STA
 	#01e0 .Screen/x DEO2
 	#0010 .Screen/y DEO2
-	#01 .Screen/auto DEO
+	[ LIT2 01 -Screen/auto ] DEO
 	.page LDZ draw-byte
 	( size )
 	#0200 .Screen/x DEO2
@@ -169,12 +169,12 @@ JMP2r
 
 @draw-clear ( -- )
 
-	#f1 .Screen/auto DEO
+	[ LIT2 f1 -Screen/auto ] DEO
 	#0400
 	&v
 		#0020 .Screen/x DEO2
 		#00 OVR #70 SFT2 #0020 ADD2 .Screen/y DEO2
-		#c0 &h #00 .Screen/sprite DEO INC DUP ?&h POP
+		#c0 &h [ LIT2 00 -Screen/sprite ] DEO INC DUP ?&h POP
 		INC GTHk ?&v
 	POP2
 
@@ -205,11 +205,11 @@ JMP2r
 
 @draw-linev ( -- )
 
-	#02 .Screen/auto DEO
+	[ LIT2 02 -Screen/auto ] DEO
 	;linev-icn .Screen/addr DEO2
 	#4000
 	&v
-		#05 .Screen/sprite DEO
+		[ LIT2 05 -Screen/sprite ] DEO
 		INC GTHk ?&v
 	POP2
 
@@ -217,11 +217,11 @@ JMP2r
 
 @draw-lineh ( -- )
 
-	#01 .Screen/auto DEO
+	[ LIT2 01 -Screen/auto ] DEO
 	;lineh-icn .Screen/addr DEO2
 	#4000
 	&v
-		#05 .Screen/sprite DEO
+		[ LIT2 05 -Screen/sprite ] DEO
 		INC GTHk ?&v
 	POP2
 
@@ -242,14 +242,14 @@ JMP2r
 @draw-chr ( char -- )
 
 	#20 SUB #00 SWP #30 SFT2 ;font ADD2 .Screen/addr DEO2
-	[ LIT &color 01 ] .Screen/sprite DEO
+	[ LIT2 &color 01 -Screen/sprite ] DEO
 
 JMP2r
 
 @draw-str ( str* -- )
 
 	LDAk #01 SUB #7f GTH ?&skip
-	#01 .Screen/auto DEO
+	[ LIT2 01 -Screen/auto ] DEO
 	&w
 		LDAk draw-chr
 		INC2 LDAk ?&w
@@ -262,15 +262,15 @@ JMP2r
 
 	addr-pos .Screen/y DEO2 .Screen/x DEO2
 	DUP ?&no-null
-		POP ( .Screen/sprite DEO ) JMP2r
+		POP JMP2r
 		&no-null
 	DUP #20 GTH ?&no-low
-		POP #05 .Screen/sprite DEO JMP2r
+		POP [ LIT2 05 -Screen/sprite ] DEO JMP2r
 		&no-low
 	#80 GTH ?&no-ascii
-		#0a .Screen/sprite DEO JMP2r
+		[ LIT2 0a -Screen/sprite ] DEO JMP2r
 		&no-ascii
-	#0f .Screen/sprite DEO
+	[ LIT2 0f -Screen/sprite ] DEO
 
 JMP2r