Add merge on tags (fix #120)
Set classic theme box size to 95% (fix #221)