Fixed up new theme a bit