diff --git a/gui/notepad/src/notepad.tal b/gui/notepad/src/notepad.tal
index dbf03cc..b376e53 100644
--- a/gui/notepad/src/notepad.tal
+++ b/gui/notepad/src/notepad.tal
@@ -37,7 +37,7 @@ BRK
 	( name ) "Note 20 "Pad 0a
 	( details ) "Original 20 "by 20 "Donn 20 "Denman 0a
 	( author ) "By 20 "Devine 20 "Lu 20 "Linvega 0a
-	( date ) "Jul 20 "27, 20 "2023 00
+	( date ) "May 20 "23, 20 "2024 00
 	01
 		( icon ) 83 =appicon
 
@@ -96,7 +96,7 @@ BRK
 	#00f8 #0011
 		.collapsed LDZ ?{ SWP2 }
 		POP2 .Screen/height DEO2
-	.collapsed LDZ #00 EQU .collapsed STZ
+	[ LIT2 00 -collapsed ] LDZ EQU .collapsed STZ
 	draw-header
 	redraw
 
@@ -130,7 +130,7 @@ BRK
 
 	trap-mouse
 
-	.Mouse/state DEI #00 NEQ .Mouse/x DEI2 #0018 LTH2 AND ?&on-mouse-down
+	[ LIT2 00 -Mouse/state ] DEI NEQ .Mouse/x DEI2 #0018 LTH2 AND ?&on-mouse-down
 
 BRK
 
@@ -139,7 +139,7 @@ BRK
 	[ LIT2 00 -Mouse/state ] DEO
 
 	.Mouse/y DEI2 #00d6 SUB2 NIP
-	#18 .Mouse/x DEI2 NIP SUB
+	[ LIT2 18 -Mouse/x ] DEI2 NIP SUB
 		ADD #18 LTH ?&go-next
 			prev-page BRK
 		&go-next
@@ -231,7 +231,7 @@ BRK
 
 @select-variable ( addr* -- )
 
-	.Controller/button DEI #04 AND ?select-to
+	[ LIT2 04 -Controller/button ] DEI AND ?select-to
 
 !select-from
 
@@ -282,7 +282,7 @@ BRK
 @select-left ( -- )
 
 	.selection/length LDZ2 #0000 EQU2
-	.Controller/button DEI #04 AND #00 NEQ
+	[ LIT2 04 -Controller/button ] DEI AND #00 NEQ
 		ORA ?&no-block
 		get-from !select-from
 		&no-block
@@ -293,7 +293,7 @@ BRK
 @select-right ( -- )
 
 	.selection/length LDZ2 #0000 EQU2
-	.Controller/button DEI #04 AND #00 NEQ
+	[ LIT2 04 -Controller/button ] DEI AND #00 NEQ
 		ORA ?&no-block
 		get-to !select-from
 		&no-block
@@ -512,7 +512,7 @@ JMP2r
 
 @get-page ( -- addr* )
 
-	;mem #00 .page LDZ #c0 SFT2 ADD2
+	;mem [ LIT2 00 -page ] LDZ #c0 SFT2 ADD2
 
 JMP2r
 
@@ -604,7 +604,7 @@ JMP2r
 	[ LIT2 01 -Screen/sprite ] DEO
 	( close )
 	;close-icn
-		#00 .Mouse/state DEI #00 NEQ .Mouse/x DEI2 #0008 SUB2 #000a LTH2 AND
+		#00 [ LIT2 00 -Mouse/state ] DEI NEQ .Mouse/x DEI2 #0008 SUB2 #000a LTH2 AND
 		#50 SFT2 ADD2 .Screen/addr DEO2
 	[ LIT2 01 -Screen/sprite ] DEOk DEO
 	( lead )