Partial rewrite of portrait theme