Minor adjusments to theme