Also, refactor more common code into RenderToggleable and handle dark themes more correctly. Fixes #601