Continued theme tweaks