Fix paper theme issues