Cleanup theme section a bit.