diff --git a/src/main.tal b/src/main.tal
index 6a64d81..6850797 100644
--- a/src/main.tal
+++ b/src/main.tal
@@ -9,33 +9,20 @@
 
 |0000
 
-@state
-	&timer $1 &changed $1
-@settings
-	&depth $1 &color $1 &blend $1
-	&ratio $1 &tool $1 &focus $2
-	&zoom $1 &brush $1
-@cursor
-	&x $2 &y $2 &last $1
-@selection
-	&x1 $1 &y1 $1
-	&x2 $1 &y2 $1
-	&zx $1 &zy $1 ( zoom )
-	&a $1
-@frame
-	&x1 $2 &y1 $2
-	&x2 $2 &y2 $2
-	&width $2 &height $2
-@filepath $40 ( ext ) $4
-
-@toolview &x1 $2 &y1 $2 &x2 $2 &y2 $2
-@colorview &x1 $2 &y1 $2 &x2 $2 &y2 $2
-@blendview &x1 $2 &y1 $2 &x2 $2 &y2 $2
-@dataview &x1 $2 &y1 $2 &x2 $2 &y2 $2
-@preview &x1 $2 &y1 $2 &x2 $2 &y2 $2
-@zoomview &x1 $2 &y1 $2 &x2 $2 &y2 $2
-@tileview &x1 $2 &y1 $2 &x2 $2 &y2 $2
-@nametableview &x $2 &y $2 &x2 $2 &y2 $2
+	@state &timer $1 &changed $1
+	@settings &depth $1 &color $1 &blend $1 &ratio $1 &tool $1 &focus $2 &zoom $1 &brush $1
+	@cursor &x $2 &y $2 &last $1
+	@selection &x1 $1 &y1 $1 &x2 $1 &y2 $1 &zx $1 &zy $1 &a $1
+	@frame &x1 $2 &y1 $2 &x2 $2 &y2 $2 &width $2 &height $2
+	@filepath $40 ( ext ) $4
+	@toolview &x1 $2 &y1 $2 &x2 $2 &y2 $2
+	@colorview &x1 $2 &y1 $2 &x2 $2 &y2 $2
+	@blendview &x1 $2 &y1 $2 &x2 $2 &y2 $2
+	@dataview &x1 $2 &y1 $2 &x2 $2 &y2 $2
+	@preview &x1 $2 &y1 $2 &x2 $2 &y2 $2
+	@zoomview &x1 $2 &y1 $2 &x2 $2 &y2 $2
+	@tileview &x1 $2 &y1 $2 &x2 $2 &y2 $2
+	@nametableview &x $2 &y $2 &x2 $2 &y2 $2
 
 |0100 ( -> )
 
@@ -119,6 +106,9 @@ BRK
 		00 '4 :pick-color4 "ColorC $1
 	$1
 
+(
+@|vectors )
+
 @untrap ( -- )
 
 	;on-frame .Screen/vector DEO2
@@ -393,7 +383,8 @@ BRK
 
 BRK
 
-( operations )
+(
+@|helpers )
 
 @toggle-zoom ( -- )
 
@@ -618,6 +609,9 @@ JMP2r
 
 JMP2r
 
+(
+@|drawing )
+
 @redraw-all ( -- )
 
 	;draw-menu-bg JSR2
@@ -1076,7 +1070,8 @@ JMP2r
 
 JMP2r
 
-( file )
+(
+@|options )
 
 @file-new ( -- )
 
@@ -1353,6 +1348,8 @@ JMP2r
 JMP2r
 	&sprite 8000 8000 8000 8000
 
+(
+@|stdlib )
 @rol ( byte -- byte ) DUP #07 SFT SWP DUP ADD ADD JMP2r
 @ror ( byte -- byte ) DUP #70 SFT SWP #01 SFT ADD JMP2r
 @mcpy ( src* dst* len* -- ) SWP2 STH2 OVR2 ADD2 SWP2 &loop LDAk STH2kr STA INC2r INC2 GTH2k ,&loop JCN POP2 POP2 POP2r JMP2r