tweaking theme support