More robust theme finding and loading