New theme, tweaks