Fixed <3.4 issues with theme data