Further tweaks to colours and keys for no window mode