more fixes, tweaks to dark theme