improve theme classes interfaces