Fixes to show right theme names