Further modifications to theme