Several UNNC theme fixes and tweaks.