updated lib to cover theme needs