Clean up CSS and fix up dark theme