Fixed css styles and included theme as tag value handler