diff --git a/gui/shaviankb/assets.tal b/gui/shaviankb/assets.tal
index 64b18b5..e48077c 100644
--- a/gui/shaviankb/assets.tal
+++ b/gui/shaviankb/assets.tal
@@ -104,7 +104,7 @@
 &four    0000 0000 0000 0000 0000 0000 0000 0000 ={ "4 }
 &five    0000 0000 0000 0000 0000 0000 0000 0000 ={ "5 }
 &six     0000 0000 0000 0000 0000 0000 0000 0000 ={ "6 }
-&seven   0000 0000 0000 0000 0000 0000 0000 0000 ={ "7 }
+&seven   0000 00fc 0404 0808 1010 2020 0000 0000 ={ "7 }
 &eight   0000 0000 0000 0000 0000 0000 0000 0000 ={ "8 }
 &nine    0000 0000 0000 0000 0000 0000 0000 0000 ={ "9 }
 
diff --git a/gui/shaviankb/cream12.uf2 b/gui/shaviankb/cream12.uf2
new file mode 100644
index 0000000..1c67710
Binary files /dev/null and b/gui/shaviankb/cream12.uf2 differ
diff --git a/gui/shaviankb/shaviankb.tal b/gui/shaviankb/shaviankb.tal
index 0b708b5..3be1d0d 100644
--- a/gui/shaviankb/shaviankb.tal
+++ b/gui/shaviankb/shaviankb.tal
@@ -12,51 +12,51 @@
 	#f0ef .System/r DEO2
 	#f0e6 .System/g DEO2
 	#f0e2 .System/b DEO2
-	#0100 .Screen/width DEO2
-	#0080 .Screen/height DEO2
+	#0120 .Screen/width DEO2
+	#00c0 .Screen/height DEO2
 	<draw-keyboard>
 	( #010e DEO ) BRK
 
-@<push-pos> ( -- )
-	[ LITr -Screen/x ] DEI2r
-	( ) [ LITr -Screen/y ] DEI2r ROT2r JMP2r
-
-@<pop-pos> ( -- )
-	SWP2r STH2r .Screen/y DEO2
-	SWP2r STH2r .Screen/y DEO2
+@<set-position> ( id* -- )
+	DUP2 #0009 DIV2 #0030 MUL2 .Screen/y DEO2
+	DUP #1e NEQ ?{ POP2 #0007 }
+	DUP #1f NEQ ?{ POP2 #0008 }
+	#0009 DIV2k MUL2 SUB2 #0020 MUL2 .Screen/x DEO2
 	JMP2r
 
 @<draw-keyboard> ( -- )
-	( ;shavian ;shavian #0010 ADD2 ;shavian #0020 ADD2 <draw-key3>
-	;shavian ;shavian #0010 ADD2 ;shavian #0020 ADD2 <draw-key3> )
-	JMP2r
+	#0020 #0000
+	&l ( -- )
+		DUP2 <set-position>
+		DUP2 #0006 MUL2 ;layout ADD2
+		( ) STH2k #0004 ADD2 LDA2
+		( ) STH2kr #0002 ADD2 LDA2
+		( ) STH2r LDA2 <draw-key>
+		( ) INC2 GTH2k ?&l
+	POP2 POP2 JMP2r
 
 @<draw-glyph> ( addr* -- )
-	STH2k .Screen/addr DEO2
+	.Screen/addr DEO2
 	[ LIT2 15 -Screen/auto ] DEO
-	[ LIT2 05 -Screen/sprite ] DEOk
-	( ) STH2r .Screen/addr DEO2
-	( ) .Screen/x DEI2k #0007 SUB2 ROT DEO2
-	DEO
+	[ LIT2 05 -Screen/sprite ] DEO
 	JMP2r
 
-@<draw-key3> ( a* b* c* -- )
-	<push-pos>
+@<draw-key> ( a* b* c* -- )
 	<draw-button>
-	.Screen/x DEI2k #0004 ADD2 ROT DEO2
+	.Screen/x DEI2k #0006 ADD2 ROT DEO2
 	.Screen/y DEI2k #0004 ADD2 ROT DEO2
 	( | a )
 	<draw-glyph>
-	.Screen/x DEI2k #0004 SUB2 ROT DEO2
-	.Screen/y DEI2k #0008 ADD2 ROT DEO2
+	.Screen/x DEI2k #0002 SUB2 ROT DEO2
+	.Screen/y DEI2k #000c ADD2 ROT DEO2
 	( | b )
 	<draw-glyph>
-	.Screen/x DEI2k #0004 SUB2 ROT DEO2
-	.Screen/y DEI2k #0008 ADD2 ROT DEO2
+	.Screen/x DEI2k #0002 SUB2 ROT DEO2
+	.Screen/y DEI2k #000c ADD2 ROT DEO2
 	( | c )
 	<draw-glyph>
-	<pop-pos>
-	.Screen/x DEI2k #0008 ADD2 ROT DEO2
+	.Screen/x DEI2k #0006 ADD2 ROT DEO2
+	.Screen/y DEI2k #001c SUB2 ROT DEO2
 	JMP2r
 
 @<draw-button> ( -- )