mirroring latest improvements in lib and hog theme