Update from topcoat theme