Back porting fixes from same into the theme pack