Code cleanup; theme tweaks.