Fix some issues in the newly added themes