Full merge with hpstr-theme