Dark background tweak and nonblocking fix