Simplified, as moving themes/css support to other library.