Theme generator improvements