diff --git a/README b/README
index 1e56510..e13f8ff 100644
--- a/README
+++ b/README
@@ -53,7 +53,7 @@ lfbviewx
 BUILD
 -----
 
-$ KOLIBRI=/path/to/kolibrios make
+$ KOLIBRIOS=/path/to/kolibrios make
 
 /path/to/kolibrios is where you checked out 'svn co svn://kolibrios.org'.
 
diff --git a/makefile b/makefile
index 89b7c65..927f167 100644
--- a/makefile
+++ b/makefile
@@ -29,7 +29,7 @@ umka_os: umka_os.o umka.o shell.o lodepng.o vdisk.o vnet.o trace.o trace_lbr.o \
 	$(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld
 
 umka.o umka.fas: umka.asm
-	INCLUDE="$(KOLIBRI)/kernel/trunk;$(KOLIBRI)/programs/develop/libraries/libcrash/trunk" \
+	INCLUDE="$(KOLIBRIOS)/kernel/trunk;$(KOLIBRIOS)/programs/develop/libraries/libcrash/trunk" \
             $(FASM) $< umka.o -s umka.fas -m 1234567
 
 shell.o: shell.c
@@ -44,10 +44,10 @@ pci.o: linux/pci.c
 lodepng.o: lodepng.c lodepng.h
 	$(CC) $(CFLAGS_32) -c $<
 
-default.skn: $(KOLIBRI)/skins/Leency/Shkvorka/default.asm
+default.skn: $(KOLIBRIOS)/skins/Leency/Shkvorka/default.asm
 	$(FASM) $< $@
 
-skin.skn: $(KOLIBRI)/skins/Leency/Octo_flat/default.asm
+skin.skn: $(KOLIBRIOS)/skins/Leency/Octo_flat/default.asm
 	$(FASM) $< $@
 
 umka.prp: umka.fas
diff --git a/shell.c b/shell.c
index 9ba38e2..ad19a4a 100644
--- a/shell.c
+++ b/shell.c
@@ -783,6 +783,7 @@ shell_get_window_colors(int argc, char **argv) {
     }
     (void)argv;
     system_colors_t colors;
+    memset(&colors, 0xaa, sizeof(colors));
     COVERAGE_ON();
     umka_sys_get_window_colors(&colors);
     COVERAGE_OFF();
diff --git a/test/016_#f01_#draw_all.ref.log b/test/016_#f01_#draw_all.ref.log
index 08fac13..8ae72f2 100644
--- a/test/016_#f01_#draw_all.ref.log
+++ b/test/016_#f01_#draw_all.ref.log
@@ -32,8 +32,8 @@ font smoothing: 0 - off
 /> get_window_colors
 0x00586786 frame
 0x00fefefe grab
-0x00aea6a6 work_3d_dark
-0x00fbfbfb work_3d_light
+0x00c5bdb9 work_3d_dark
+0x00ece9e5 work_3d_light
 0x00333333 grab_text
 0x00ddd7cf work
 0x007887a6 work_button
diff --git a/test/016_#f01_#draw_all.ref.png b/test/016_#f01_#draw_all.ref.png
index 573c89d..66511b2 100644
Binary files a/test/016_#f01_#draw_all.ref.png and b/test/016_#f01_#draw_all.ref.png differ
diff --git a/umka.asm b/umka.asm
index dcb5443..ed946d7 100644
--- a/umka.asm
+++ b/umka.asm
@@ -171,6 +171,15 @@ macro add r, v {
   end if
 }
 
+macro stdcall target, [args] {
+common
+  if target eq is_region_userspace
+        test    esp, esp        ; clear zf
+  else
+        stdcall target, args
+  end if
+}
+
 include 'system.inc'
 include 'fdo.inc'
 
@@ -671,13 +680,6 @@ map_memEx:
 
 sys_msg_board equ __pex0
 delay_ms equ __pex1
-macro stdcall target, [args] {
-  if target eq is_region_userspace
-        test    esp, esp        ; clear zf
-  else
-        stdcall target, args
-  end if
-}
 
 include fix pew
 macro pew x {}
@@ -741,7 +743,7 @@ BTN_ADDR        dd ?
 MEM_AMOUNT      rd 0x1d
 SYS_SHUTDOWN    db ?
 sys_proc        rd 0x800
-rb 0xb242       ; align SLOT_BASE on 0x10000
+rb 0xb202       ; align SLOT_BASE on 0x10000
 SLOT_BASE:      rd 0x8000
 VGABasePtr      rb 640*480
 ;rb 0x582        ; align HEAP_BASE on page boundary