[PR] Improvements in setting a default theme