Rebuild theme with rwd fixes
Rebuild after merging with upstream master