further progress on the rough article and improvements on theme package